diff --git a/srcpkgs/ferm/patches/mod_makefile.patch b/srcpkgs/ferm/patches/mod_makefile.patch index 92a67a34dd..c118d94b55 100644 --- a/srcpkgs/ferm/patches/mod_makefile.patch +++ b/srcpkgs/ferm/patches/mod_makefile.patch @@ -1,32 +1,30 @@ ---- Makefile.orig 2016-10-16 22:36:18.259994713 +0200 -+++ Makefile 2016-10-16 22:44:28.558985932 +0200 +--- Makefile.orig 2017-08-12 17:55:29.265988875 +0200 ++++ Makefile 2017-08-12 17:56:17.492988011 +0200 @@ -122,7 +122,6 @@ rm -rf $(DISTDIR) install -d -m 755 $(DISTDIR) $(DISTDIR)/src $(DISTDIR)/doc $(DISTDIR)/examples install -m 755 src/ferm src/import-ferm $(DISTDIR)/src - install -m 644 ferm.service $(DISTDIR) install -m 644 doc/ferm.pod doc/ferm.txt doc/ferm.html doc/ferm.1 doc/import-ferm.1 $(DISTDIR)/doc - install -m 644 config.mk Makefile AUTHORS COPYING NEWS README TODO $(DISTDIR) + install -m 644 config.mk Makefile AUTHORS COPYING NEWS README.rst TODO $(DISTDIR) install -m 644 $(wildcard examples/*.ferm) $(DISTDIR)/examples -@@ -137,11 +136,10 @@ +@@ -137,10 +136,10 @@ .PHONY: install uninstall install: all - install -d -m 755 $(DOCDIR)/examples $(PREFIX)/sbin $(SERVICEDIR) + install -d -m 755 $(DOCDIR)/examples $(PREFIX)/bin $(SERVICEDIR) - install -m 644 AUTHORS COPYING NEWS README TODO $(DOCDIR) + install -m 644 AUTHORS COPYING NEWS README.rst TODO $(DOCDIR) install -m 644 examples/*.ferm $(DOCDIR)/examples - install -m 755 src/ferm src/import-ferm $(PREFIX)/sbin/ -- install -m 644 ferm.service $(SERVICEDIR) + install -m 755 src/ferm src/import-ferm $(PREFIX)/bin/ + install -m 644 ferm.service $(SERVICEDIR) install -d -m 755 $(DOCDIR) $(MANDIR) - install -m 644 doc/ferm.txt doc/ferm.html $(DOCDIR) -@@ -151,8 +149,7 @@ - uninstall: +@@ -152,7 +151,7 @@ rm -rf $(DOCDIR) rm -f $(MANDIR)/ferm.1 $(MANDIR)/import-ferm.1 -- rm -f $(SERVICEDIR)/ferm.service + rm -f $(SERVICEDIR)/ferm.service - rm -f $(PREFIX)/sbin/ferm $(PREFIX)/sbin/import-ferm + rm -f $(PREFIX)/bin/ferm $(PREFIX)/bin/import-ferm diff --git a/srcpkgs/ferm/template b/srcpkgs/ferm/template index 262bff90d1..a4f7c96c16 100644 --- a/srcpkgs/ferm/template +++ b/srcpkgs/ferm/template @@ -1,6 +1,6 @@ # Template file for 'ferm' pkgname=ferm -version=2.4 +version=2.4.1 revision=1 hostmakedepends="perl" depends="perl iptables" @@ -9,8 +9,8 @@ short_desc="Frontend for iptables" maintainer="johannes " license="GPL-2" homepage="http://ferm.foo-projects.org/" -distfiles="http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.gz" -checksum=1293d56d6e9d3e3a389c54919fee5a4323ce81fc8b25eee8f3296a858410d470 +distfiles="http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz" +checksum=8a6f7d5beeac07c574bef7a6f938ef543c08aaa0b9980830b9dafb11cae468bb do_install() { make install PREFIX=${DESTDIR}/usr