actually building

6 files changed, 90 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22fd2ab532c0..301cff9ed1d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,23 @@
-# Generated by aurpkgs
-# Thu Sep 05 08:31:14 UTC 2019
 pkgbase = 3proxy-git
 	pkgdesc = A tiny crossplatform proxy server (git version)
-	pkgver = False
+	pkgver = r520.22cf925
 	pkgrel = 1
 	url = https://3proxy.org/
-	arch = i686
 	arch = x86_64
 	license = BSD
+	provides = 3proxy
+	conflicts = 3proxy
 	source = 3proxy::git+https://github.com/z3APA3A/3proxy.git
+	source = 3proxy@.service
+	source = no_useradd.patch
+	source = no_useradd.patch.sig
+	source = 3proxy@.service.sig
+	validpgpkeys = 748231EBCBD808A14F5E85D28C004C2F93481F6B
+	sha512sums = SKIP
+	sha512sums = 3010f5626148459ba7cecc0929fb47b801a1aa70d3df02a7ddd46a147a7a5e811330d9bcaf5ea092c2f0ef7663c8d4d44d67236e9224362850f72a95817f5936
+	sha512sums = 9a21b07db619e16fa7fe2a34437f9c133c218364fc8c20635e072f4b44d712afa337415c3d71a05e8ade467d2415a103faec5b625e6f7f21cc41c2f613aca351
 	sha512sums = SKIP
 	sha512sums = SKIP
 
 pkgname = 3proxy-git
+
diff --git a/3proxy@.service b/3proxy@.service
new file mode 100644
index 000000000000..95ee411fe883
--- /dev/null
+++ b/3proxy@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=3proxy
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/3proxy /etc/3proxy/3proxy.cfg
+User=threeproxy
+Group=threeproxy
+Restart=on-failure
+PrivateUsers=true
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/3proxy@.service.sig b/3proxy@.service.sig
new file mode 100644
index 000000000000..ed2f14d90c5f
--- /dev/null
+++ b/3proxy@.service.sig
diff --git a/PKGBUILD b/PKGBUILD
index e56291fa0c84..36638612d1db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,43 +2,57 @@
 validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # Bug reports can be filed at https://bugs.square-r00t.net/index.php?project=3
 # News updates for packages can be followed at https://devblog.square-r00t.net
+# Thanks to asm0dey for making this easier
 pkgname=3proxy-git
-pkgver=0.0001
+pkgver=r520.22cf925
 pkgrel=1
 pkgdesc="A tiny crossplatform proxy server (git version)"
-arch=( 'i686' 'x86_64' )
+arch=('x86_64')
 url="https://3proxy.org/"
-license=( 'BSD' )
+license=('BSD')
 _pkgname=3proxy
+provides=('3proxy')
+conflicts=('3proxy')
 install=
 changelog=
 noextract=()
-source=("3proxy::git+https://github.com/z3APA3A/3proxy.git")
-# see https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git_Submodules if you require git submodules
-sha512sums=('SKIP')
+source=("${_pkgname}::git+https://github.com/z3APA3A/${_pkgname}.git"
+	'3proxy@.service'
+	'no_useradd.patch'
+	'no_useradd.patch.sig'
+	'3proxy@.service.sig')
+sha512sums=('SKIP'
+            '3010f5626148459ba7cecc0929fb47b801a1aa70d3df02a7ddd46a147a7a5e811330d9bcaf5ea092c2f0ef7663c8d4d44d67236e9224362850f72a95817f5936'
+            '9a21b07db619e16fa7fe2a34437f9c133c218364fc8c20635e072f4b44d712afa337415c3d71a05e8ade467d2415a103faec5b625e6f7f21cc41c2f613aca351'
+            'SKIP'
+            'SKIP')
 pkgver() {
   cd "${srcdir}/${_pkgname}"
-  # no tags, so number of revisions e.g. r1142.a17a017
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  ## most recent annotated tag e.g. 2.0.r6.ga17a017
-  #git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-  ## most recent un-annotated tag e.g. 0.71.r115.gd95ee07
-  #git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-  ## or:
-  ##git describe --long --tags | sed 's/-/.r/;s/-/./'
-  ## project uses tags with prefix. e.g. v...
-  #git describe --long | sed 's/^foo-//;s/\([^-]*-g\)/r\1/;s/-/./g'
-  ## both with fallback, e.g. 0.9.9.r27.g2b039da with tags, else r1581.2b039da
-  #( set -o pipefail
-  #  git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-  #  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  #)
 }
-build() {
-        cd "${srcdir}/${_pkgname}/src"
-        make prefix=${pkgdir}/usr
+
+prepare() {
+    cd ${srcdir}/${_pkgname}
+    patch -p1 < ${srcdir}/no_useradd.patch
 }
 package() {
-        install -D -m755 ${srcdir}/${_pkgname}/src/${_pkgname} ${pkgdir}/usr/bin/${_pkgname}
-        install -D -m644 ${srcdir}/${_pkgname}/docs/README.html.en ${pkgdir}/usr/share/doc/${_pkgname}/README.html
+
+    _prefix='/usr'
+    _etcdir='/etc/3proxy'
+
+    install -d -m 0755 ${pkgdir}/usr/etc/init.d
+
+    cd "${srcdir}/${_pkgname}"
+    make='make -f Makefile.Linux INSTALL=/usr/bin/install'
+    ${make} prefix="${_prefix}" ETCDIR="${_etcdir}"
+    ${make} prefix="${_prefix}" install DESTDIR="${pkgdir}" ETCDIR="${pkgdir}${_etcdir}"
+    ( cd ${pkgdir}${_prefix}/bin && mv proxy 3proxy-proxy ) || return 1
+    rm -f ${pkgdir}${_etcdir}/counters ${pkgdir}${_etcdir}/passwd ${pkgdir}${_etcdir}/bandlimiters
+    install -D -m0644 ${srcdir}/${_pkgname}/copying ${pkgdir}${_prefix}/share/licenses/$pkgname/copying
+    install -D -m0644 ${srcdir}/${_pkgname}/cfg/3proxy.cfg.sample ${pkgdir}${_etcdir}/3proxy.cfg.sample
+    install -D -m0644 ${srcdir}/${_pkgname}/cfg/counters.sample ${pkgdir}${_etcdir}/counters.sample
+    mkdir -p "${pkgdir}/usr/lib/systemd/system/"
+    install -D -m0644 "${srcdir}/3proxy@.service" "${pkgdir}/usr/lib/systemd/system/"
+
+    rm -rf ${pkgdir}/etc/init.d
 }
diff --git a/no_useradd.patch b/no_useradd.patch
new file mode 100644
index 000000000000..00a28749fd86
--- /dev/null
+++ b/no_useradd.patch
@@ -0,0 +1,24 @@
+--- a/Makefile.Linux	2019-09-05 05:05:42.287217238 -0400
++++ b/Makefile.Linux	2019-09-05 05:08:10.945471209 -0400
+@@ -10,7 +10,7 @@
+ BUILDDIR = ../bin/
+ CC = gcc
+ 
+-CFLAGS = -g -O2 -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER
++CFLAGS = -Werror-implicit-function-declaration  -g -O2 -fno-strict-aliasing -c -pthread -DWITHSPLICE -D_GNU_SOURCE -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -DWITH_NETFILTER
+ COUT = -o 
+ LN = gcc
+ DCFLAGS = -fpic
+@@ -134,11 +134,6 @@
+ 	fi
+ 
+ install: install-chroot-dir install-bin install-etc install-log install-man install-run install-init
+-	@getent passwd proxy || useradd -UMr -s /bin/false -c 3proxy proxy
+-	@if [ ! -f $(INSTALL_CFG_DEST)/passwd ]; then \
+-	touch $(INSTALL_CFG_DEST)/passwd;\
+-	fi
+-	@chown -R proxy:proxy $(CHROOTDIR)
+ 	@chmod 550  $(CHROOTDIR)/
+ 	@chmod 550  $(CHROOTDIR)/conf/
+ 	@chmod 440  $(CHROOTDIR)/conf/*
+
diff --git a/no_useradd.patch.sig b/no_useradd.patch.sig
new file mode 100644
index 000000000000..93610ff5f960
--- /dev/null
+++ b/no_useradd.patch.sig