diff --git a/Makefile.Linux b/Makefile.Linux index 5713276..110bb66 100644 --- a/Makefile.Linux +++ b/Makefile.Linux @@ -137,5 +137,6 @@ install-log: install: install-chroot-dir install-bin install-etc install-log install-man install-run install-init @if [ "$(DESTDIR)" = "" ]; then \ - sh scripts/postinst; \ + sh scripts/debian/preinst; \ + sh scripts/debian/postinst; \ fi diff --git a/copying b/copying index fbd8145..6a0ce50 100644 --- a/copying +++ b/copying @@ -1,12 +1,8 @@ 3proxy 0.9 Public License Agreement -(c) 2000-2019 by 3APA3A (3APA3A@3proxy.ru) -(c) 2000-2019 by 3proxy.org (http://3proxy.org/) -(c) 2000-2019 by Vladimir Dubrovin (vlad@3proxy.ru) - -This software uses: - RSA Data Security, Inc. MD4 Message-Digest Algorithm - RSA Data Security, Inc. MD5 Message-Digest Algorithm +(c) 2000-2020 by 3APA3A (3APA3A@3proxy.ru) +(c) 2000-2020 by 3proxy.org (https://3proxy.org/) +(c) 2000-2020 by Vladimir Dubrovin (vlad@3proxy.ru) THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/scripts/debian/3proxy.manpages b/scripts/debian/3proxy.manpages new file mode 100644 index 0000000..f6a505e --- /dev/null +++ b/scripts/debian/3proxy.manpages @@ -0,0 +1,10 @@ +man/3proxy.8 +man/3proxy.cfg.3 +man/ftppr.8 +man/icqpr.8 +man/pop3p.8 +man/proxy.8 +man/smtpp.8 +man/socks.8 +man/tcppm.8 +man/udppm.8 \ No newline at end of file diff --git a/scripts/debian/conffiles b/scripts/debian/conffiles new file mode 100644 index 0000000..267a8a6 --- /dev/null +++ b/scripts/debian/conffiles @@ -0,0 +1,5 @@ +/etc/3proxy/3proxy.cfg +/usr/local/3proxy/conf/3proxy.cfg +/usr/local/3proxy/conf/add3proxyuser.sh +/usr/local/3proxy/conf/bandlimiters +/usr/local/3proxy/conf/counters diff --git a/scripts/debian/control b/scripts/debian/control new file mode 100644 index 0000000..4cab652 --- /dev/null +++ b/scripts/debian/control @@ -0,0 +1,18 @@ +Source: 3proxy +Maintainer: z3APA3A <3apa3a@3proxy.org> +Section: net +Priority: optional +Standards-Version: 4.0.0 +Build-Depends: debhelper (>=10) +Homepage: https://3proxy.org/ +Vcs-Git: https://github.com/z3APA3A/3proxy +Vcs-Browser: https://github.com/z3APA3A/3proxy + +Package: 3proxy +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: tiny free proxy server +3Proxy tiny free proxy server is really tiny freeware proxy servers set. +It includes HTTP proxy with HTTPS and FTP support, SOCKSv4/SOCKSv4.5/SOCKSv5 proxy (socks/socks.exe), POP3 proxy, SMTP proxy, FTP proxy, caching DNS proxy, TCP and UDP portmappers. +You can use every proxy as a standalone program (socks, proxy, tcppm, udppm, pop3p) or use combined program (3proxy). Combined proxy additionally supports features like access control, bandwidth limiting, limiting daily/weekly/monthly traffic amount, proxy chaining, log rotation, syslog and ODBC logging, etc. +It's created to be small, simple and yet very functional. \ No newline at end of file diff --git a/scripts/debian/copyright b/scripts/debian/copyright new file mode 100644 index 0000000..f6f657a --- /dev/null +++ b/scripts/debian/copyright @@ -0,0 +1,20 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: 3proxy +Upstream-Contact: 3proxy@3proxy.org +Source: https://3proxy.org/ + +Files: * +Copyright: 2000-2020 3APA3A, Vladimir Dubrovin, 3proxy.org +License: BSD-3-clause or Apache or GPL-2+ or LGPL-2+ + +Files: src/libs/md*.* +Copyright: 1990,1991,1992 RSA Data Security, Inc +License: public-domain + +Files: src/libs/regex.* +Copyright: Henry Spencer +License: public-domain + +Files: src/libs/smbdes.c +Copyright: Andrew Tridgell 1998 +License: GPL-2+ diff --git a/scripts/postinst b/scripts/debian/postinst similarity index 91% rename from scripts/postinst rename to scripts/debian/postinst index 2ece3f8..dbdbe4b 100644 --- a/scripts/postinst +++ b/scripts/debian/postinst @@ -1,6 +1,3 @@ -if [ -x /usr/sbin/useradd ]; then \ - /usr/bin/getent passwd proxy >/dev/null || (/usr/sbin/useradd -UMr -s /bin/false -c 3proxy proxy || true); \ -fi if [ ! -f /usr/local/3proxy/conf/passwd ]; then \ touch /usr/local/3proxy/conf/passwd;\ fi diff --git a/scripts/debian/preinst b/scripts/debian/preinst new file mode 100644 index 0000000..8c7b38e --- /dev/null +++ b/scripts/debian/preinst @@ -0,0 +1,4 @@ +if [ -x /usr/sbin/useradd ]; then \ + /usr/bin/getent group proxy >/dev/null || (/usr/sbin/groupadd -f -r proxy || true); \ + /usr/bin/getent passwd proxy >/dev/null || (/usr/sbin/useradd -UMr -s /bin/false -c 3proxy proxy || true); \ +fi diff --git a/scripts/debian/rules b/scripts/debian/rules new file mode 100644 index 0000000..b63f238 --- /dev/null +++ b/scripts/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_auto_build: + ln -s Makefile.Linux Makefile || true + dh_auto_build \ No newline at end of file diff --git a/scripts/debian/source/format b/scripts/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/scripts/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/scripts/3proxy.spec b/scripts/rh/3proxy.spec similarity index 100% rename from scripts/3proxy.spec rename to scripts/rh/3proxy.spec