Fix compilation with newer gcc and improve PKGBUILD

1 files changed, 30 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1ade1123c8c1..89c1422a8b95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,25 @@
 
 pkgname=frox
 pkgver=0.7.18
-pkgrel=5
+pkgrel=6
 pkgdesc="A transparent ftp proxy that optionally supports caching"
 arch=('i686' 'x86_64')
 url="http://$pkgname.sourceforge.net/"
 license=('GPL2')
+depends=('openssl')
 backup=("etc/$pkgname.conf")
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         "$pkgname.service"
+        "$pkgname.sysusers"
+        "$pkgname.tmpfiles"
         "$pkgname-$pkgver-clientdata_socket.patch"
         "$pkgname.conf.patch")
-md5sums=('d4ba3a22db472922c71b0e63ca64b10b'
-         '022f05592f19e05895fa36541fb9b514'
-         '4f69c821c75d870837baa7f4d0af75a7'
-         '774646b5c80f1b22be6c3f48e130c5df')
+sha256sums=('7586b96cc044df75013ddb31d084340c2fab5d92794a47c916ea90ef23ace3c4'
+            '617a1b5fe9fd52993ed66a4ac79b5eb42467226434feff6568a993001f004e57'
+            'c7ee34198f1918e2f01ebdeb9043c92c1f1aa243714bf2883220814e18b865ee'
+            'd6c96f3dd6c4ef7dc084f68449d49b02045057e0dca93b51f42aa2a967622e85'
+            '59a64dc276428656d558ac80a5cd552699182845a29cbafd6563e39c6afc7a0d'
+            '7154ce74d8131aa0e78a893b3899f091225a433e4b77836661ec549e9fbdf7fd')
 
 build() {
 	cd "$pkgname-$pkgver"
@@ -28,16 +33,18 @@ build() {
 	# Default config file fixes
 	patch -p1 < "$srcdir/$pkgname.conf.patch"
 
-	./configure --prefix=/usr                              \
-	            --sbindir=/usr/bin                         \
-	            --enable-ipfilter                          \
-	            --enable-http-cache                        \
-	            --enable-local-cache                       \
-	            --enable-virus-scan                        \
-	            --enable-ssl                               \
-	            --enable-ccp                               \
-	            --enable-procname                          \
-	            --enable-configfile="/etc/$pkgname.conf"
+	CFLAGS+=' -fcommon'
+	./configure \
+		--prefix='/usr' \
+		--sbindir='/usr/bin' \
+		--enable-ipfilter \
+		--enable-http-cache \
+		--enable-local-cache \
+		--enable-virus-scan \
+		--enable-ssl \
+		--enable-ccp \
+		--enable-procname \
+		--enable-configfile="/etc/$pkgname.conf"
 
 	make
 }
@@ -47,16 +54,16 @@ package() {
 
 	make install DESTDIR="$pkgdir"
 
-	local _cachedir="/var/cache/$pkgname"
-	install -dm755 -odaemon -gdaemon       "$pkgdir$_cachedir"
-
 	local _mandir='/usr/share/man'
-	install -Dm644 "doc/$pkgname.conf.man" "$pkgdir$_mandir/man5/$pkgname.conf.5"
-	install -Dm644 "doc/$pkgname.man"      "$pkgdir$_mandir/man8/$pkgname.8"
-	install -Dm644 "src/$pkgname.conf"     "$pkgdir/etc/$pkgname.conf"
+	install -Dp -m644 "doc/$pkgname.conf.man" "$pkgdir$_mandir/man5/$pkgname.conf.5"
+	install -Dp -m644 "doc/$pkgname.man"      "$pkgdir$_mandir/man8/$pkgname.8"
+	install -Dp -m644 "src/$pkgname.conf"     "$pkgdir/etc/$pkgname.conf"
 
 	local _unitdir='/usr/lib/systemd/system'
-	install -Dm644 {"$srcdir","$pkgdir/$_unitdir"}/$pkgname.service
+	install -Dp -m644 {"$srcdir","$pkgdir/$_unitdir"}/$pkgname.service
+
+	install -Dp -m644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+	install -Dp -m644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }
 
 # vim: set ft=sh ts=4 sw=4 noet: