shorewall: fix conf_files pathname expansion; misc fixes.

This commit is contained in:
Juan RP 2013-11-14 09:41:46 +01:00
parent 34cc4192c5
commit 2c8e55226e
1 changed files with 19 additions and 14 deletions

View File

@ -1,7 +1,7 @@
# Template file for 'shorewall' # Template file for 'shorewall'
pkgname=shorewall pkgname=shorewall
version=4.5.21.3 version=4.5.21.3
revision=1 revision=2
_disturl="http://www.shorewall.net/pub/${pkgname}/4.5/${pkgname}-4.5.21" _disturl="http://www.shorewall.net/pub/${pkgname}/4.5/${pkgname}-4.5.21"
distfiles=" distfiles="
${_disturl}/${pkgname}-${version}.tar.bz2 ${_disturl}/${pkgname}-${version}.tar.bz2
@ -16,12 +16,13 @@ homepage="http://www.shorewall.net/"
license="GPL" license="GPL"
short_desc="An iptables-based firewall for Linux systems" short_desc="An iptables-based firewall for Linux systems"
create_wrksrc=yes
do_build(){ do_build(){
for product in ${pkgname}{-core,6,}; do for product in ${pkgname}{-core,6,}-${version}; do
cd ${wrksrc} cd ${wrksrc}/${product}
./configure HOST=archlinux SBINDIR=/usr/bin ./configure HOST=archlinux SBINDIR=/usr/bin
done done
} }
do_install() { do_install() {
@ -31,15 +32,17 @@ do_install() {
shorewall_package() { shorewall_package() {
noarch="yes" noarch="yes"
depends="shorewall-core perl" depends="shorewall-core perl"
systemd_services="shorewall.service off" systemd_services="${pkgname}.service off"
make_dirs="/var/lib/${pkgname} 0755 0 0" 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() { pkg_install() {
cd ${wrksrc} cd ${wrksrc}/${pkgname}-${version}
DESTDIR="${PKGDESTDIR}" ./install.sh DESTDIR="${PKGDESTDIR}" ./install.sh
install -d "${PKGDESTDIR}/usr/share/doc/${pkgname}/" vmkdir usr/share/doc/${pkgname}
cp -r Samples "${PKGDESTDIR}/usr/share/doc/${pkgname}/" cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
} }
for f in ${PKGDESTDIR}/etc/${pkgname}/*; do
conf_files+="${f##${PKGDESTDIR}} "
done
} }
shorewall-core_package() { shorewall-core_package() {
@ -47,7 +50,7 @@ shorewall-core_package() {
depends="iptables iproute2" depends="iptables iproute2"
short_desc+=" - Core Shorewall libraries" short_desc+=" - Core Shorewall libraries"
pkg_install() { pkg_install() {
cd ${wrksrc} cd ${wrksrc}/${pkgname}-${version}
DESTDIR="${PKGDESTDIR}" ./install.sh DESTDIR="${PKGDESTDIR}" ./install.sh
} }
} }
@ -56,11 +59,13 @@ shorewall6_package() {
noarch="yes" noarch="yes"
depends="shorewall" depends="shorewall"
short_desc+=" - IPv6 support" short_desc+=" - IPv6 support"
systemd_services="shorewall6.service off" systemd_services="${pkgname}.service off"
make_dirs="/var/lib/${pkgname} 0755 0 0" 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() { pkg_install() {
cd ${wrksrc} cd ${wrksrc}/${pkgname}-${version}
DESTDIR="${PKGDESTDIR}" ./install.sh DESTDIR="${PKGDESTDIR}" ./install.sh
} }
for f in ${PKGDESTDIR}/etc/${pkgname}/*; do
conf_files+="${f##${PKGDESTDIR}} "
done
} }