From 3fb1956ce2bb80e3ea994d09510355fdafc0ebfa Mon Sep 17 00:00:00 2001 From: wertyi48 Date: Tue, 12 Nov 2013 19:33:15 -0400 Subject: [PATCH 1/5] New package: shorewall. --- srcpkgs/shorewall-core | 1 + srcpkgs/shorewall/template | 64 ++++++++++++++++++++++++++++++++++++++ srcpkgs/shorewall6 | 1 + 3 files changed, 66 insertions(+) create mode 120000 srcpkgs/shorewall-core create mode 100644 srcpkgs/shorewall/template create mode 120000 srcpkgs/shorewall6 diff --git a/srcpkgs/shorewall-core b/srcpkgs/shorewall-core new file mode 120000 index 00000000000..19051bd7df7 --- /dev/null +++ b/srcpkgs/shorewall-core @@ -0,0 +1 @@ +shorewall/ \ No newline at end of file diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template new file mode 100644 index 00000000000..f3cda48548a --- /dev/null +++ b/srcpkgs/shorewall/template @@ -0,0 +1,64 @@ +# Template file for 'shorewall' +pkgname=shorewall +version=4.5.21.3 +revision=1 +_disturl="http://www.shorewall.net/pub/${pkgname}/4.5/${pkgname}-4.5.21" +distfiles=" + ${_disturl}/${pkgname}-${version}.tar.bz2 + ${_disturl}/shorewall6-${version}.tar.bz2 + ${_disturl}/shorewall-core-${version}.tar.bz2" +checksum=" + dd1160c077112264094478ee81d83c2757d6d72d0d8e7fe6bf000427282a8356 + 2eccf072ffb83733e73697f425cfd832de91ec70cb19231bb9f88a461790c0da + 220725caf825ff0df7c7cf8e78866ec80c847e8b9160cdb8fbc19613248bdc2a" +maintainer="Steven R " +homepage="http://www.shorewall.net/" +license="GPL" +short_desc="An iptables-based firewall for Linux systems" + +do_build(){ +for product in shorewall{-core,6,}; do + cd ${XBPS_BUILDDIR}/${product}-${version} + ./configure HOST=archlinux SBINDIR=/usr/bin +done +} + +do_install() { + : +} + +shorewall_package() { + conf_files="/etc/shorewall/{accounting,actions,blrules,clear,conntrack,ecn,findgw,hosts,init,initdone,interfaces,lib.private,maclist,masq,nat,netmap,params,policy,providers,proxyarp,refresh,refreshed,restored,routes,stoppedrules,rtrules,rules,scfilter,secmarks,shorewall.conf,start,started,stop,stopped,tcclasses,tcclear,tcdevices,tcfilters,tcinterfaces,tcpri,tcrules,tos,tunnels,zones}" + noarch="yes" + depends="shorewall-core perl" + make_dirs="/var/lib/shorewall 0755 0 0" + pkg_install() { + cd ${XBPS_BUILDDIR}/shorewall-${version} + DESTDIR="${DESTDIR}" ./install.sh + install -d "${DESTDIR}/usr/share/doc/shorewall/" + cp -r Samples "${DESTDIR}/usr/share/doc/shorewall/" + vmove all + } +} + +shorewall-core_package() { + short_desc+=" - Core Shorewall libraries" + noarch="yes" + depends="iptables iproute2" + pkg_install() { + cd ${XBPS_BUILDDIR}/shorewall-core-${version} + DESTDIR="${DESTDIR}" ./install.sh + vmove all + } +} + +shorewall6_package() { + short_desc+=" - IPv6 support" + noarch="yes" + depends="shorewall" + pkg_install() { + cd ${XBPS_BUILDDIR}/shorewall6-${version} + DESTDIR="${DESTDIR}" ./install.sh + vmove all + } +} diff --git a/srcpkgs/shorewall6 b/srcpkgs/shorewall6 new file mode 120000 index 00000000000..19051bd7df7 --- /dev/null +++ b/srcpkgs/shorewall6 @@ -0,0 +1 @@ +shorewall/ \ No newline at end of file From 032ca3be304bb3e25b17c2c7b32aa27b2142b6ba Mon Sep 17 00:00:00 2001 From: wertyi48 Date: Tue, 12 Nov 2013 22:57:22 -0400 Subject: [PATCH 2/5] shorewall: systemd_services. --- srcpkgs/shorewall/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template index f3cda48548a..64490967a4c 100644 --- a/srcpkgs/shorewall/template +++ b/srcpkgs/shorewall/template @@ -28,10 +28,11 @@ do_install() { } shorewall_package() { - conf_files="/etc/shorewall/{accounting,actions,blrules,clear,conntrack,ecn,findgw,hosts,init,initdone,interfaces,lib.private,maclist,masq,nat,netmap,params,policy,providers,proxyarp,refresh,refreshed,restored,routes,stoppedrules,rtrules,rules,scfilter,secmarks,shorewall.conf,start,started,stop,stopped,tcclasses,tcclear,tcdevices,tcfilters,tcinterfaces,tcpri,tcrules,tos,tunnels,zones}" noarch="yes" depends="shorewall-core perl" + systemd_services="shorewall.service off" make_dirs="/var/lib/shorewall 0755 0 0" + conf_files="/etc/shorewall/{accounting,actions,blrules,clear,conntrack,ecn,findgw,hosts,init,initdone,interfaces,lib.private,maclist,masq,nat,netmap,params,policy,providers,proxyarp,refresh,refreshed,restored,routes,stoppedrules,rtrules,rules,scfilter,secmarks,shorewall.conf,start,started,stop,stopped,tcclasses,tcclear,tcdevices,tcfilters,tcinterfaces,tcpri,tcrules,tos,tunnels,zones}" pkg_install() { cd ${XBPS_BUILDDIR}/shorewall-${version} DESTDIR="${DESTDIR}" ./install.sh From ce9b785b1ac105c6b68f96541f27d0b7e0c6595f Mon Sep 17 00:00:00 2001 From: wertyi48 Date: Tue, 12 Nov 2013 23:14:49 -0400 Subject: [PATCH 3/5] shorewall: misc changes. --- srcpkgs/shorewall/template | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template index 64490967a4c..cb3d4c485ab 100644 --- a/srcpkgs/shorewall/template +++ b/srcpkgs/shorewall/template @@ -5,8 +5,8 @@ revision=1 _disturl="http://www.shorewall.net/pub/${pkgname}/4.5/${pkgname}-4.5.21" distfiles=" ${_disturl}/${pkgname}-${version}.tar.bz2 - ${_disturl}/shorewall6-${version}.tar.bz2 - ${_disturl}/shorewall-core-${version}.tar.bz2" + ${_disturl}/${pkgname}6-${version}.tar.bz2 + ${_disturl}/${pkgname}-core-${version}.tar.bz2" checksum=" dd1160c077112264094478ee81d83c2757d6d72d0d8e7fe6bf000427282a8356 2eccf072ffb83733e73697f425cfd832de91ec70cb19231bb9f88a461790c0da @@ -16,8 +16,10 @@ homepage="http://www.shorewall.net/" license="GPL" short_desc="An iptables-based firewall for Linux systems" +noarch="yes" + do_build(){ -for product in shorewall{-core,6,}; do +for product in ${pkgname}{-core,6,}; do cd ${XBPS_BUILDDIR}/${product}-${version} ./configure HOST=archlinux SBINDIR=/usr/bin done @@ -28,26 +30,24 @@ do_install() { } shorewall_package() { - noarch="yes" depends="shorewall-core perl" systemd_services="shorewall.service off" - make_dirs="/var/lib/shorewall 0755 0 0" - conf_files="/etc/shorewall/{accounting,actions,blrules,clear,conntrack,ecn,findgw,hosts,init,initdone,interfaces,lib.private,maclist,masq,nat,netmap,params,policy,providers,proxyarp,refresh,refreshed,restored,routes,stoppedrules,rtrules,rules,scfilter,secmarks,shorewall.conf,start,started,stop,stopped,tcclasses,tcclear,tcdevices,tcfilters,tcinterfaces,tcpri,tcrules,tos,tunnels,zones}" + make_dirs="/var/lib/${pkgname} 0755 0 0" + conf_files="/etc/${pkgname}/{accounting,actions,blrules,clear,conntrack,ecn,findgw,hosts,init,initdone,interfaces,lib.private,maclist,masq,nat,netmap,params,policy,providers,proxyarp,refresh,refreshed,restored,routes,stoppedrules,rtrules,rules,scfilter,secmarks,shorewall.conf,start,started,stop,stopped,tcclasses,tcclear,tcdevices,tcfilters,tcinterfaces,tcpri,tcrules,tos,tunnels,zones}" pkg_install() { - cd ${XBPS_BUILDDIR}/shorewall-${version} + cd ${XBPS_BUILDDIR}/${pkgname}-${version} DESTDIR="${DESTDIR}" ./install.sh - install -d "${DESTDIR}/usr/share/doc/shorewall/" - cp -r Samples "${DESTDIR}/usr/share/doc/shorewall/" + install -d "${DESTDIR}/usr/share/doc/${pkgname}/" + cp -r Samples "${DESTDIR}/usr/share/doc/${pkgname}/" vmove all } } shorewall-core_package() { short_desc+=" - Core Shorewall libraries" - noarch="yes" depends="iptables iproute2" pkg_install() { - cd ${XBPS_BUILDDIR}/shorewall-core-${version} + cd ${XBPS_BUILDDIR}/${pkgname}-${version} DESTDIR="${DESTDIR}" ./install.sh vmove all } @@ -55,10 +55,9 @@ shorewall-core_package() { shorewall6_package() { short_desc+=" - IPv6 support" - noarch="yes" depends="shorewall" pkg_install() { - cd ${XBPS_BUILDDIR}/shorewall6-${version} + cd ${XBPS_BUILDDIR}/${pkgname}-${version} DESTDIR="${DESTDIR}" ./install.sh vmove all } From c3f758c6bb0da3df369b406a89f2797da3c336f6 Mon Sep 17 00:00:00 2001 From: wertyi48 Date: Wed, 13 Nov 2013 11:52:41 -0400 Subject: [PATCH 4/5] shorewall: change variables; revert noarch change; and more add systemd_services and make_dirs for the shorewall6 package --- srcpkgs/shorewall/template | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template index cb3d4c485ab..d369306d8f3 100644 --- a/srcpkgs/shorewall/template +++ b/srcpkgs/shorewall/template @@ -16,11 +16,10 @@ homepage="http://www.shorewall.net/" license="GPL" short_desc="An iptables-based firewall for Linux systems" -noarch="yes" do_build(){ for product in ${pkgname}{-core,6,}; do - cd ${XBPS_BUILDDIR}/${product}-${version} + cd ${wrksrc} ./configure HOST=archlinux SBINDIR=/usr/bin done } @@ -30,35 +29,39 @@ do_install() { } shorewall_package() { + noarch="yes" depends="shorewall-core perl" systemd_services="shorewall.service off" make_dirs="/var/lib/${pkgname} 0755 0 0" conf_files="/etc/${pkgname}/{accounting,actions,blrules,clear,conntrack,ecn,findgw,hosts,init,initdone,interfaces,lib.private,maclist,masq,nat,netmap,params,policy,providers,proxyarp,refresh,refreshed,restored,routes,stoppedrules,rtrules,rules,scfilter,secmarks,shorewall.conf,start,started,stop,stopped,tcclasses,tcclear,tcdevices,tcfilters,tcinterfaces,tcpri,tcrules,tos,tunnels,zones}" pkg_install() { - cd ${XBPS_BUILDDIR}/${pkgname}-${version} - DESTDIR="${DESTDIR}" ./install.sh - install -d "${DESTDIR}/usr/share/doc/${pkgname}/" - cp -r Samples "${DESTDIR}/usr/share/doc/${pkgname}/" + cd ${wrksrc} + DESTDIR="${PKGDESTDIR}" ./install.sh + install -d "${PKGDESTDIR}/usr/share/doc/${pkgname}/" + cp -r Samples "${PKGDESTDIR}/usr/share/doc/${pkgname}/" vmove all } } shorewall-core_package() { - short_desc+=" - Core Shorewall libraries" + noarch="yes" depends="iptables iproute2" + short_desc+=" - Core Shorewall libraries" pkg_install() { - cd ${XBPS_BUILDDIR}/${pkgname}-${version} - DESTDIR="${DESTDIR}" ./install.sh + cd ${wrksrc} + DESTDIR="${PKGDESTDIR}" ./install.sh vmove all } } shorewall6_package() { - short_desc+=" - IPv6 support" depends="shorewall" + short_desc+=" - IPv6 support" + systemd_services="shorewall6.service off" + make_dirs="/var/lib/${pkgname} 0755 0 0" pkg_install() { - cd ${XBPS_BUILDDIR}/${pkgname}-${version} - DESTDIR="${DESTDIR}" ./install.sh + cd ${wrksrc} + DESTDIR="${PKGDESTDIR}" ./install.sh vmove all } } From cd595ed1c5abf758902cc1a8c17d874471d0303d Mon Sep 17 00:00:00 2001 From: wertyi48 Date: Wed, 13 Nov 2013 20:30:00 -0400 Subject: [PATCH 5/5] shorewall: missing noarch and add the missing config files for shorewall6 remove the non necessary vmove --- srcpkgs/shorewall/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template index d369306d8f3..3ff04e3e637 100644 --- a/srcpkgs/shorewall/template +++ b/srcpkgs/shorewall/template @@ -39,7 +39,6 @@ shorewall_package() { DESTDIR="${PKGDESTDIR}" ./install.sh install -d "${PKGDESTDIR}/usr/share/doc/${pkgname}/" cp -r Samples "${PKGDESTDIR}/usr/share/doc/${pkgname}/" - vmove all } } @@ -50,18 +49,18 @@ shorewall-core_package() { pkg_install() { cd ${wrksrc} DESTDIR="${PKGDESTDIR}" ./install.sh - vmove all } } shorewall6_package() { + noarch="yes" depends="shorewall" short_desc+=" - IPv6 support" systemd_services="shorewall6.service off" make_dirs="/var/lib/${pkgname} 0755 0 0" + conf_files="/etc/${pkgname}/{accounting,actions,blrules,clear,conntrack,ecn,findgw,hosts,init,initdone,interfaces,lib.private,maclist,masq,nat,netmap,params,policy,providers,proxyarp,refresh,refreshed,restored,routes,stoppedrules,rtrules,rules,scfilter,secmarks,shorewall.conf,start,started,stop,stopped,tcclasses,tcclear,tcdevices,tcfilters,tcinterfaces,tcpri,tcrules,tos,tunnels,zones}" pkg_install() { cd ${wrksrc} DESTDIR="${PKGDESTDIR}" ./install.sh - vmove all } }