From 61d3bc61bf09b9006667fbb8b545927e5647f56c Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Mon, 9 Jan 2012 12:00:26 +0000 Subject: [PATCH] updated on Mon Jan 9 12:00:26 UTC 2012 --- 2gis-novosibirsk/PKGBUILD | 6 +- 2gis-spb/PKGBUILD | 14 +- apf-firewall/PKGBUILD | 18 +- apf-firewall/apf-arch.init | 0 apf-firewall/apf-arch.patch | 1395 +++++++------------- apf-firewall/apf-firewall.install | 2 - asterisk/PKGBUILD | 4 +- asterisk10/PKGBUILD | 6 +- bsnes-aio/PKGBUILD | 21 +- cnijfilter-mp280/PKGBUILD | 99 ++ cnijfilter-mp280/cnijfilter-mp280.install | 19 + cnijfilter-mp280/fix.patch | 10 + debmirror/PKGBUILD | 8 +- docblox/PKGBUILD | 25 +- evolus-pencil-svn/PKGBUILD | 117 +- evolus-pencil-svn/evolus-pencil-svn.install | 6 + evolus-pencil-svn/evolus-pencil.sh | 6 +- exim-mysql/PKGBUILD | 18 +- exim-mysql/exim.install | 3 + exim-mysql/exim.logrotate | 1 + firefox-beta-bin-all-localizations/PKGBUILD | 8 +- .../ff-downloader.pl | 93 +- fritzing/PKGBUILD | 4 +- .../PKGBUILD | 6 +- gnome-theme-chocolatte/PKGBUILD | 10 +- hamsimanager/PKGBUILD | 5 +- ipxe-git/PKGBUILD | 10 +- ipxe-git/ipxe_dns.diff | 10 - kdeplasma-applets-plasma-crystal-git/PKGBUILD | 47 + libgeier/PKGBUILD | 4 +- libmilter-shared/PKGBUILD | 72 + libmilter-shared/export-smfi.lds | 4 + libmodbus/PKGBUILD | 10 +- linux-usermode/PKGBUILD | 4 +- logitechmediaserver/PKGBUILD | 3 +- lsx/PKGBUILD | 9 +- mfiler3/PKGBUILD | 10 +- ntfs-3g-ar/PKGBUILD | 20 +- ocaml-fdinfo/PKGBUILD | 4 +- pacaur-git/PKGBUILD | 2 +- pacaur/PKGBUILD | 4 +- pacaur/pacaur25.install | 2 +- saphire/PKGBUILD | 6 +- taxbird/PKGBUILD | 6 +- thunderbird-beta-bin-all-localizations/PKGBUILD | 34 + .../ff-downloader.pl | 93 +- .../thunderbird-beta-bin.desktop | 13 + .../thunderbird.install | 12 + ttf-microsoft-arial/PKGBUILD | 21 + ttf-microsoft-arial/ttf-microsoft-arial.install | 12 + ttf-microsoft-consolas/PKGBUILD | 21 + .../ttf-microsoft-consolas.install | 12 + ttf-microsoft-jhenghei/PKGBUILD | 19 + .../ttf-microsoft-jhenghei.install | 12 + ttf-microsoft-lisu/PKGBUILD | 18 + ttf-microsoft-lisu/ttf-microsoft-lisu.install | 12 + ttf-microsoft-tahoma/PKGBUILD | 19 + ttf-microsoft-tahoma/ttf-microsoft-tahoma.install | 12 + ttf-microsoft-wingding/PKGBUILD | 20 + .../ttf-microsoft-wingding.install | 12 + ttf-microsoft-yahei/PKGBUILD | 19 + ttf-microsoft-yahei/ttf-microsoft-yahei.install | 12 + ttf-microsoft-youyuan/PKGBUILD | 18 + .../ttf-microsoft-youyuan.install | 12 + upp-svn/PKGBUILD | 2 +- user-mode-linux/PKGBUILD | 4 +- varicad-view/PKGBUILD | 10 +- virt-manager-light/PKGBUILD | 24 +- virt-manager-light/virt-manager.install | 12 +- 69 files changed, 1418 insertions(+), 1168 deletions(-) mode change 100644 => 100755 apf-firewall/apf-arch.init rewrite apf-firewall/apf-arch.patch (77%) mode change 100644 => 100755 apf-firewall/apf-firewall.install create mode 100644 cnijfilter-mp280/PKGBUILD create mode 100644 cnijfilter-mp280/cnijfilter-mp280.install create mode 100644 cnijfilter-mp280/fix.patch rewrite evolus-pencil-svn/PKGBUILD (77%) create mode 100644 evolus-pencil-svn/evolus-pencil-svn.install delete mode 100644 ipxe-git/ipxe_dns.diff create mode 100644 kdeplasma-applets-plasma-crystal-git/PKGBUILD create mode 100644 libmilter-shared/PKGBUILD create mode 100644 libmilter-shared/export-smfi.lds create mode 100644 thunderbird-beta-bin-all-localizations/PKGBUILD copy {firefox-beta-bin-all-localizations => thunderbird-beta-bin-all-localizations}/ff-downloader.pl (62%) create mode 100644 thunderbird-beta-bin-all-localizations/thunderbird-beta-bin.desktop create mode 100644 thunderbird-beta-bin-all-localizations/thunderbird.install create mode 100644 ttf-microsoft-arial/PKGBUILD create mode 100644 ttf-microsoft-arial/ttf-microsoft-arial.install create mode 100644 ttf-microsoft-consolas/PKGBUILD create mode 100644 ttf-microsoft-consolas/ttf-microsoft-consolas.install create mode 100644 ttf-microsoft-jhenghei/PKGBUILD create mode 100644 ttf-microsoft-jhenghei/ttf-microsoft-jhenghei.install create mode 100644 ttf-microsoft-lisu/PKGBUILD create mode 100644 ttf-microsoft-lisu/ttf-microsoft-lisu.install create mode 100644 ttf-microsoft-tahoma/PKGBUILD create mode 100644 ttf-microsoft-tahoma/ttf-microsoft-tahoma.install create mode 100644 ttf-microsoft-wingding/PKGBUILD create mode 100644 ttf-microsoft-wingding/ttf-microsoft-wingding.install create mode 100644 ttf-microsoft-yahei/PKGBUILD create mode 100644 ttf-microsoft-yahei/ttf-microsoft-yahei.install create mode 100644 ttf-microsoft-youyuan/PKGBUILD create mode 100644 ttf-microsoft-youyuan/ttf-microsoft-youyuan.install diff --git a/2gis-novosibirsk/PKGBUILD b/2gis-novosibirsk/PKGBUILD index e4ecf1047..10a809baf 100644 --- a/2gis-novosibirsk/PKGBUILD +++ b/2gis-novosibirsk/PKGBUILD @@ -1,15 +1,15 @@ # Contributor: max1m pkgname=2gis-novosibirsk -pkgver=156 +pkgver=160 pkgrel=1 pkgdesc="Map of Novosibirsk for 2GIS" arch=('i686' 'x86_64') -url="http://help.2gis.ru/linux/" +url="http://nsk.2gis.ru/how-get/linux/" license=('custom') depends=('2gis') source=("http://download.2gis.ru/arhives/2GISData_Novosibirsk-${pkgver}.orig.zip") -md5sums=('96cfb189b7a4c5a85268c70af1a4403a') +md5sums=('b5011e320d0b4a773511aed2e90a8001') build() { diff --git a/2gis-spb/PKGBUILD b/2gis-spb/PKGBUILD index 460284cd6..96e78391d 100644 --- a/2gis-spb/PKGBUILD +++ b/2gis-spb/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: max1m - + pkgname=2gis-spb -pkgver=7 +pkgver=11 pkgrel=1 pkgdesc="Map of Spb for 2GIS" arch=('i686' 'x86_64') @@ -9,15 +9,15 @@ url="http://help.2gis.ru/linux/" license=('custom') depends=('2gis') source=("http://download.2gis.ru/arhives/2GISData_Spb-${pkgver}.orig.zip") -md5sums=('0571f7ce8797f2c53efcd310fc6edb84') - +md5sums=('9ec5336fc5f1a5767e1438747fa9ae93') + build() { - + cd $startdir - + # Installing to /opt/2gis install -D -m 644 ${startdir}/src/2gis/3.0/Data_Spb.dgdat "${startdir}/pkg/opt/2gis/spb.dgdat" || return 1 install -D -m 644 ${startdir}/src/2gis/3.0/Plugins/DGisLan/Spb.dglf "${startdir}/pkg/opt/2gis/Plugins/DGisLan/Spb.dglf" || return 1 - + } diff --git a/apf-firewall/PKGBUILD b/apf-firewall/PKGBUILD index a2cdfff0b..ac505c0bd 100644 --- a/apf-firewall/PKGBUILD +++ b/apf-firewall/PKGBUILD @@ -15,7 +15,7 @@ source=('apf-arch.patch' 'http://www.rfxn.com/downloads/apf-current.tar.gz') build() { - cd ${srcdir}/apf-9.7-1 + cd ${srcdir}/apf-${pkgver}-${pkgrel} msg "Patching apf source" patch -p1 -i ../apf-arch.patch } @@ -29,21 +29,21 @@ package_apf-firewall() { install=${pkgname}.install mkdir -p ${pkgdir}/usr/local/sbin mkdir -p ${pkgdir}/etc/apf/{extras,doc,vnet} - cp ${srcdir}/apf-9.7-1/README.apf ${srcdir}/apf-9.7-1/CHANGELOG ${srcdir}/apf-9.7-1/COPYING.GPL ${pkgdir}/etc/apf/doc - cp -R ${srcdir}/apf-9.7-1/files/* ${pkgdir}/etc/apf + cp ${srcdir}/apf-${pkgver}-${pkgrel}/README.apf ${srcdir}/apf-${pkgver}-${pkgrel}/CHANGELOG ${srcdir}/apf-${pkgver}-${pkgrel}/COPYING.GPL ${pkgdir}/etc/apf/doc + cp -R ${srcdir}/apf-${pkgver}-${pkgrel}/files/* ${pkgdir}/etc/apf chmod -R 640 ${pkgdir}/etc/apf/* - cp -p ${srcdir}/apf-9.7-1/.ca.def ${srcdir}/apf-9.7-1/importconf ${pkgdir}/etc/apf/extras + cp -p ${srcdir}/apf-${pkgver}-${pkgrel}/.ca.def ${srcdir}/apf-${pkgver}-${pkgrel}/importconf ${pkgdir}/etc/apf/extras chmod 750 ${pkgdir}/etc/apf/firewall ${pkgdir}/etc/apf/apf ${pkgdir}/etc/apf/vnet/vnetgen ${pkgdir}/etc/apf/extras/get_ports \ ${pkgdir}/etc/apf/extras/dshield/install ${pkgdir}/etc/apf ln -s /etc/apf/apf ${pkgdir}/usr/local/sbin/apf ln -s /etc/apf/apf ${pkgdir}/usr/local/sbin/fwmgr install -D -m755 ${srcdir}/apf-arch.init ${pkgdir}/etc/rc.d/apf - install -D -m644 ${srcdir}/apf-9.7-1/logrotate.d.apf ${pkgdir}/etc/logrotate.d/apf - #install -D -m644 ${srcdir}/apf-9.7-1/cron.daily ${pkgdir}/etc/cron.daily/apf - install -D -m644 ${srcdir}/apf-9.7-1/COPYING.GPL ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 ${srcdir}/apf-${pkgver}-${pkgrel}/logrotate.d.apf ${pkgdir}/etc/logrotate.d/apf + #install -D -m644 ${srcdir}/apf-${pkgver}-${pkgrel}/cron.daily ${pkgdir}/etc/cron.daily/apf + install -D -m644 ${srcdir}/apf-${pkgver}-${pkgrel}/COPYING.GPL ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } pkgdesc="Advanced Policy Firewall (APF) is an iptables(netfilter) based firewall system designed around the essential needs of todays Linux servers." -sha256sums=('6abfd5c720109941ae17fe2522f9ecf4d9c1cc18383d6425c27ce2d167a6600d' +sha256sums=('5d2d58359f923dae47792eafc640cfe1556c0bc1b909214dbb1c61b07c9b82eb' '1342aa3d8ddff58a075c95b5dec545084f475eb33707b83daf511e3cdb83d8c0' - 'd0f2ac7cab6b56aedbe4b3620ed399f599fb0676505d08b7ed85e32c7706c4e9') + 'be252d7d8e34f4c023d1579daea3f717019e7638da4ef35d0568f86ef7608823') diff --git a/apf-firewall/apf-arch.init b/apf-firewall/apf-arch.init old mode 100644 new mode 100755 diff --git a/apf-firewall/apf-arch.patch b/apf-firewall/apf-arch.patch dissimilarity index 77% index e79f2d4d7..cc1f4b905 100644 --- a/apf-firewall/apf-arch.patch +++ b/apf-firewall/apf-arch.patch @@ -1,917 +1,478 @@ -diff -crB apf-9.7-1/files/apf apf-9.7-2/files/apf -*** apf-9.7-1/files/apf 2009-03-17 08:36:16.000000000 -0400 ---- apf-9.7-2/files/apf 2011-10-21 16:09:09.859013164 -0400 -*************** -*** 148,170 **** - touch $ALLOW_HOSTS - chmod 600 $ALLOW_HOSTS - fi - # check devel mode - devm - # generate vnet rules - $INSTALL_PATH/vnet/vnetgen - # start main firewall script - $INSTALL_PATH/firewall - # check for/load bandmin - LOAD=`cat /proc/loadavg | tr '.' ' ' | awk '{print$1}'` - if [ ! "$LOAD" -gt "10" ]; then - bandmin - fi -! eout "{glob} firewall initalized" - if [ "$MD5_FIRSTRUN" == "1" ]; then - $MD5 $MD5_FILES > $INSTALL_PATH/internals/.md5.cores 2> /dev/null - fi - -! firewall_on=`iptables -L --numeric | grep -vE "Chain|destination"` - if [ ! "$DEVEL_ON" == "1" ] && [ ! "$firewall_on" == "" ]; then - $IPTS > $INSTALL_PATH/internals/.apf.restore - eout "{glob} fast load snapshot saved" ---- 148,172 ---- - touch $ALLOW_HOSTS - chmod 600 $ALLOW_HOSTS - fi -+ rc=0 - # check devel mode - devm - # generate vnet rules - $INSTALL_PATH/vnet/vnetgen - # start main firewall script - $INSTALL_PATH/firewall -+ rc=$? - # check for/load bandmin - LOAD=`cat /proc/loadavg | tr '.' ' ' | awk '{print$1}'` - if [ ! "$LOAD" -gt "10" ]; then - bandmin - fi -! [ "$rc" = "0" ] && eout "{glob} firewall initalized" - if [ "$MD5_FIRSTRUN" == "1" ]; then - $MD5 $MD5_FILES > $INSTALL_PATH/internals/.md5.cores 2> /dev/null - fi - -! firewall_on=`$IPT -L --numeric | grep -vE "Chain|destination"` - if [ ! "$DEVEL_ON" == "1" ] && [ ! "$firewall_on" == "" ]; then - $IPTS > $INSTALL_PATH/internals/.apf.restore - eout "{glob} fast load snapshot saved" -*************** -*** 217,220 **** - help - esac - -! exit 0 ---- 219,222 ---- - help - esac - -! exit $rc -diff -crB apf-9.7-1/files/firewall apf-9.7-2/files/firewall -*** apf-9.7-1/files/firewall 2011-01-02 10:26:06.000000000 -0500 ---- apf-9.7-2/files/firewall 2011-10-21 15:29:25.727537816 -0400 -*************** -*** 43,49 **** - - if [ ! "$IF" == "" ]; then - for i in `echo $IF`; do -! VAL_IF=`/sbin/route -n | grep -w $i` - if [ "$VAL_IF" == "" ]; then - eout "{glob} could not verify that interface $IF is routed to a network, aborting." - if [ ! "$SET_VERBOSE" == "1" ]; then ---- 43,49 ---- - - if [ ! "$IF" == "" ]; then - for i in `echo $IF`; do -! VAL_IF=`route -n 2>/dev/null | grep -w $i` - if [ "$VAL_IF" == "" ]; then - eout "{glob} could not verify that interface $IF is routed to a network, aborting." - if [ ! "$SET_VERBOSE" == "1" ]; then -*************** -*** 55,61 **** - fi - if [ ! "$IFACE_TRUSTED" == "" ]; then - for i in `echo $IFACE_TRUSTED`; do -! VAL_IFACE_TRUSTED=`/sbin/route -n | grep -w $i` - if [ "$VAL_IFACE_TRUSTED" == "" ]; then - eout "{glob} could not verify that interface $IFACE_TRUSTED is routed to a network, aborting." - if [ ! "$SET_VERBOSE" == "1" ]; then ---- 55,61 ---- - fi - if [ ! "$IFACE_TRUSTED" == "" ]; then - for i in `echo $IFACE_TRUSTED`; do -! VAL_IFACE_TRUSTED=`route -n 2>/dev/null| grep -w $i` - if [ "$VAL_IFACE_TRUSTED" == "" ]; then - eout "{glob} could not verify that interface $IFACE_TRUSTED is routed to a network, aborting." - if [ ! "$SET_VERBOSE" == "1" ]; then -*************** -*** 87,93 **** - # Allow all traffic on trusted interfaces - if [ ! "$IFACE_TRUSTED" == "" ]; then - for i in `echo $IFACE_TRUSTED | tr ',' ' '`; do -! VAL_IF=`/sbin/ip addr list | grep -w $i` - if [ "$VAL_IF" == "" ]; then - eout "{glob} unable to verify status of interface $i; assuming untrusted" - else ---- 87,93 ---- - # Allow all traffic on trusted interfaces - if [ ! "$IFACE_TRUSTED" == "" ]; then - for i in `echo $IFACE_TRUSTED | tr ',' ' '`; do -! VAL_IF=`$ip addr list | grep -w $i` - if [ "$VAL_IF" == "" ]; then - eout "{glob} unable to verify status of interface $i; assuming untrusted" - else -*************** -*** 105,111 **** - $IPT -A PROHIBIT -j REJECT --reject-with icmp-host-prohibited - - # Load our SYSCTL rules -! . $INSTALL_PATH/sysctl.rules >> /dev/null 2>&1 - - # Fix MTU/MSS Problems - $IPT -A OUTPUT -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu ---- 105,111 ---- - $IPT -A PROHIBIT -j REJECT --reject-with icmp-host-prohibited - - # Load our SYSCTL rules -! . $INSTALL_PATH/sysctl.rules - - # Fix MTU/MSS Problems - $IPT -A OUTPUT -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu -*************** -*** 316,318 **** ---- 316,320 ---- - $IPT -A INPUT -p tcp -j $TCP_STOP - $IPT -A INPUT -p udp -j $UDP_STOP - $IPT -A INPUT -p all -j $ALL_STOP -+ -+ exit 0 -diff -crB apf-9.7-1/files/internals/functions.apf apf-9.7-2/files/internals/functions.apf -*** apf-9.7-1/files/internals/functions.apf 2010-07-23 20:30:29.000000000 -0400 ---- apf-9.7-2/files/internals/functions.apf 2011-10-21 16:08:23.887464366 -0400 -*************** -*** 41,60 **** - eout "{glob} !!DEVELOPMENT MODE ENABLED!! - firewall will flush every 5 minutes." - echo "!!DEVELOPMENT MODE ENABLED!! - firewall will flush every 5 minutes." - fi -! APF_CJ=`cat $CRON | grep -w /etc/init.d/apf` - if [ "$APF_CJ" == "" ]; then - cp -f $CRON $CRON.bk - cat > $TMP_CJ <> /dev/null 2>&1 - EOF - cat $TMP_CJ >> $CRON - rm -f $TMP_CJ - fi - elif [ "$DEVEL_MODE" == "0" ]; then -! APF_CJ=`cat $CRON | grep -w /etc/init.d/apf` - if [ ! "$APF_CJ" == "" ]; then -! cat $CRON | grep -vw "/etc/init.d/apf" > $CRON.tmp - cp -f $CRON $CRON.bk - mv $CRON.tmp $CRON - chmod 644 $CRON ---- 41,60 ---- - eout "{glob} !!DEVELOPMENT MODE ENABLED!! - firewall will flush every 5 minutes." - echo "!!DEVELOPMENT MODE ENABLED!! - firewall will flush every 5 minutes." - fi -! APF_CJ=`cat $CRON | grep -w /usr/loca/sbin/apf` - if [ "$APF_CJ" == "" ]; then - cp -f $CRON $CRON.bk - cat > $TMP_CJ < /dev/null 2>&1 - EOF - cat $TMP_CJ >> $CRON - rm -f $TMP_CJ - fi - elif [ "$DEVEL_MODE" == "0" ]; then -! APF_CJ=`cat $CRON | grep -w /usr/loca/sbin/apf` - if [ ! "$APF_CJ" == "" ]; then -! cat $CRON | grep -vw "/usr/loca/sbin/apf" > $CRON.tmp - cp -f $CRON $CRON.bk - mv $CRON.tmp $CRON - chmod 644 $CRON -*************** -*** 152,162 **** - } - - check_rab() { -! if [ ! -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/ipt_recent.$MEXT" ] || [ ! -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/xt_recent.$MEXT" ]; then -! if [ "$RAB" == "1" ]; then - RAB="0" - eout "{rab} force set RAB disabled, kernel module ipt_recent not found." -- fi - fi - } - ---- 152,160 ---- - } - - check_rab() { -! if [ -z "$(cat /proc/net/ip_tables_matches | grep '^recent')" ] && [ "$RAB" == "1" ]; then - RAB="0" - eout "{rab} force set RAB disabled, kernel module ipt_recent not found." - fi - } - -*************** -*** 232,256 **** - $IPT -D TGDENY -s $DIP -j $ALL_STOP - $IPT -D TGDENY -d $DIP -j $ALL_STOP - -! val=`cat /etc/apf/allow_hosts.rules | grep "$DIP"` - if [ ! "$val" == "" ]; then -! cat /etc/apf/allow_hosts.rules | grep -v "$DIP" > /etc/apf/allow_hosts.rules.new -! mv /etc/apf/allow_hosts.rules.new /etc/apf/allow_hosts.rules - fi -! val=`cat /etc/apf/deny_hosts.rules | grep "$DIP"` - if [ ! "$val" == "" ]; then -! cat /etc/apf/deny_hosts.rules | grep -v "$DIP" > /etc/apf/deny_hosts.rules.new -! mv /etc/apf/deny_hosts.rules.new /etc/apf/deny_hosts.rules - fi -! val=`cat /etc/apf/glob_allow_hosts.rules | grep "$DIP"` - if [ ! "$val" == "" ]; then -! cat /etc/apf/glob_allow_hosts.rules | grep -v "$DIP" > /etc/apf/glob_allow_hosts.rules.new -! mv /etc/apf/glob_allow_hosts.rules.new /etc/apf/glob_allow_hosts.rules - fi -! val=`cat /etc/apf/glob_deny_hosts.rules | grep "$DIP"` - if [ ! "$val" == "" ]; then -! cat /etc/apf/glob_deny_hosts.rules | grep -v "$DIP" > /etc/apf/glob_deny_hosts.rules.new -! mv /etc/apf/glob_deny_hosts.rules.new /etc/apf/glob_deny_hosts.rules - fi - - dil=`$IPT --numeric --list INPUT --line-numbers | grep $DIP | awk '{print$1}'` ---- 230,254 ---- - $IPT -D TGDENY -s $DIP -j $ALL_STOP - $IPT -D TGDENY -d $DIP -j $ALL_STOP - -! val=`cat $INSTALL_PATH/allow_hosts.rules | grep "$DIP"` - if [ ! "$val" == "" ]; then -! cat $INSTALL_PATH/allow_hosts.rules | grep -v "$DIP" > $INSTALL_PATH/allow_hosts.rules.new -! mv $INSTALL_PATH/allow_hosts.rules.new $INSTALL_PATH/allow_hosts.rules - fi -! val=`cat $INSTALL_PATH/deny_hosts.rules | grep "$DIP"` - if [ ! "$val" == "" ]; then -! cat $INSTALL_PATH/deny_hosts.rules | grep -v "$DIP" > $INSTALL_PATH/deny_hosts.rules.new -! mv $INSTALL_PATH/deny_hosts.rules.new $INSTALL_PATH/deny_hosts.rules - fi -! val=`cat $INSTALL_PATH/glob_allow_hosts.rules | grep "$DIP"` - if [ ! "$val" == "" ]; then -! cat $INSTALL_PATH/glob_allow_hosts.rules | grep -v "$DIP" > $INSTALL_PATH/glob_allow_hosts.rules.new -! mv $INSTALL_PATH/glob_allow_hosts.rules.new $INSTALL_PATH/glob_allow_hosts.rules - fi -! val=`cat $INSTALL_PATH/glob_deny_hosts.rules | grep "$DIP"` - if [ ! "$val" == "" ]; then -! cat $INSTALL_PATH/glob_deny_hosts.rules | grep -v "$DIP" > $INSTALL_PATH/glob_deny_hosts.rules.new -! mv $INSTALL_PATH/glob_deny_hosts.rules.new $INSTALL_PATH/glob_deny_hosts.rules - fi - - dil=`$IPT --numeric --list INPUT --line-numbers | grep $DIP | awk '{print$1}'` -*************** -*** 285,291 **** - val_rev=`cat $ALLOW_HOSTS | grep -w $HOST` - val_rev2=`cat $GALLOW_HOSTS | grep -w $HOST` - val_rev3=`cat $GDENY_HOSTS | grep -w $HOST` -! val_rev4=`/sbin/ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $HOST` - if [ ! "$val" == "" ]; then - echo "$HOST already exists in $DENY_HOSTS" - elif [ ! "$val_rev" == "" ]; then ---- 283,289 ---- - val_rev=`cat $ALLOW_HOSTS | grep -w $HOST` - val_rev2=`cat $GALLOW_HOSTS | grep -w $HOST` - val_rev3=`cat $GDENY_HOSTS | grep -w $HOST` -! val_rev4=`$ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $HOST` - if [ ! "$val" == "" ]; then - echo "$HOST already exists in $DENY_HOSTS" - elif [ ! "$val_rev" == "" ]; then -*************** -*** 326,332 **** - val_rev=`cat $ALLOW_HOSTS | grep -w $HOST` - val_rev2=`cat $GALLOW_HOSTS | grep -w $HOST` - val_rev3=`cat $GDENY_HOSTS | grep -w $HOST` -! val_rev4=`/sbin/ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $HOST` - if [ ! "$val" == "" ]; then - echo "$HOST already exists in $DENY_HOSTS" - elif [ ! "$val_rev" == "" ]; then ---- 324,330 ---- - val_rev=`cat $ALLOW_HOSTS | grep -w $HOST` - val_rev2=`cat $GALLOW_HOSTS | grep -w $HOST` - val_rev3=`cat $GDENY_HOSTS | grep -w $HOST` -! val_rev4=`$ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $HOST` - if [ ! "$val" == "" ]; then - echo "$HOST already exists in $DENY_HOSTS" - elif [ ! "$val_rev" == "" ]; then -*************** -*** 359,365 **** - } - - flush() { -! firewall_on=`iptables -L --numeric | grep -vE "Chain|destination"` - if [ "$SET_FASTLOAD" == "1" ] && [ ! "$1" == "1" ] && [ ! "$DEVEL_ON" == "1" ] && [ ! "$firewall_on" == "" ]; then - $IPTS > $INSTALL_PATH/internals/.apf.restore - eout "{glob} fast load snapshot saved" ---- 357,363 ---- - } - - flush() { -! firewall_on=`$IPT -L --numeric | grep -vE "Chain|destination"` - if [ "$SET_FASTLOAD" == "1" ] && [ ! "$1" == "1" ] && [ ! "$DEVEL_ON" == "1" ] && [ ! "$firewall_on" == "" ]; then - $IPTS > $INSTALL_PATH/internals/.apf.restore - eout "{glob} fast load snapshot saved" -*************** -*** 380,395 **** - - list() { - echo "Loading chain rules..." -! iptc=/etc/apf/.ipt.chains - :> $iptc ; chmod 600 $iptc - $IPT --verbose --numeric --line-numbers --list >> $iptc - echo "Opening editor" -! if [ -f "/usr/bin/pico" ]; then -! /usr/bin/pico -w $iptc - elif [ -f "/usr/bin/nano" ]; then - /usr/bin/nano -w $iptc -! elif [ -f "/bin/vi" ]; then -! /bin/vi $iptc - fi - clear - rm -f $iptc ---- 378,393 ---- - - list() { - echo "Loading chain rules..." -! iptc=$INSTALL_PATH/.ipt.chains - :> $iptc ; chmod 600 $iptc - $IPT --verbose --numeric --line-numbers --list >> $iptc - echo "Opening editor" -! if [ -f "/usr/bin/vim" ]; then -! /usr/bin/vim $iptc - elif [ -f "/usr/bin/nano" ]; then - /usr/bin/nano -w $iptc -! elif [ -f "/usr/bin/vi" ]; then -! /usr/bin/vi $iptc - fi - clear - rm -f $iptc -*************** -*** 407,420 **** - echo "-f|--stop........ .................. stop (flush) all firewall rules" - echo "-l|--list .......................... list all firewall rules" - echo "-t|--status ........................ output firewall status log" -! echo "-e|--refresh ....................... refresh & resolve dns names in trust rules" - echo "-a HOST CMT|--allow HOST COMMENT ... add host (IP/FQDN) to allow_hosts.rules and" - echo " immediately load new rule into firewall" - echo "-d HOST CMT|--deny HOST COMMENT .... add host (IP/FQDN) to deny_hosts.rules and" - echo " immediately load new rule into firewall" -! echo "-u|--remove HOST ................... remove host from [glob]*_hosts.rules" -! echo " and immediately remove rule from firewall" -! echo "-o|--ovars ......................... output all configuration options" - } - - tospreroute() { ---- 405,418 ---- - echo "-f|--stop........ .................. stop (flush) all firewall rules" - echo "-l|--list .......................... list all firewall rules" - echo "-t|--status ........................ output firewall status log" -! echo "-e|--refresh ....................... refresh & resolve dns names in trust rules" - echo "-a HOST CMT|--allow HOST COMMENT ... add host (IP/FQDN) to allow_hosts.rules and" - echo " immediately load new rule into firewall" - echo "-d HOST CMT|--deny HOST COMMENT .... add host (IP/FQDN) to deny_hosts.rules and" - echo " immediately load new rule into firewall" -! echo "-u|--remove HOST ................... remove host from [glob]*_hosts.rules" -! echo " and immediately remove rule from firewall" -! echo "-o|--ovars ......................... output all configuration options" - } - - tospreroute() { -*************** -*** 521,527 **** - } - - ovars() { -! nice -n 16 cat /etc/apf/conf.apf /etc/apf/internals/internals.conf | grep -v "#" | grep "=" | tr '=' ' ' | awk '{print""$"$1"}' - } - - allow_hosts() { ---- 519,525 ---- - } - - ovars() { -! nice -n 16 cat $INSTALL_PATH/conf.apf $INSTALL_PATH/internals/internals.conf | grep -v "#" | grep "=" | tr '=' ' ' | awk '{print""$"$1"}' - } - - allow_hosts() { -*************** -*** 530,536 **** - # - # - for i in `cat $ALLOW_HOSTS | grep -v "#" | grep -v ":" | grep -v "="`; do -! val=`/sbin/ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $i` - if [ ! "$val" ]; then - if [ ! "$i" == "" ] && [ -f "$ALLOW_HOSTS" ]; then - eout "{trust} allow all to/from $i" ---- 528,534 ---- - # - # - for i in `cat $ALLOW_HOSTS | grep -v "#" | grep -v ":" | grep -v "="`; do -! val=`$ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $i` - if [ ! "$val" ]; then - if [ ! "$i" == "" ] && [ -f "$ALLOW_HOSTS" ]; then - eout "{trust} allow all to/from $i" -*************** -*** 822,828 **** - # - # - for i in `cat $DENY_HOSTS | grep -v "#" | grep -v ":" | grep -v "="`; do -! val=`/sbin/ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $i` - if [ ! "$val" ]; then - if [ ! "$i" == "" ] && [ -f "$DENY_HOSTS" ]; then - eout "{trust} deny all to/from $i" ---- 820,826 ---- - # - # - for i in `cat $DENY_HOSTS | grep -v "#" | grep -v ":" | grep -v "="`; do -! val=`$ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $i` - if [ ! "$val" ]; then - if [ ! "$i" == "" ] && [ -f "$DENY_HOSTS" ]; then - eout "{trust} deny all to/from $i" -*************** -*** 1128,1134 **** - chmod 600 $RESNET $RESNET.bk - fi - if [ -f "$WGET" ] && [ -f "$RESNET" ]; then -! URL_TMP="/etc/apf/.apf-$$" - rm -rf $URL_TMP - URL_FILE=`echo $DLIST_RESERVED_URL | tr '/' '\n' | grep "." | tail -n 1` - RD_CON="$DLIST_RESERVED_URL_PROT://$DLIST_RESERVED_URL" ---- 1126,1132 ---- - chmod 600 $RESNET $RESNET.bk - fi - if [ -f "$WGET" ] && [ -f "$RESNET" ]; then -! URL_TMP="$INSTALL_PATH/.apf-$$" - rm -rf $URL_TMP - URL_FILE=`echo $DLIST_RESERVED_URL | tr '/' '\n' | grep "." | tail -n 1` - RD_CON="$DLIST_RESERVED_URL_PROT://$DLIST_RESERVED_URL" -*************** -*** 1147,1153 **** - fi - fi - rm -rf $URL_TMP -! cd /etc/apf - else - if [ -f "$RESNET" ]; then - cp $RESNET.bk $RESNET ---- 1145,1151 ---- - fi - fi - rm -rf $URL_TMP -! cd $INSTALL_PATH - else - if [ -f "$RESNET" ]; then - cp $RESNET.bk $RESNET -*************** -*** 1158,1165 **** - - dlist_php() { - if [ ! "$DLIST_PHP_URL_PROT" == "" ] && [ ! "$DLIST_PHP_URL" == "" ] && [ "$DLIST_PHP" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="/etc/apf/.apf-$$" -! rm -rf $URL_TMP /etc/apf/.apf-* - URL_FILE=`echo $DLIST_PHP_URL | tr '/' '\n' | grep "." | tail -n 1` - URL_CON="$DLIST_PHP_URL_PROT://$DLIST_PHP_URL" - mkdir $URL_TMP ---- 1156,1163 ---- - - dlist_php() { - if [ ! "$DLIST_PHP_URL_PROT" == "" ] && [ ! "$DLIST_PHP_URL" == "" ] && [ "$DLIST_PHP" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="$INSTALL_PATH/.apf-$$" -! rm -rf $URL_TMP $INSTALL_PATH/.apf-* - URL_FILE=`echo $DLIST_PHP_URL | tr '/' '\n' | grep "." | tail -n 1` - URL_CON="$DLIST_PHP_URL_PROT://$DLIST_PHP_URL" - mkdir $URL_TMP -*************** -*** 1180,1186 **** - eout "{php} download of $DLIST_PHP_URL_PROT://$DLIST_PHP_URL failed" - fi - rm -rf $URL_TMP -! cd /etc/apf - else - rm -f $PHP_HOSTS - touch $PHP_HOSTS ---- 1178,1184 ---- - eout "{php} download of $DLIST_PHP_URL_PROT://$DLIST_PHP_URL failed" - fi - rm -rf $URL_TMP -! cd $INSTALL_PATH - else - rm -f $PHP_HOSTS - touch $PHP_HOSTS -*************** -*** 1209,1216 **** - - dlist_dshield() { - if [ ! "$DLIST_DSHIELD_URL_PROT" == "" ] && [ ! "$DLIST_DSHIELD_URL" == "" ] && [ "$DLIST_DSHIELD" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="/etc/apf/.apf-$$" -! rm -rf $URL_TMP /etc/apf/.apf-* - URL_FILE=`echo $DLIST_DSHIELD_URL | tr '/' '\n' | grep "." | tail -n 1` - URL_CON="$DLIST_DSHIELD_URL_PROT://$DLIST_DSHIELD_URL" - mkdir $URL_TMP ---- 1207,1214 ---- - - dlist_dshield() { - if [ ! "$DLIST_DSHIELD_URL_PROT" == "" ] && [ ! "$DLIST_DSHIELD_URL" == "" ] && [ "$DLIST_DSHIELD" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="$INSTALL_PATH/.apf-$$" -! rm -rf $URL_TMP $INSTALL_PATH/.apf-* - URL_FILE=`echo $DLIST_DSHIELD_URL | tr '/' '\n' | grep "." | tail -n 1` - URL_CON="$DLIST_DSHIELD_URL_PROT://$DLIST_DSHIELD_URL" - mkdir $URL_TMP -*************** -*** 1231,1237 **** - eout "{dshield} download of $DLIST_DSHIELD_URL_PROT://$DLIST_DSHIELD_URL failed" - fi - rm -rf $URL_TMP -! cd /etc/apf - else - rm -f $DS_HOSTS - touch $DS_HOSTS ---- 1229,1235 ---- - eout "{dshield} download of $DLIST_DSHIELD_URL_PROT://$DLIST_DSHIELD_URL failed" - fi - rm -rf $URL_TMP -! cd $INSTALL_PATH - else - rm -f $DS_HOSTS - touch $DS_HOSTS -*************** -*** 1260,1267 **** - - dlist_spamhaus() { - if [ ! "$DLIST_SPAMHAUS_URL_PROT" == "" ] && [ ! "$DLIST_SPAMHAUS_URL" == "" ] && [ "$DLIST_SPAMHAUS" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="/etc/apf/.apf-$$" -! rm -rf $URL_TMP /etc/apf/.apf-* - URL_FILE=`echo $DLIST_SPAMHAUS_URL | tr '/' '\n' | grep "." | tail -n 1` - URL_CON="$DLIST_SPAMHAUS_URL_PROT://$DLIST_SPAMHAUS_URL" - mkdir $URL_TMP ---- 1258,1265 ---- - - dlist_spamhaus() { - if [ ! "$DLIST_SPAMHAUS_URL_PROT" == "" ] && [ ! "$DLIST_SPAMHAUS_URL" == "" ] && [ "$DLIST_SPAMHAUS" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="$INSTALL_PATH/.apf-$$" -! rm -rf $URL_TMP $INSTALL_PATH/.apf-* - URL_FILE=`echo $DLIST_SPAMHAUS_URL | tr '/' '\n' | grep "." | tail -n 1` - URL_CON="$DLIST_SPAMHAUS_URL_PROT://$DLIST_SPAMHAUS_URL" - mkdir $URL_TMP -*************** -*** 1282,1288 **** - eout "{sdrop} download of $DLIST_SPAMHAUS_URL_PROT://$DLIST_SPAMHAUS_URL failed" - fi - rm -rf $URL_TMP -! cd /etc/apf - else - rm -f $DROP_HOSTS - touch $DROP_HOSTS ---- 1280,1286 ---- - eout "{sdrop} download of $DLIST_SPAMHAUS_URL_PROT://$DLIST_SPAMHAUS_URL failed" - fi - rm -rf $URL_TMP -! cd $INSTALL_PATH - else - rm -f $DROP_HOSTS - touch $DROP_HOSTS -*************** -*** 1312,1319 **** - - dlist_ecnshame() { - if [ ! "$DLIST_ECNSHAME_URL_PROT" == "" ] && [ ! "$DLIST_ECNSHAME_URL" == "" ] && [ "$DLIST_ECNSHAME" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="/etc/apf/.apf-$$" -! rm -rf $URL_TMP /etc/apf/.apf-* - URL_FILE=`echo $DLIST_ECNSHAME_URL | tr '/' '\n' | grep "." | tail -n 1` - URL_CON="$DLIST_ECNSHAME_URL_PROT://$DLIST_ECNSHAME_URL" - mkdir $URL_TMP ---- 1310,1317 ---- - - dlist_ecnshame() { - if [ ! "$DLIST_ECNSHAME_URL_PROT" == "" ] && [ ! "$DLIST_ECNSHAME_URL" == "" ] && [ "$DLIST_ECNSHAME" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="$INSTALL_PATH/.apf-$$" -! rm -rf $URL_TMP $INSTALL_PATH/.apf-* - URL_FILE=`echo $DLIST_ECNSHAME_URL | tr '/' '\n' | grep "." | tail -n 1` - URL_CON="$DLIST_ECNSHAME_URL_PROT://$DLIST_ECNSHAME_URL" - mkdir $URL_TMP -*************** -*** 1334,1340 **** - eout "{ecnshame} download of $DLIST_ECNSHAME_URL_PROT://$DLIST_ECNSHAME_URL failed" - fi - rm -rf $URL_TMP -! cd /etc/apf - else - rm -f $ECNSHAME_HOSTS - touch $ECNSHAME_HOSTS ---- 1332,1338 ---- - eout "{ecnshame} download of $DLIST_ECNSHAME_URL_PROT://$DLIST_ECNSHAME_URL failed" - fi - rm -rf $URL_TMP -! cd $INSTALL_PATH - else - rm -f $ECNSHAME_HOSTS - touch $ECNSHAME_HOSTS -*************** -*** 1355,1361 **** - - glob_allow_download() { - if [ ! "$GA_URL_PROT" == "" ] && [ ! "$GA_URL" == "" ] && [ "$USE_RGT" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="/etc/apf/.apf-$$" - rm -rf $URL_TMP - URL_FILE=`echo $GA_URL | tr '/' '\n' | grep "." | tail -n 1` - GA_URL_CON="$GA_URL_PROT://$GA_URL" ---- 1353,1359 ---- - - glob_allow_download() { - if [ ! "$GA_URL_PROT" == "" ] && [ ! "$GA_URL" == "" ] && [ "$USE_RGT" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="$INSTALL_PATH/.apf-$$" - rm -rf $URL_TMP - URL_FILE=`echo $GA_URL | tr '/' '\n' | grep "." | tail -n 1` - GA_URL_CON="$GA_URL_PROT://$GA_URL" -*************** -*** 1370,1376 **** - eout "{trust} download of $GA_URL_PROT://$GA_URL failed" - fi - rm -rf $URL_TMP -! cd /etc/apf - else - rm -f $GALLOW_HOSTS - touch $GALLOW_HOSTS ---- 1368,1374 ---- - eout "{trust} download of $GA_URL_PROT://$GA_URL failed" - fi - rm -rf $URL_TMP -! cd $INSTALL_PATH - else - rm -f $GALLOW_HOSTS - touch $GALLOW_HOSTS -*************** -*** 1380,1386 **** - - glob_deny_download() { - if [ ! "$GD_URL_PROT" == "" ] && [ ! "$GD_URL" == "" ] && [ "$USE_RGT" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="/etc/apf/.apf-$$" - rm -rf $URL_TMP - URL_FILE=`echo $GD_URL | tr '/' '\n' | grep "." | tail -n 1` - GD_URL_CON="$GD_URL_PROT://$GD_URL" ---- 1378,1384 ---- - - glob_deny_download() { - if [ ! "$GD_URL_PROT" == "" ] && [ ! "$GD_URL" == "" ] && [ "$USE_RGT" == "1" ] && [ -f "$WGET" ]; then -! URL_TMP="$INSTALL_PATH/.apf-$$" - rm -rf $URL_TMP - URL_FILE=`echo $GD_URL | tr '/' '\n' | grep "." | tail -n 1` - GD_URL_CON="$GD_URL_PROT://$GD_URL" -*************** -*** 1395,1401 **** - eout "{trust} download of $GD_URL_PROT://$GD_URL failed" - fi - rm -rf $URL_TMP -! cd /etc/apf - else - rm -f $GDENY_HOSTS - touch $GDENY_HOSTS ---- 1393,1399 ---- - eout "{trust} download of $GD_URL_PROT://$GD_URL failed" - fi - rm -rf $URL_TMP -! cd $INSTALL_PATH - else - rm -f $GDENY_HOSTS - touch $GDENY_HOSTS -*************** -*** 1481,1489 **** - - refresh() { - eout "{glob} refreshing trust system rules." -! /sbin/iptables-save | grep -E "TDENY|TGDENY" | grep -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | awk '{print$4}' | sort -n | uniq | sort > /etc/apf/internals/refresh.drop.temp - $IPT -F TMP_DROP -! for i in `cat /etc/apf/internals/refresh.drop.temp | grep -v "#"`; do - if [ ! "$i" == "" ]; then - $IPT -A TMP_DROP -s $i -d 0/0 -j $ALL_STOP - $IPT -A TMP_DROP -d $i -s 0/0 -j $ALL_STOP ---- 1479,1487 ---- - - refresh() { - eout "{glob} refreshing trust system rules." -! $IPTS | grep -E "TDENY|TGDENY" | grep -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | awk '{print$4}' | sort -n | uniq | sort > $INSTALL_PATH/internals/refresh.drop.temp - $IPT -F TMP_DROP -! for i in `cat $INSTALL_PATH/internals/refresh.drop.temp | grep -v "#"`; do - if [ ! "$i" == "" ]; then - $IPT -A TMP_DROP -s $i -d 0/0 -j $ALL_STOP - $IPT -A TMP_DROP -d $i -s 0/0 -j $ALL_STOP -*************** -*** 1509,1515 **** - cat< $INSTALL_PATH/internals/cron.refresh - MAILTO= - SHELL=/bin/bash -! */$SET_REFRESH * * * * root /etc/apf/apf --refresh >> /dev/null 2>&1 & - EOF - chmod 644 $INSTALL_PATH/internals/cron.refresh - ln -fs $INSTALL_PATH/internals/cron.refresh /etc/cron.d/refresh.apf ---- 1507,1513 ---- - cat< $INSTALL_PATH/internals/cron.refresh - MAILTO= - SHELL=/bin/bash -! */$SET_REFRESH * * * * root $INSTALL_PATH/apf --refresh >> /dev/null 2>&1 & - EOF - chmod 644 $INSTALL_PATH/internals/cron.refresh - ln -fs $INSTALL_PATH/internals/cron.refresh /etc/cron.d/refresh.apf -diff -crB apf-9.7-1/files/internals/internals.conf apf-9.7-2/files/internals/internals.conf -*** apf-9.7-1/files/internals/internals.conf 2009-03-17 08:37:05.000000000 -0400 ---- apf-9.7-2/files/internals/internals.conf 2011-03-03 20:50:51.000000000 -0500 -*************** -*** 7,23 **** - APPN="apf" - - ifconfig=/sbin/ifconfig -! ip=/sbin/ip -! IPT="/sbin/iptables" -! MPB="/sbin/modprobe" -! LSM="/sbin/lsmod" -! RMM="/sbin/rmmod" -! IPTS="/sbin/iptables-save" -! IPTR="/sbin/iptables-restore" -! DIFF="/usr/bin/diff" -! WGET="/usr/bin/wget" -! MD5="/usr/bin/md5sum" -! UNAME="/bin/uname" - IF="$IFACE_IN" - IN_IF="$IFACE_IN" - OUT_IF="$IFACE_OUT" ---- 7,23 ---- - APPN="apf" - - ifconfig=/sbin/ifconfig -! ip=/usr/sbin/ip -! IPT=/usr/sbin/iptables -! MPB=/sbin/modprobe -! LSM=/bin/lsmod -! RMM=/sbin/rmmod -! IPTS=/usr/sbin/iptables-save -! IPTR=/usr/sbin/iptables-restore -! DIFF=/usr/bin/diff -! WGET=/usr/bin/wget -! MD5=/usr/bin/md5sum -! UNAME=/bin/uname - IF="$IFACE_IN" - IN_IF="$IFACE_IN" - OUT_IF="$IFACE_OUT" -diff -crB apf-9.7-1/files/sysctl.rules apf-9.7-2/files/sysctl.rules -*** apf-9.7-1/files/sysctl.rules 2011-10-19 01:45:35.000000000 -0400 ---- apf-9.7-2/files/sysctl.rules 2011-10-21 19:12:14.243868069 -0400 -*************** -*** 6,14 **** - SYSCTL_CONNTRACK = 28000 - fi - -! echo $SYSCTL_CONNTRACK > /proc/sys/net/ipv4/ip_conntrack_max - echo 1 > /proc/sys/net/ipv4/icmp_ignore_bogus_error_responses - echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts - - if [ "$SYSCTL_LOGMARTIANS" == "1" ]; then - eout "{glob} setting sysctl_logmartians enabled" ---- 6,16 ---- - SYSCTL_CONNTRACK = 28000 - fi - -! echo $SYSCTL_CONNTRACK > /proc/sys/net/ipv4/netfilter/ip_conntrack_max - echo 1 > /proc/sys/net/ipv4/icmp_ignore_bogus_error_responses - echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts -+ # echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_all -+ # echo 1 > /proc/sys/net/netfilter/nf_conntrack_acct - - if [ "$SYSCTL_LOGMARTIANS" == "1" ]; then - eout "{glob} setting sysctl_logmartians enabled" -*************** -*** 51,56 **** ---- 53,59 ---- - echo 1 > /proc/sys/net/ipv4/tcp_sack - echo 1 > /proc/sys/net/ipv4/tcp_dsack - echo 1 > /proc/sys/net/ipv4/tcp_fack -+ # echo 0 > /proc/sys/net/ipv4/tcp_window_scaling - echo 1800 > /proc/sys/net/ipv4/tcp_keepalive_time - echo 30 > /proc/sys/net/ipv4/tcp_fin_timeout - echo 3 > /proc/sys/net/ipv4/tcp_retries1 -*************** -*** 77,85 **** - echo 0 > /proc/sys/net/ipv4/conf/$IFACE_OUT/accept_source_route - echo 0 > /proc/sys/net/ipv4/conf/all/bootp_relay - echo 0 > /proc/sys/net/ipv4/ip_forward -! echo 0 > /proc/sys/net/ipv4/secure_redirects -! echo 0 > /proc/sys/net/ipv4/send_redirects -! echo 0 > /proc/sys/net/ipv4/proxy_arp - else - echo 0 > /proc/sys/net/ipv4/conf/$IFACE_IN/rp_filter - echo 0 > /proc/sys/net/ipv4/conf/$IFACE_OUT/rp_filter ---- 80,91 ---- - echo 0 > /proc/sys/net/ipv4/conf/$IFACE_OUT/accept_source_route - echo 0 > /proc/sys/net/ipv4/conf/all/bootp_relay - echo 0 > /proc/sys/net/ipv4/ip_forward -! echo 0 > /proc/sys/net/ipv4/conf/$IFACE_IN/secure_redirects -! echo 0 > /proc/sys/net/ipv4/conf/$IFACE_OUT/secure_redirects -! echo 0 > /proc/sys/net/ipv4/conf/$IFACE_IN/send_redirects -! echo 0 > /proc/sys/net/ipv4/conf/$IFACE_OUT/send_redirects -! echo 0 > /proc/sys/net/ipv4/conf/$IFACE_IN/proxy_arp -! echo 0 > /proc/sys/net/ipv4/conf/$IFACE_OUT/proxy_arp - else - echo 0 > /proc/sys/net/ipv4/conf/$IFACE_IN/rp_filter - echo 0 > /proc/sys/net/ipv4/conf/$IFACE_OUT/rp_filter -diff -crB apf-9.7-1/files/vnet/vnetgen apf-9.7-2/files/vnet/vnetgen -*** apf-9.7-1/files/vnet/vnetgen 2009-03-17 08:37:05.000000000 -0400 ---- apf-9.7-2/files/vnet/vnetgen 2011-10-21 14:08:30.714235822 -0400 -*************** -*** 36,47 **** - exit 1 - fi - - if [ ! -f "$ip" ] && [ ! -f "$ifconfig" ]; then - eout "{glob} $ip and $ifconfig not found; aborting" - echo "$ip and $ifconfig not found; aborting" - exit 1 - elif [ -f "$ip" ]; then -! for addr in `/sbin/ip addr list | tr '/' ' ' | grep -w inet | grep -w $IF | grep -v 127.0.0.1 | grep -vw $NET | awk '{print$2}'`; do - if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then - touch $INSTALL_PATH/vnet/$addr.rules - chmod 600 $INSTALL_PATH/vnet/$addr.rules ---- 36,49 ---- - exit 1 - fi - -+ [ -z "$NET" ] && exit 1 -+ - if [ ! -f "$ip" ] && [ ! -f "$ifconfig" ]; then - eout "{glob} $ip and $ifconfig not found; aborting" - echo "$ip and $ifconfig not found; aborting" - exit 1 - elif [ -f "$ip" ]; then -! for addr in `$ip addr list | tr '/' ' ' | grep -w inet | grep -w $IF | grep -v 127.0.0.1 | grep -vw $NET | awk '{print$2}'`; do - if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then - touch $INSTALL_PATH/vnet/$addr.rules - chmod 600 $INSTALL_PATH/vnet/$addr.rules -*************** -*** 49,56 **** - fi - done - elif [ -f "$ifconfig" ]; then -! for iface in `ifconfig | grep -w $IF | awk '{print$1}'`; do -! for addr in `ifconfig $iface | grep -w inet | tr ':' ' ' | grep -vw $NET | awk '{print$3}'`; do - if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then - touch $INSTALL_PATH/vnet/$addr.rules - chmod 600 $INSTALL_PATH/vnet/$addr.rules ---- 51,58 ---- - fi - done - elif [ -f "$ifconfig" ]; then -! for iface in `$ifconfig | grep -w $IF | awk '{print$1}'`; do -! for addr in `$ifconfig $iface | grep -w inet | tr ':' ' ' | grep -vw $NET | awk '{print$3}'`; do - if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then - touch $INSTALL_PATH/vnet/$addr.rules - chmod 600 $INSTALL_PATH/vnet/$addr.rules -*************** -*** 63,73 **** - - if [ "$SET_ADDIFACE" == "1" ]; then - ## associate a vnet rule for ip's on additional interfaces other than the main -! for anet in `ifconfig | grep Link | grep -vwE "inet|inet6|lo|$IFACE_IN|$IFACE_OUT" | awk '{print$1}'`; do - if [ -f "$ip" ]; then - valtif=`echo $TIF | grep $anet` - if [ "$valtif" == "" ]; then -! for addr in `/sbin/ip addr list | tr '/' ' ' | grep -w inet | grep -w $anet | grep -v 127.0.0.1 | grep -vw $NET | awk '{print$2}'`; do - if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then - touch $INSTALL_PATH/vnet/$addr.rules - chmod 600 $INSTALL_PATH/vnet/$addr.rules ---- 65,75 ---- - - if [ "$SET_ADDIFACE" == "1" ]; then - ## associate a vnet rule for ip's on additional interfaces other than the main -! for anet in `$ifconfig | grep Link | grep -vwE "inet|inet6|lo|$IFACE_IN|$IFACE_OUT" | awk '{print$1}'`; do - if [ -f "$ip" ]; then - valtif=`echo $TIF | grep $anet` - if [ "$valtif" == "" ]; then -! for addr in `$ip addr list | tr '/' ' ' | grep -w inet | grep -w $anet | grep -v 127.0.0.1 | grep -vw $NET | awk '{print$2}'`; do - if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then - touch $INSTALL_PATH/vnet/$addr.rules - chmod 600 $INSTALL_PATH/vnet/$addr.rules -*************** -*** 76,85 **** - done - fi - elif [ -f "$ifconfig" ]; then -! for iface in `ifconfig | grep -w $anet | awk '{print$1}'`; do - valtif=`echo $TIF | grep $anet` - if [ "$valtif" == "" ]; then -! for addr in `ifconfig $iface | grep -w inet | tr ':' ' ' | grep -vw $NET | awk '{print$3}'`; do - if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then - touch $INSTALL_PATH/vnet/$addr.rules - chmod 600 $INSTALL_PATH/vnet/$addr.rules ---- 78,87 ---- - done - fi - elif [ -f "$ifconfig" ]; then -! for iface in `$ifconfig | grep -w $anet | awk '{print$1}'`; do - valtif=`echo $TIF | grep $anet` - if [ "$valtif" == "" ]; then -! for addr in `$ifconfig $iface | grep -w inet | tr ':' ' ' | grep -vw $NET | awk '{print$3}'`; do - if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then - touch $INSTALL_PATH/vnet/$addr.rules - chmod 600 $INSTALL_PATH/vnet/$addr.rules +Only in apf-9.7-2/files: conf.apf +diff -crB apf-9.7-2/files/firewall apf-9.7-2-arch/files/firewall +*** apf-9.7-2/files/firewall 2011-11-10 19:53:16.000000000 -0500 +--- apf-9.7-2-arch/files/firewall 2012-01-09 05:53:31.617196010 -0500 +*************** +*** 87,93 **** + # Allow all traffic on trusted interfaces + if [ ! "$IFACE_TRUSTED" == "" ]; then + for i in `echo $IFACE_TRUSTED | tr ',' ' '`; do +! VAL_IF=`/sbin/ip addr list | grep -w $i` + if [ "$VAL_IF" == "" ]; then + eout "{glob} unable to verify status of interface $i; assuming untrusted" + else +--- 87,93 ---- + # Allow all traffic on trusted interfaces + if [ ! "$IFACE_TRUSTED" == "" ]; then + for i in `echo $IFACE_TRUSTED | tr ',' ' '`; do +! VAL_IF=`$ip addr list | grep -w $i` + if [ "$VAL_IF" == "" ]; then + eout "{glob} unable to verify status of interface $i; assuming untrusted" + else +*************** +*** 105,111 **** + $IPT -A PROHIBIT -j REJECT --reject-with icmp-host-prohibited + + # Load our SYSCTL rules +! . $INSTALL_PATH/sysctl.rules >> /dev/null 2>&1 + + # Fix MTU/MSS Problems + $IPT -A OUTPUT -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu +--- 105,111 ---- + $IPT -A PROHIBIT -j REJECT --reject-with icmp-host-prohibited + + # Load our SYSCTL rules +! . $INSTALL_PATH/sysctl.rules >> /dev/null # 2>&1 + + # Fix MTU/MSS Problems + $IPT -A OUTPUT -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu +diff -crB apf-9.7-2/files/internals/functions.apf apf-9.7-2-arch/files/internals/functions.apf +*** apf-9.7-2/files/internals/functions.apf 2011-12-15 21:30:14.000000000 -0500 +--- apf-9.7-2-arch/files/internals/functions.apf 2012-01-09 04:10:15.000000000 -0500 +*************** +*** 62,165 **** + fi + } + +! ml() { +! MOD=$1 +! VALMOD=$2 +! if [ "$KREL" == "2.4" ]; then +! MEXT="o" +! elif [ "$KREL" == "2.6" ]; then +! MEXT="ko" +! elif [[ "$KREL" =~ "3." ]]; then +! MEXT="ko" +! elif [ ! "$KREL" == "2.4" ] && [ ! "$KREL" == "2.6" ] && [[ ! "$KREL" =~ "3." ]]; then +! if [ ! "$SET_VERBOSE" == "1" ]; then +! echo "kernel version not compatible or netfilter support missing, aborting." +! fi +! eout "{glob} kernel version not compatible or netfilter support missing, aborting." +! exit 1 +! else +! if [ ! "$SET_VERBOSE" == "1" ]; then +! echo "kernel version not compatible or netfilter support missing, aborting." +! fi +! eout "{glob} kernel version not compatible or netfilter support missing, aborting." +! exit 1 +! fi +! +! if [ "$VALMOD" == "1" ] && [ ! -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/$1.$MEXT" ]; then +! if [ ! "$SET_VERBOSE" == "1" ]; then +! echo "Unable to load iptables module ($1), aborting." +! fi +! eout "{glob} unable to load iptables module ($1), aborting." +! exit 1 +! fi +! if [ -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/$1.$MEXT" ] || [ -f "/lib/modules/$(uname -r)/kernel/net/netfilter/$1.$MEXT" ]; then +! $MPB $1 >> /dev/null 2>&1 & +! fi +! } + + modinit() { +! # Remove ipchains module if loaded +! IPC_VAL=`$LSM | grep ipchains` +! if [ ! "$IPC_VAL" == "" ]; then +! $RMM ipchains +! fi +! +! if [ ! "$SET_MONOKERN" == "1" ]; then +! # Loading Kernel Modules +! ml ip_tables 1 +! ml iptable_filter +! ml iptable_mangle +! ml ip_conntrack +! ml ip_conntrack_irc +! ml ip_conntrack_ftp +! ml ipt_state +! ml ipt_multiport +! ml ipt_limit +! ml ipt_recent +! ml ipt_LOG +! ml ipt_REJECT +! ml ipt_ecn +! ml ipt_length +! ml ipt_mac +! ml ipt_multiport +! ml ipt_owner +! ml ipt_state +! ml ipt_ttl +! ml ipt_TOS +! ml ipt_TCPMSS +! ml ipt_ULOG +! ml xt_conntrack +! ml xt_conntrack_irc +! ml xt_conntrack_ftp +! ml xt_state +! ml xt_multiport +! ml xt_limit +! ml xt_recent +! ml xt_LOG +! ml xt_REJECT +! ml xt_ecn +! ml xt_length +! ml xt_mac +! ml xt_multiport +! ml xt_owner +! ml xt_state +! ml xt_ttl +! ml xt_TOS +! ml xt_TCPMSS +! ml xt_ULOG +! ml nf_conntrack +! ml nf_conntrack_irc +! ml nf_conntrack_ftp +! fi + } + + check_rab() { +! if [ ! -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/ipt_recent.$MEXT" ] && [ ! -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/xt_recent.$MEXT" ]; then +! if [ "$RAB" == "1" ]; then +! RAB="0" +! eout "{rab} force set RAB disabled, kernel module xt/ipt_recent not found." +! fi +! fi + } + + get_state() { +--- 62,196 ---- + fi + } + +! #ml() { +! #MOD=$1 +! #VALMOD=$2 +! #if [ "$KREL" == "2.4" ]; then +! #MEXT="o" +! #elif [ "$KREL" == "2.6" ]; then +! #MEXT="ko" +! #elif [[ "$KREL" =~ "3." ]]; then +! #MEXT="ko" +! #elif [ ! "$KREL" == "2.4" ] && [ ! "$KREL" == "2.6" ] && [[ ! "$KREL" =~ "3." ]]; then +! #if [ ! "$SET_VERBOSE" == "1" ]; then +! #echo "kernel version not compatible or netfilter support missing, aborting." +! #fi +! #eout "{glob} kernel version not compatible or netfilter support missing, aborting." +! #exit 1 +! #else +! #if [ ! "$SET_VERBOSE" == "1" ]; then +! #echo "kernel version not compatible or netfilter support missing, aborting." +! #fi +! #eout "{glob} kernel version not compatible or netfilter support missing, aborting." +! #exit 1 +! #fi +! +! #if [ "$VALMOD" == "1" ] && [ ! -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/$1.$MEXT" ]; then +! #if [ ! "$SET_VERBOSE" == "1" ]; then +! #echo "Unable to load iptables module ($1), aborting." +! #fi +! #eout "{glob} unable to load iptables module ($1), aborting." +! #exit 1 +! #fi +! #if [ -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/$1.$MEXT" ] || [ -f "/lib/modules/$(uname -r)/kernel/net/netfilter/$1.$MEXT" ]; then +! #$MPB $1 >> /dev/null 2>&1 & +! #fi +! #} +! +! #modinit() { +! ## Remove ipchains module if loaded +! #IPC_VAL=`$LSM | grep ipchains` +! #if [ ! "$IPC_VAL" == "" ]; then +! #$RMM ipchains +! #fi +! +! #if [ ! "$SET_MONOKERN" == "1" ]; then +! ## Loading Kernel Modules +! #ml ip_tables 1 +! #ml iptable_filter +! #ml iptable_mangle +! #ml ip_conntrack +! #ml ip_conntrack_irc +! #ml ip_conntrack_ftp +! #ml ipt_state +! #ml ipt_multiport +! #ml ipt_limit +! #ml ipt_recent +! #ml ipt_LOG +! #ml ipt_REJECT +! #ml ipt_ecn +! #ml ipt_length +! #ml ipt_mac +! #ml ipt_multiport +! #ml ipt_owner +! #ml ipt_state +! #ml ipt_ttl +! #ml ipt_TOS +! #ml ipt_TCPMSS +! #ml ipt_ULOG +! #ml xt_conntrack +! #ml xt_conntrack_irc +! #ml xt_conntrack_ftp +! #ml xt_state +! #ml xt_multiport +! #ml xt_limit +! #ml xt_recent +! #ml xt_LOG +! #ml xt_REJECT +! #ml xt_ecn +! #ml xt_length +! #ml xt_mac +! #ml xt_multiport +! #ml xt_owner +! #ml xt_state +! #ml xt_ttl +! #ml xt_TOS +! #ml xt_TCPMSS +! #ml xt_ULOG +! #ml nf_conntrack +! #ml nf_conntrack_irc +! #ml nf_conntrack_ftp +! #fi +! #} +! +! #check_rab() { +! #if [ ! -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/ipt_recent.$MEXT" ] && [ ! -f "/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter/xt_recent.$MEXT" ]; then +! #if [ "$RAB" == "1" ]; then +! #RAB="0" +! #eout "{rab} force set RAB disabled, kernel module xt/ipt_recent not found." +! #fi +! #fi +! #} + + modinit() { +! [ "$SET_MONOKERN" == "1" ] && return 0 +! +! case "$KREL" in +! 2.4) ;; +! 2.6) ;; +! *) eout "{glob} kernel version not equal to 2.4.x or 2.6.x, aborting."; exit 1;; +! esac +! +! modules="ip_tables iptable_filter iptable_mangle ip_conntrack ip_conntrack_ftp ipt_state ipt_multiport ipt_limit ipt_recent +! ipt_LOG ipt_REJECT ipt_ecn ipt_length ipt_mac ipt_multiport ipt_owner ipt_state ipt_ttl ipt_TOS ipt_TCPMSS ipt_ULOG +! xt_conntrack xt_state xt_multiport xt_limit xt_recent xt_length xt_mac xt_multiport xt_owner xt_state nf_conntrack +! nf_conntrack_irc nf_conntrack_ftp" +! +! # failed to load: xt_conntrack_irc xt_conntrack_ftp xt_LOG xt_REJECT xt_ecn xt_ttl ip_conntrack_irc +! # not tested: xt_TOS xt_TCPMSS xt_ULOG +! +! local m +! for m in $modules; do +! $MPB $m >/dev/null 2>&1 || { eout "{glob} unable to load iptables module ($m), aborting."; return 1; } +! done +! return 0 + } + + check_rab() { +! if [ "$RAB" = "1" ] && [ -z "$(cat /proc/net/ip_tables_matches | grep '^recent')" ]; then +! RAB="0" +! eout "{rab} force set RAB disabled, kernel module xt/ipt_recent not found." +! fi + } + + get_state() { +*************** +*** 287,293 **** + val_rev=`cat $ALLOW_HOSTS | grep -w $HOST` + val_rev2=`cat $GALLOW_HOSTS | grep -w $HOST` + val_rev3=`cat $GDENY_HOSTS | grep -w $HOST` +! val_rev4=`/sbin/ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $HOST` + if [ ! "$val" == "" ]; then + echo "$HOST already exists in $DENY_HOSTS" + elif [ ! "$val_rev" == "" ]; then +--- 318,324 ---- + val_rev=`cat $ALLOW_HOSTS | grep -w $HOST` + val_rev2=`cat $GALLOW_HOSTS | grep -w $HOST` + val_rev3=`cat $GDENY_HOSTS | grep -w $HOST` +! val_rev4=`$ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $HOST` + if [ ! "$val" == "" ]; then + echo "$HOST already exists in $DENY_HOSTS" + elif [ ! "$val_rev" == "" ]; then +*************** +*** 328,334 **** + val_rev=`cat $ALLOW_HOSTS | grep -w $HOST` + val_rev2=`cat $GALLOW_HOSTS | grep -w $HOST` + val_rev3=`cat $GDENY_HOSTS | grep -w $HOST` +! val_rev4=`/sbin/ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $HOST` + if [ ! "$val" == "" ]; then + echo "$HOST already exists in $DENY_HOSTS" + elif [ ! "$val_rev" == "" ]; then +--- 359,365 ---- + val_rev=`cat $ALLOW_HOSTS | grep -w $HOST` + val_rev2=`cat $GALLOW_HOSTS | grep -w $HOST` + val_rev3=`cat $GDENY_HOSTS | grep -w $HOST` +! val_rev4=`$ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $HOST` + if [ ! "$val" == "" ]; then + echo "$HOST already exists in $DENY_HOSTS" + elif [ ! "$val_rev" == "" ]; then +*************** +*** 396,403 **** + /usr/bin/pico -w $iptc + elif [ -f "/usr/bin/nano" ]; then + /usr/bin/nano -w $iptc +! elif [ -f "/bin/vi" ]; then +! /bin/vi $iptc + fi + clear + rm -f $iptc +--- 427,434 ---- + /usr/bin/pico -w $iptc + elif [ -f "/usr/bin/nano" ]; then + /usr/bin/nano -w $iptc +! elif [ -f "/usr/bin/vi" ]; then +! /usr/bin/vi $iptc + fi + clear + rm -f $iptc +*************** +*** 550,556 **** + # + # + for i in `cat $ALLOW_HOSTS | grep -v "#" | grep -v ":" | grep -v "="`; do +! val=`/sbin/ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $i` + if [ ! "$val" ]; then + if [ ! "$i" == "" ] && [ -f "$ALLOW_HOSTS" ]; then + eout "{trust} allow all to/from $i" +--- 581,587 ---- + # + # + for i in `cat $ALLOW_HOSTS | grep -v "#" | grep -v ":" | grep -v "="`; do +! val=`$ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $i` + if [ ! "$val" ]; then + if [ ! "$i" == "" ] && [ -f "$ALLOW_HOSTS" ]; then + eout "{trust} allow all to/from $i" +*************** +*** 842,848 **** + # + # + for i in `cat $DENY_HOSTS | grep -v "#" | grep -v ":" | grep -v "="`; do +! val=`/sbin/ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $i` + if [ ! "$val" ]; then + if [ ! "$i" == "" ] && [ -f "$DENY_HOSTS" ]; then + eout "{trust} deny all to/from $i" +--- 873,879 ---- + # + # + for i in `cat $DENY_HOSTS | grep -v "#" | grep -v ":" | grep -v "="`; do +! val=`$ip addr list $IFACE_IN | grep -w inet | grep -v inet6 | tr '/' ' ' | awk '{print$2}' | grep -w $i` + if [ ! "$val" ]; then + if [ ! "$i" == "" ] && [ -f "$DENY_HOSTS" ]; then + eout "{trust} deny all to/from $i" +*************** +*** 1501,1507 **** + + refresh() { + eout "{glob} refreshing trust system rules." +! /sbin/iptables-save | grep -E "TDENY|TGDENY" | grep -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | awk '{print$4}' | sort -n | uniq | sort > /etc/apf/internals/refresh.drop.temp + $IPT -F TMP_DROP + for i in `cat /etc/apf/internals/refresh.drop.temp | grep -v "#"`; do + if [ ! "$i" == "" ]; then +--- 1532,1538 ---- + + refresh() { + eout "{glob} refreshing trust system rules." +! $IPTS | grep -E "TDENY|TGDENY" | grep -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | awk '{print$4}' | sort -n | uniq | sort > /etc/apf/internals/refresh.drop.temp + $IPT -F TMP_DROP + for i in `cat /etc/apf/internals/refresh.drop.temp | grep -v "#"`; do + if [ ! "$i" == "" ]; then +diff -crB apf-9.7-2/files/internals/internals.conf apf-9.7-2-arch/files/internals/internals.conf +*** apf-9.7-2/files/internals/internals.conf 2009-03-17 08:37:05.000000000 -0400 +--- apf-9.7-2-arch/files/internals/internals.conf 2012-01-09 03:55:05.000000000 -0500 +*************** +*** 7,19 **** + APPN="apf" + + ifconfig=/sbin/ifconfig +! ip=/sbin/ip +! IPT="/sbin/iptables" + MPB="/sbin/modprobe" +! LSM="/sbin/lsmod" + RMM="/sbin/rmmod" +! IPTS="/sbin/iptables-save" +! IPTR="/sbin/iptables-restore" + DIFF="/usr/bin/diff" + WGET="/usr/bin/wget" + MD5="/usr/bin/md5sum" +--- 7,19 ---- + APPN="apf" + + ifconfig=/sbin/ifconfig +! ip=/usr/sbin/ip +! IPT="/usr/sbin/iptables" + MPB="/sbin/modprobe" +! LSM="/bin/lsmod" + RMM="/sbin/rmmod" +! IPTS="/usr/sbin/iptables-save" +! IPTR="/usr/sbin/iptables-restore" + DIFF="/usr/bin/diff" + WGET="/usr/bin/wget" + MD5="/usr/bin/md5sum" +diff -crB apf-9.7-2/files/sysctl.rules apf-9.7-2-arch/files/sysctl.rules +*** apf-9.7-2/files/sysctl.rules 2011-10-19 01:45:35.000000000 -0400 +--- apf-9.7-2-arch/files/sysctl.rules 2012-01-09 05:53:13.844571069 -0500 +*************** +*** 6,12 **** + SYSCTL_CONNTRACK = 28000 + fi + +! echo $SYSCTL_CONNTRACK > /proc/sys/net/ipv4/ip_conntrack_max + echo 1 > /proc/sys/net/ipv4/icmp_ignore_bogus_error_responses + echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts + +--- 6,14 ---- + SYSCTL_CONNTRACK = 28000 + fi + +! #echo $SYSCTL_CONNTRACK > /proc/sys/net/ipv4/ip_conntrack_max +! echo $SYSCTL_CONNTRACK > /proc/sys/net/ipv4/netfilter/ip_conntrack_max +! + echo 1 > /proc/sys/net/ipv4/icmp_ignore_bogus_error_responses + echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts + +diff -crB apf-9.7-2/files/vnet/vnetgen apf-9.7-2-arch/files/vnet/vnetgen +*** apf-9.7-2/files/vnet/vnetgen 2011-11-10 19:53:16.000000000 -0500 +--- apf-9.7-2-arch/files/vnet/vnetgen 2012-01-09 04:11:34.000000000 -0500 +*************** +*** 41,47 **** + echo "$ip and $ifconfig not found; aborting" + exit 1 + elif [ -f "$ip" ]; then +! for addr in `/sbin/ip addr list | tr '/' ' ' | grep -w inet | grep -w $IF | grep -v 127.0.0.1 | grep -vw $NET | awk '{print$2}'`; do + if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then + touch $INSTALL_PATH/vnet/$addr.rules + chmod 600 $INSTALL_PATH/vnet/$addr.rules +--- 41,47 ---- + echo "$ip and $ifconfig not found; aborting" + exit 1 + elif [ -f "$ip" ]; then +! for addr in `$ip addr list | tr '/' ' ' | grep -w inet | grep -w $IF | grep -v 127.0.0.1 | grep -vw $NET | awk '{print$2}'`; do + if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then + touch $INSTALL_PATH/vnet/$addr.rules + chmod 600 $INSTALL_PATH/vnet/$addr.rules +*************** +*** 67,73 **** + if [ -f "$ip" ]; then + valtif=`echo $TIF | grep $anet` + if [ "$valtif" == "" ]; then +! for addr in `/sbin/ip addr list | tr '/' ' ' | grep -w inet | grep -w $anet | grep -v 127.0.0.1 | grep -vw $NET | awk '{print$2}'`; do + if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then + touch $INSTALL_PATH/vnet/$addr.rules + chmod 600 $INSTALL_PATH/vnet/$addr.rules +--- 67,73 ---- + if [ -f "$ip" ]; then + valtif=`echo $TIF | grep $anet` + if [ "$valtif" == "" ]; then +! for addr in `$ip addr list | tr '/' ' ' | grep -w inet | grep -w $anet | grep -v 127.0.0.1 | grep -vw $NET | awk '{print$2}'`; do + if [ ! -f "$INSTALL_PATH/vnet/$addr.rules" ]; then + touch $INSTALL_PATH/vnet/$addr.rules + chmod 600 $INSTALL_PATH/vnet/$addr.rules diff --git a/apf-firewall/apf-firewall.install b/apf-firewall/apf-firewall.install old mode 100644 new mode 100755 index 79c7401d9..d9c2168f6 --- a/apf-firewall/apf-firewall.install +++ b/apf-firewall/apf-firewall.install @@ -16,12 +16,10 @@ pre_install() { post_install () { echo -e "${msg}" - # apf -i } post_upgrade() { echo -e "${msg}" - # apf -i } post_remove() { diff --git a/asterisk/PKGBUILD b/asterisk/PKGBUILD index f77954ae2..fbd04c918 100644 --- a/asterisk/PKGBUILD +++ b/asterisk/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Alessio Biancalana pkgname=asterisk -pkgver=1.8.7.2 +pkgver=10.0.0 pkgrel=1 pkgdesc="A complete PBX solution" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$ asterisk \ asterisk.logrotated) install=$pkgname.install -md5sums=('27ab62d75be35e623e4798d58a0959fc' +md5sums=('6b52336b9dc01eeecb9de2eb2818e127' '59146273738605f1e011d8e7bed3561a' '486e07a0a1405ea25ec5b1736034653e') diff --git a/asterisk10/PKGBUILD b/asterisk10/PKGBUILD index 7dffe60cb..30d95aee7 100644 --- a/asterisk10/PKGBUILD +++ b/asterisk10/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Xavier Devlamynck pkgname=asterisk10 -pkgver=10.0.0_rc3 +pkgver=10.0.0 pkgrel=1 pkgdesc="A complete PBX solution" arch=('i686' 'x86_64') @@ -12,10 +12,10 @@ depends=('libusb' 'libxml2' 'openssl' 'curl' 'gmime' 'iksemel' 'libldap' 'net-sn optdepends=('radiusclient-ng' 'libpri' 'dahdi') makedepends=() conflicts=('asterisk' 'asterisk16' 'asterisk18' 'asterisk-svn') -source=(http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-${pkgver//_/-}.tar.gz +source=(http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-${pkgver}.tar.gz asterisk) install=$pkgname.install -md5sums=('c0cfc71a26d56487ffa570fd3169919c' +md5sums=('6b52336b9dc01eeecb9de2eb2818e127' '59146273738605f1e011d8e7bed3561a') build() { cd $srcdir/asterisk-${pkgver//_/-} diff --git a/bsnes-aio/PKGBUILD b/bsnes-aio/PKGBUILD index 0b4387bee..b9d258474 100755 --- a/bsnes-aio/PKGBUILD +++ b/bsnes-aio/PKGBUILD @@ -1,12 +1,13 @@ # Maintainer : Alucryd +# Thx vEX for the Qt 4.8.0 fix pkgname=bsnes-aio pkgver=085 -pkgrel=3 +pkgrel=4 pkgdesc="SNES emulator focused on accuracy, debugging functionality, and clean code. Includes snespurify, bps, filters, shaders and cheats database." arch=('i686' 'x86_64') url="http://byuu.org/bsnes/" license=('GPL3') -depends=('gtk2' 'pulseaudio' 'libao' 'libgl' 'libxv' 'openal' 'sdl') +depends=('gtk2' 'qt>=4.7.0' 'pulseaudio' 'libao' 'libgl' 'libxv' 'openal' 'sdl') makedepends=('mesa') source=('http://bsnes.googlecode.com/files/bsnes_v085-source.tar.bz2' 'http://byuu.org/files/bps_v03.tar.bz2') md5sums=('2419710087ba28c894e5aa1c3c41b6e7' '65c425a5843556bef6f333c4084af8c6') @@ -24,18 +25,24 @@ build() { # Profile cd "${srcdir}/bsnes_v$pkgver-source/bsnes" - msg "Please select a profile" + msg "Please select a version" select bp in "Accuracy (Slower)" "Compatibility" "Performance (Faster)"; do case $bp in - "Accuracy (Slower)" ) break;; - "Compatibility" ) sed -i 's/accuracy/compatibility/g' Makefile; break;; - "Performance (Faster)" ) sed -i 's/accuracy/performance/g' Makefile; break;; + "Accuracy (Slower)" ) msg "Building the accuracy version..."; break;; + "Compatibility" ) sed -i 's/accuracy/compatibility/g' Makefile && msg "Building the compatibility version..."; break;; + "Performance (Faster)" ) sed -i 's/accuracy/performance/g' Makefile && msg "Building the performance version..."; break;; esac done # Compile bsnes cd "${srcdir}/bsnes_v$pkgver-source/bsnes" - make compiler=gcc platform=x phoenix=gtk + msg "Please select your preferred interface" + select pi in "GTK" "Qt"; do + case $pi in + "GTK" ) msg "Building the GTK interface..." && make compiler=gcc platform=x phoenix=gtk; break;; + "Qt" ) moc -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp && msg "Building the Qt interface..." && make compiler=gcc platform=x phoenix=qt; break;; + esac + done # Compile snespurify cd "${srcdir}/bsnes_v$pkgver-source/snespurify" diff --git a/cnijfilter-mp280/PKGBUILD b/cnijfilter-mp280/PKGBUILD new file mode 100644 index 000000000..693f8b0c4 --- /dev/null +++ b/cnijfilter-mp280/PKGBUILD @@ -0,0 +1,99 @@ +# Contributor: Alireza Savand +# Special thanks to: olive, mirrr, GUiHKX, *alessiofachechi* + +pkgname=cnijfilter-mp280 +pkgver=3.40.1 +pkgrel=3 +_pkgrealver=3.40 +_pkgrealrel=1 +pkgdesc="Canon IJ Printer Driver (mp280 series)" +url="http://support-au.canon.com.au/contents/AU/EN/0100302002.html" +arch=('i686' 'x86_64') +license=('custom') +depends=('libcups' 'cups' 'popt' 'ghostscript' 'gsfonts' 'atk>=1.9.0' 'gtk2>=2.8.0' 'pango>=1.12.3' 'libpng>=1.2.8' 'libtiff' 'cairo>=1.0.2' 'libxml2>=2.6.24' 'fontconfig>=2.3.0' 'libxinerama') +makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make' 'gcc') +conflicts=('cnijfilter-common') +install=cnijfilter-mp280.install +source=('http://gdlp01.c-wss.com/gds/0/0100003020/01/cnijfilter-source-3.40-1.tar.gz' + 'fix.patch') +md5sums=('609975a05d6050fcca88f312d3f35c6a' + 'd8dd2d723a15681a6092d506b5106047') + +build() { + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/ + patch -p0 < ${startdir}/fix.patch + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/libs + ./autogen.sh --prefix=/usr --program-suffix=mp280 + make || return 1 + make install DESTDIR=${pkgdir} || return 1 + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/cngpij + ./autogen.sh --prefix=/usr --program-suffix=mp280 --enable-progpath=/usr/bin + make || return 1 + make install DESTDIR=${pkgdir} || return 1 + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/cnijfilter + ./autogen.sh --prefix=/usr --program-suffix=mp280 --enable-progpath=/usr/bin + make || return 1 + make install DESTDIR=${pkgdir} || return 1 + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/pstocanonij + ./autogen.sh --prefix=/usr --program-suffix=mp280 --enable-progpath=/usr/bin + make || return 1 + make install DESTDIR=${pkgdir} || return 1 + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/lgmon + ./autogen.sh --prefix=/usr --program-suffix=mp280 --enable-progpath=/usr/bin + make || return 1 + make install DESTDIR=${pkgdir} || return 1 + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/ppd + ./autogen.sh --prefix=/usr --program-suffix=mp280 + make || return 1 + make install DESTDIR=${pkgdir} || return 1 + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/cngpijmon/cnijnpr + ./autogen.sh --prefix=/usr --program-suffix=mp280 --enable-progpath=/usr/bin LIBS="-ldl" + make || return 1 + make install DESTDIR=${pkgdir} || return 1 + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/backend + ./autogen.sh --prefix=/usr --program-suffix=mp280 --enable-progpath=/usr/bin + make || return 1 + make install DESTDIR=${pkgdir} || return 1 + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/backendnet + ./autogen.sh --prefix=/usr --program-suffix=mp280 --enable-progpath=/usr/bin + make || return 1 + make install DESTDIR=${pkgdir} || return 1 + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel} + install -d ${pkgdir}/usr/lib/bjlib + install -m 755 356/database/* ${pkgdir}/usr/lib/bjlib + + if [ "$CARCH" == "x86_64" ]; then + libdir=libs_bin64 + else + libdir=libs_bin32 + fi + install -m 755 ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/356/${libdir}/libcnbpcmcm356.so.8.0.1 ${pkgdir}/usr/lib/ + install -m 755 ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/356/${libdir}/libcnbpcnclapi356.so.3.5.0 ${pkgdir}/usr/lib/ + install -m 755 ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/356/${libdir}/libcnbpcnclbjcmd356.so.3.3.0 ${pkgdir}/usr/lib/ + install -m 755 ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/356/${libdir}/libcnbpcnclui356.so.3.6.0 ${pkgdir}/usr/lib/ + install -m 755 ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/356/${libdir}/libcnbpess356.so.3.3.3 ${pkgdir}/usr/lib/ + install -m 755 ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/356/${libdir}/libcnbpess356.so.3.3.3 ${pkgdir}/usr/lib/ + install -m 755 ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/356/${libdir}/libcnbpo356.so.1.0.2 ${pkgdir}/usr/lib/ + install -m 755 ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel}/com/${libdir}/libcnnet.so.1.2.0 ${pkgdir}/usr/lib/ + cd ${pkgdir}/usr/lib/ + ln -s libcnbpcmcm356.so.8.0.1 libcnbpcmcm356.so + ln -s libcnbpcnclapi356.so.3.5.0 libcnbpcnclapi356.so + ln -s libcnbpcnclbjcmd356.so.3.3.0 libcnbpcnclbjcmd356.so + ln -s libcnbpcnclui356.so.3.6.0 libcnbpcnclui356.so + ln -s libcnbpess356.so.3.3.3 libcnbpess356.so + ln -s libcnbpo356.so.1.0.2 libcnbpo356.so + ln -s libcnnet.so.1.2.0 libcnnet.so + + cd ${srcdir}/cnijfilter-source-${_pkgrealver}-${_pkgrealrel} + install -D LICENSE-cnijfilter-${_pkgrealver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-cnijfilter-${_pkgrealver}EN.txt +} diff --git a/cnijfilter-mp280/cnijfilter-mp280.install b/cnijfilter-mp280/cnijfilter-mp280.install new file mode 100644 index 000000000..e9ac22810 --- /dev/null +++ b/cnijfilter-mp280/cnijfilter-mp280.install @@ -0,0 +1,19 @@ +post_install() { + ln -s /usr/lib/cups/filter/pstocanonijmp280 /usr/lib/cups/filter/pstocanonij + + if [ -x /sbin/ldconfig ]; then + /sbin/ldconfig + fi +} +post_upgrade() { + if [ -x /sbin/ldconfig ]; then + /sbin/ldconfig + fi +} +post_remove() { + rm /usr/lib/cups/filter/pstocanonij + + if [ -x /sbin/ldconfig ]; then + /sbin/ldconfig + fi +} diff --git a/cnijfilter-mp280/fix.patch b/cnijfilter-mp280/fix.patch new file mode 100644 index 000000000..806bef9ba --- /dev/null +++ b/cnijfilter-mp280/fix.patch @@ -0,0 +1,10 @@ +--- backend/src/cnij_backend_common.c 2010-02-23 04:57:49.000000000 +0100 ++++ cnij_backend_common.c 2011-11-17 12:59:27.482025762 +0100 +@@ -38,6 +38,7 @@ + // CUPS Header + #include + #include ++#include + + // Header file for CANON + #include "cnij_backend_common.h" diff --git a/debmirror/PKGBUILD b/debmirror/PKGBUILD index 84be471ab..4f41431ff 100644 --- a/debmirror/PKGBUILD +++ b/debmirror/PKGBUILD @@ -1,15 +1,15 @@ # Uploader: Krash <8552246@gmail.com> -# Maintainer: +# Maintainer: pkgname=debmirror -pkgver=2.9 -pkgrel=2 +pkgver=2.10 +pkgrel=1 pkgdesc="Debian partial mirror script, with ftp and package pool support" url="http://debian.org/" arch=('i686' 'x86_64') license=('GPL') depends=('bzip2' 'perl-compress-zlib' 'perl-digest-sha1' 'perl-lockfile-simple' 'perl-libwww' 'rsync' 'perl-net-inet6glue') source=("http://ftp.de.debian.org/debian/pool/main/d/debmirror/debmirror_$pkgver.tar.gz") -md5sums=('babfe418e8475a3e1e83e4d558ba93da') +md5sums=('4a9acd488f2099712991be5225e1994f') build() { cd $srcdir/$pkgname diff --git a/docblox/PKGBUILD b/docblox/PKGBUILD index eec8bca2b..f386e137d 100644 --- a/docblox/PKGBUILD +++ b/docblox/PKGBUILD @@ -1,17 +1,22 @@ # Contributor: Massimiliano Torromeo pkgname=docblox -pkgver=0.17.2 +pkgver=0.18.0 pkgrel=1 pkgdesc="PHP 5.3 compatible API Documentation generator aimed at larger projects and Continuous Integration" arch=("any") url="http://docblox-project.org" license=('CUSTOM') -depends=('php' 'php-xsl') -source=("$pkgname-$pkgver.tar.gz::https://github.com/mvriel/Docblox/tarball/v$pkgver" docblox-bin.patch) +depends=('php-xsl' 'graphviz') +source=( + "$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver" + "$pkgname-template.abstract-$pkgver.tar.gz::https://github.com/$pkgname/template.abstract/tarball/80d829deb5892f209a85f83ae3a7ea3e6f174310" + "$pkgname-template.new_black-$pkgver.tar.gz::https://github.com/$pkgname/template.new_black/tarball/ea5b463ca0c08fb86420448547a8bc9e2596dc1f" + docblox-bin.patch +) build() { - cd "${srcdir}/mvriel-Docblox-1267d1a" + cd "${srcdir}/docblox-docblox-ddb4aac" install -m0755 -d "$pkgdir/usr/share/pear/$pkgname" cp -RH data docs src README.md "$pkgdir/usr/share/pear/$pkgname" @@ -19,9 +24,15 @@ build() { patch -p0 -i "$srcdir/docblox-bin.patch" install -m0755 -D bin/docblox.php "$pkgdir/usr/bin/docblox" + + rm -r "$pkgdir/usr/share/pear/$pkgname/data/templates/abstract" + mv "$srcdir/docblox-template.abstract-80d829d" "$pkgdir/usr/share/pear/$pkgname/data/templates/abstract" + + rm -r "$pkgdir/usr/share/pear/$pkgname/data/templates/new_black" + mv "$srcdir/docblox-template.new_black-ea5b463" "$pkgdir/usr/share/pear/$pkgname/data/templates/new_black" } -md5sums=('cc70c49a6b404f2c47973dd6e42d2918' +md5sums=('f0c14c6b025d1c43385760083f410fee' + '393d9485c220e233963de0afed3cb2f5' + '5455ea065e8c78350265575a64c69ca2' '8b2940f3db760983d81d82b5300483ed') -sha256sums=('2b232c055b609dd41c6d686cc8bfce3c1780f25d52ea6ff10245baeb22516d60' - '1532d827bc35ebf4c574247688220c38617f610549434a6140de5443eb72b19e') diff --git a/evolus-pencil-svn/PKGBUILD b/evolus-pencil-svn/PKGBUILD dissimilarity index 77% index 61a4a71b7..e2a617119 100644 --- a/evolus-pencil-svn/PKGBUILD +++ b/evolus-pencil-svn/PKGBUILD @@ -1,67 +1,50 @@ -# Maintainer: Trương Xuân Tính -pkgname=evolus-pencil-svn -pkgver=161 -pkgrel=1 -pkgdesc="Sketching and GUI prototyping tool" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://code.google.com/p/evoluspencil/" -source=('evolus-pencil.desktop' 'evolus-pencil.sh') -md5sums=('cb8e722bfd76818c15b5cba4c2a7f002' '81e3b0102d9bedad5881628d5ccfa544') -depends=('xulrunner') -makedepends=(subversion) -provides=(evolus-pencil) -conflicts=(evolus-pencil) - -_svntrunk=http://evoluspencil.googlecode.com/svn/trunk/ -_svnmod=evolus-pencil - -NAME="Pencil" -VERSION="1.1" -BUILD="0" -AUTHOR="Duong Thanh An (an.duong@evolus.vn) and Contributors" -XPINAME="Pencil-'$VERSION'-'$BUILD'-fx.xpi" -FXMINVER="3.0b3" -FXMAXVER="3.6.*" -XRMINVER="1.9" -XRMAXVER="1.9.2.*" - -build() { - cd "$srcdir" - if [ -d $_svnmod/.svn ]; then - (cd $_svnmod && svn up -r $pkgver) - else - svn co $_svntrunk -r $pkgver $_svnmod - fi - mkdir -p "$pkgdir/usr/lib/$pkgname/chrome/content" - mkdir -p "$pkgdir/usr/lib/$pkgname/chrome/icons/default/" - mkdir -p "$pkgdir/usr/share/pixmaps" - install -Dm755 $srcdir/evolus-pencil.sh "$pkgdir/usr/lib/$pkgname/evolus-pencil.sh" - install -Dm755 $_svnmod/Source/Icons/48.png "$pkgdir/usr/share/pixmaps/evolus-pencil.png" - install -Dm755 $srcdir/evolus-pencil.desktop "$pkgdir/usr/share/applications/evolus-pencil.desktop" - cp -R $srcdir/$_svnmod/Source/* "$pkgdir/usr/lib/$pkgname/chrome/content" - cp $srcdir/$_svnmod/Source/Icons/pencil.ico "$pkgdir/usr/lib/$pkgname/chrome/icons/default/pencilMainWindow.ico" - cp $srcdir/$_svnmod/Source/Icons/pencil.xpm "$pkgdir/usr/lib/$pkgname/chrome/icons/default/pencilMainWindow.xpm" - cp -R $srcdir/$_svnmod/Build/XULRunner/* "$pkgdir/usr/lib/$pkgname/" - find "$pkgdir/usr/lib/$pkgname" -name .svn | xargs -i rm -Rf {} - - WindowXUL="$pkgdir/usr/lib/$pkgname/chrome/content/UI/Window.xul" - echo "Processing $WindowXUL..." - sed "s/%version%/$VERSION/g;s/%author%/$AUTHOR/g;s/%name%/$NAME/g;s/%build%/$BUILD/g;s/%xpiname%/$XPINAME/g;s/%fxminver%/$FXMINVER/g;s/%fxmaxver%/$FXMAXVER/g;s/%xrminver%/$XRMINVER/g;s/%xrmaxver%/$XRMAXVER/g;s/%xpihash%/$XPIHASH/g" < $WindowXUL > temp - mv -f temp "$WindowXUL" - - AboutDialogXUL="$pkgdir/usr/lib/$pkgname/chrome/content/UI/AboutDialog.xul" - echo "Processing $WindowXUL..." - sed "s/%version%/$VERSION/g;s/%author%/$AUTHOR/g;s/%name%/$NAME/g;s/%build%/$BUILD/g;s/%xpiname%/$XPINAME/g;s/%fxminver%/$FXMINVER/g;s/%fxmaxver%/$FXMAXVER/g;s/%xrminver%/$XRMINVER/g;s/%xrmaxver%/$XRMAXVER/g;s/%xpihash%/$XPIHASH/g" < $AboutDialogXUL > temp - mv -f temp "$AboutDialogXUL" - - PencilJS="$pkgdir/usr/lib/$pkgname/chrome/content/Common/Pencil.js" - echo "Processing $PencilJS..." - sed "s/%version%/$VERSION/g;s/%author%/$AUTHOR/g;s/%name%/$NAME/g;s/%build%/$BUILD/g;s/%xpiname%/$XPINAME/g;s/%fxminver%/$FXMINVER/g;s/%fxmaxver%/$FXMAXVER/g;s/%xrminver%/$XRMINVER/g;s/%xrmaxver%/$XRMAXVER/g;s/%xpihash%/$XPIHASH/g" < $PencilJS > temp - mv -f temp "$PencilJS" - - AppIni="$pkgdir/usr/lib/$pkgname/application.ini" - echo "Processing $AppIni..." - sed "s/%version%/$VERSION/g;s/%author%/$AUTHOR/g;s/%name%/$NAME/g;s/%build%/$BUILD/g;s/%xpiname%/$XPINAME/g;s/%fxminver%/$FXMINVER/g;s/%fxmaxver%/$FXMAXVER/g;s/%xrminver%/$XRMINVER/g;s/%xrmaxver%/$XRMAXVER/g;s/%xpihash%/$XPIHASH/g" < $AppIni > temp - mv -f temp "$AppIni" -} +# Maintainer: Trương Xuân Tính +pkgname=evolus-pencil-svn +pkgver=219 +pkgrel=3 +pkgdesc="Sketching and GUI prototyping tool" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://code.google.com/p/evoluspencil/" +source=('evolus-pencil.desktop' 'evolus-pencil.sh') +md5sums=('cb8e722bfd76818c15b5cba4c2a7f002' '2880aa65db1bfa86018b9d6f1de95ae0') +depends=('xulrunner') +makedepends=(subversion) +provides=(evolus-pencil) +conflicts=(evolus-pencil) +install='evolus-pencil-svn.install' + +_svnbranch=http://evoluspencil.googlecode.com/svn/branches/pencil-2.0 +_svnmod=evolus-pencil + +build() { + cd "$srcdir" + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod && svn up -r $pkgver) + else + svn co $_svnbranch -r $pkgver $_svnmod + fi + mkdir -p "$pkgdir/usr/lib/$pkgname/" + mkdir -p "$pkgdir/usr/share/pixmaps" + install -Dm755 $srcdir/evolus-pencil.sh "$pkgdir/usr/lib/$pkgname/evolus-pencil.sh" + install -Dm755 $_svnmod/app/icons/default/main-window.48.png "$pkgdir/usr/share/pixmaps/evolus-pencil.png" + install -Dm755 $srcdir/evolus-pencil.desktop "$pkgdir/usr/share/applications/evolus-pencil.desktop" + + cp -a $_svnmod/app $pkgdir/usr/lib/$pkgname/ + + export NAME='Pencil' + export VERSION='1.3' + export BUILD='2' + export AUTHOR='Duong Thanh An (an.duong@evolus.vn) and Contributors' + export XPI_NAME='Pencil-'$VERSION'-'$BUILD'-fx.xpi' + export MIN_VERSION='1.9.8' + export MAX_VERSION='10.*' + export UPDATE_URL="http://pencil.evolus.vn" + + chmod +x ./$_svnmod/build/replacer.sh + ./$_svnmod/build/replacer.sh $pkgdir/usr/lib/$pkgname/app/content/pencil/mainWindow.xul + ./$_svnmod/build/replacer.sh $pkgdir/usr/lib/$pkgname/app/content/pencil/aboutDialog.xul + + install -Dm755 $_svnmod/app/defaults/preferences/personal.js.xulrunner $pkgdir/usr/lib/$pkgname/app/defaults/preferences/personal.js + find $pkgdir/usr/lib/$pkgname/ -iname .svn | xargs -i rm -rf {} +} diff --git a/evolus-pencil-svn/evolus-pencil-svn.install b/evolus-pencil-svn/evolus-pencil-svn.install new file mode 100644 index 000000000..832c7caf2 --- /dev/null +++ b/evolus-pencil-svn/evolus-pencil-svn.install @@ -0,0 +1,6 @@ +post_install() { + ln -s /usr/lib/evolus-pencil-svn/evolus-pencil.sh /usr/bin/evolus-pencil +} +post_remove() { + rm -rf /usr/bin/evolus-pencil +} diff --git a/evolus-pencil-svn/evolus-pencil.sh b/evolus-pencil-svn/evolus-pencil.sh index 4a18167c3..9f536e21b 100755 --- a/evolus-pencil-svn/evolus-pencil.sh +++ b/evolus-pencil-svn/evolus-pencil.sh @@ -1,6 +1,6 @@ #!/bin/sh -cd `dirname $0` +cd /usr/lib/evolus-pencil-svn/ DIR=`pwd` -APP_INI=$DIR/application.ini +APP_INI=$DIR/app/application.ini -xulrunner --app "$APP_INI" --abc +xulrunner --app "$APP_INI" diff --git a/exim-mysql/PKGBUILD b/exim-mysql/PKGBUILD index f689b9370..3f99771a0 100644 --- a/exim-mysql/PKGBUILD +++ b/exim-mysql/PKGBUILD @@ -10,14 +10,13 @@ # ################################################# pkgname=exim-mysql -pkgver=4.76 +pkgver=4.77 pkgrel=1 pkgdesc="A Message Transfer Agent with MySQL and sqlite3 support" arch=('i686' 'x86_64') url="http://www.exim.org/" license=('GPL') -backup=(etc/mail/aliases etc/mail/exim.conf \ - etc/logrotate.d/exim etc/conf.d/exim) +backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim etc/conf.d/exim) install=exim.install depends=('db' 'pcre' 'pam' 'tcp_wrappers' 'openssl' 'libmysqlclient' 'libspf2' 'sqlite3') makedepends=('sudo') @@ -30,20 +29,25 @@ source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-${pkgver}. exim exim.logrotate exim.conf.d) -md5sums=('58e784b33c7a2ab335ec6400346d6362' +md5sums=('5d746275f2cc85845567f9d5eb84a57a' '4874006f0585253ddab027d441009757' 'ea39f58bffc16f5e3bbe59dffcf09449' '9aed772e87223213e8da9ca5e7376869' - 'd788c26f86a9d72a0aebb3b849fe74f2' + 'e18a535218718c5eb394ed5c9296fe06' 'b75fe4c6e960a59a25b5f51e8f61ba3a') build() { # An exim user is required to build this if [ ! `egrep '^exim' /etc/passwd` ]; then - echo "==> Adding user/group exim" - sudo groupadd -g 79 exim + echo "==> Adding user exim" sudo useradd -u 79 -g exim -d /var/spool/exim -s /bin/false exim fi + + # An exim group is required to build this + if [ ! `egrep '^exim' /etc/group` ]; then + echo "==> Adding group exim" + sudo groupadd -g 79 exim + fi cd ${srcdir}/exim-${pkgver} echo " diff --git a/exim-mysql/exim.install b/exim-mysql/exim.install index 132b33f14..8ed329559 100644 --- a/exim-mysql/exim.install +++ b/exim-mysql/exim.install @@ -7,6 +7,9 @@ post_install() { usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim fi passwd -l exim > /dev/null + chown root.exim /var/spool/exim /var/log/exim + chown exim.exim /var/spool/exim/db + chmod u+s /usr/sbin/exim } # arg 1: the new package version diff --git a/exim-mysql/exim.logrotate b/exim-mysql/exim.logrotate index ff38a1452..070ba4747 100644 --- a/exim-mysql/exim.logrotate +++ b/exim-mysql/exim.logrotate @@ -1,4 +1,5 @@ /var/log/exim/*log { + su exim exim missingok notifempty delaycompress diff --git a/firefox-beta-bin-all-localizations/PKGBUILD b/firefox-beta-bin-all-localizations/PKGBUILD index e4dd029b2..fb876118a 100644 --- a/firefox-beta-bin-all-localizations/PKGBUILD +++ b/firefox-beta-bin-all-localizations/PKGBUILD @@ -4,7 +4,7 @@ pkgname=firefox-beta-bin-all-localizations _mypkgn=firefox-beta pkgdesc='Perl script for installing latest FF beta in the language of your choice' url='http://www.mozilla.com/firefox/channel/' -pkgver=10.0b2 +pkgver=10.0b3 pkgrel=1 arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL' 'GPL3') @@ -13,14 +13,14 @@ makedepends=('gnupg' 'perl-gnupg' 'perl-libwww') install=firefox.install source=('firefox-beta-bin.desktop' 'firefox-beta-bin-safe.desktop' 'ff-downloader.pl') md5sums=('09569434d20ceb6c7e6a267249f8ab48' - '6fc7dee182dd7cca644c9d8a5861cf62' - '13e43fa7f112f1ce89231b06f5ce4559') + '6fc7dee182dd7cca644c9d8a5861cf62' + '780d893b941cf6cf3fb03fecb7ca42f3') build() { perl ff-downloader.pl -v $pkgver } package() { - tar -jxf firefox-${pkgver}.tar.bz2 + bsdtar -jxf firefox-${pkgver}.tar.bz2 mkdir -p $pkgdir/usr/{lib,bin,share/{applications,pixmaps}} cp -r firefox "${pkgdir}/usr/lib/${_mypkgn}" diff --git a/firefox-beta-bin-all-localizations/ff-downloader.pl b/firefox-beta-bin-all-localizations/ff-downloader.pl index 67c2e0e02..fc9884aef 100755 --- a/firefox-beta-bin-all-localizations/ff-downloader.pl +++ b/firefox-beta-bin-all-localizations/ff-downloader.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# ff-downloader v0.4.1 +# ff-downloader v0.5 ## Copyright 2011 Simone Sclavi 'Ito' # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ use strict; use warnings; -use feature 'say'; +use feature qw(say switch); use Getopt::Long qw(:config no_ignore_case); use URI; use LWP; @@ -34,12 +34,7 @@ sub get_url my $resp = $browser->get($url, ':content_file' => $file); return $resp->is_success; } - -my $VER; -my $res = GetOptions("version|v=s" => \$VER); - -die ":: usage: $0 -v|--version=FIREFOX_BETA_VERSION\n" unless $res and (scalar @ARGV == 0) and $VER; -my @u_i18n = ( +my @ff_i18n = ( { language => 'Afrikaans (South Africa)', code => 'af' }, { language => 'Akan', code => 'ak' }, { language => 'Aarabic', code => 'ar' }, @@ -128,6 +123,78 @@ my @u_i18n = ( { language => 'Zulu', code => 'zu' }, ); +my @tb_i18n = ( +{ language => 'Aarabic', code => 'ar' }, +{ language => 'Asturian', code => 'ast' }, +{ language => 'Belarusian', code => 'be' }, +{ language => 'Bulgarian', code => 'bg' }, +{ language => 'Bengali (Bangladesh)', code => 'bn-BD' }, +{ language => 'Breton', code => 'br' }, +{ language => 'Catalan', code => 'ca' }, +{ language => 'Czech', code => 'cs' }, +{ language => 'Danish', code => 'da' }, +{ language => 'German', code => 'de' }, +{ language => 'Greek', code => 'el' }, +{ language => 'English (United Kingdom)', code => 'en-GB' }, +{ language => 'English (US)', code => 'en-US' }, +{ language => 'Spanish (Argentina)', code => 'es-AR' }, +{ language => 'Spanish (Spain)', code => 'es-ES' }, +{ language => 'Estonian', code => 'et' }, +{ language => 'Basque', code => 'eu' }, +{ language => 'Finnish', code => 'fi' }, +{ language => 'French', code => 'fr' }, +{ language => 'Frisian', code => 'fy-NL' }, +{ language => 'Irish', code => 'ga-IE' }, +{ language => 'Gaelic (Scotland)', code => 'gd' }, +{ language => 'Galician', code => 'gl' }, +{ language => 'Hebrew', code => 'he' }, +{ language => 'Hungarian', code => 'hu' }, +{ language => 'Indonesian', code => 'id' }, +{ language => 'Icelandic', code => 'is' }, +{ language => 'Italian', code => 'it' }, +{ language => 'Japanese', code => 'ja' }, +{ language => 'Korean', code => 'ko' }, +{ language => 'Lithuanian', code => 'lt' }, +{ language => 'Norwegian (Bokmal)', code => 'nb-NO' }, +{ language => 'Dutch', code => 'nl' }, +{ language => 'Norwegian (Nynorsk)', code => 'nn-NO' }, +{ language => 'Punjabi', code => 'pa-IN' }, +{ language => 'Polish', code => 'pl' }, +{ language => 'Portuguese (Brazil)', code => 'pt-BR' }, +{ language => 'Portuguese (Portugal)', code => 'pt-PT' }, +{ language => 'Romansh', code => 'rm' }, +{ language => 'Romanian', code => 'ro' }, +{ language => 'Russian', code => 'ru' }, +{ language => 'Sinhalese', code => 'si' }, +{ language => 'Slovak', code => 'sk' }, +{ language => 'Slovenian', code => 'sl' }, +{ language => 'Albanian', code => 'sq' }, +{ language => 'Serbian', code => 'sr' }, +{ language => 'Swedish', code => 'sv-SE' }, +{ language => 'Tamil (Sri Lanka)', code => 'ta-LK' }, +{ language => 'Turkish', code => 'tr' }, +{ language => 'Ukrainan', code => 'uk' }, +{ language => 'Vietnamese', code => 'vi' }, +{ language => 'Chinese (Simplified)', code => 'zh-CN' }, +{ language => 'Chinese (Traditional)', code => 'zh-TW' }, +); + +my ($VER, $PACKAGE, @u_i18n); +my $pkg = 'ff'; #default value for "--package" +my $res = GetOptions("version|v=s" => \$VER, + "package|p=s" => \$pkg ); + +die ":: usage: $0 -p|--package= -v|--version=\n" unless $res and (scalar @ARGV == 0); +given ($pkg) +{ + when ('ff') { $PACKAGE = 'firefox'; @u_i18n = @ff_i18n; } + when ('tb') { $PACKAGE = 'thunderbird'; @u_i18n = @tb_i18n } + default { die qq{:: "$pkg" is not a valid value for "--package"! Please use "ff" or "tb"\n}} + } +die qq{:: "--version" option is mandatory!\n} unless $VER; + + + my @i18n = sort { $a->{language} cmp $b->{language} } @u_i18n; my $size = scalar @i18n; @@ -153,23 +220,23 @@ chomp $ARCH; $| = 1; # turn on autoflush; -my $ff_path = "/pub/firefox/releases/${VER}/linux-${ARCH}/${i18n[$choice - 1]{code}}/firefox-${VER}.tar.bz2"; +my $ff_path = "/pub/${PACKAGE}/releases/${VER}/linux-${ARCH}/${i18n[$choice -1]{code}}/${PACKAGE}-${VER}.tar.bz2"; my $ff_url = URI->new('ftp://ftp.mozilla.org'); $ff_url->path($ff_path); ##Downloading firefox## -get_url( $ff_url, "firefox-${VER}.tar.bz2" ) or die qq(:: ERROR - can't download "firefox-${VER}.tar.bz2"\n); +get_url( $ff_url, "${PACKAGE}-${VER}.tar.bz2" ) or die qq(:: ERROR - can't download "${PACKAGE}-${VER}.tar.bz2"\n); ##downloading signature## $ff_url->path("${ff_path}.asc"); -get_url( $ff_url, "firefox-${VER}.tar.bz2.asc" ) or die qq(:: ERROR - can't download "firefox-${VER}.tar.bz2.asc"\n); +get_url( $ff_url, "$PACKAGE-${VER}.tar.bz2.asc" ) or die qq(:: ERROR - can't download "${PACKAGE}-${VER}.tar.bz2.asc"\n); ##downloading public key -$ff_url->path("pub/firefox/releases/${VER}/KEY"); +$ff_url->path("pub/${PACKAGE}/releases/${VER}/KEY"); get_url( $ff_url, "KEY" ) or die qq(:: ERROR - can't download 'KEY'\n); print ':: verifying gnupg signature ... '; my $gpg = new GnuPG(); $gpg->import_keys( keys => 'KEY'); -$gpg->verify ( signature => "firefox-${VER}.tar.bz2.asc", file => "firefox-${VER}.tar.bz2"); +$gpg->verify ( signature => "${PACKAGE}-${VER}.tar.bz2.asc", file => "${PACKAGE}-${VER}.tar.bz2"); say 'DONE'; diff --git a/fritzing/PKGBUILD b/fritzing/PKGBUILD index 1c45fc7a0..8b8c4a11c 100644 --- a/fritzing/PKGBUILD +++ b/fritzing/PKGBUILD @@ -2,7 +2,7 @@ # henning mueller pkgname=fritzing -pkgver=0.6.4b +pkgver=0.6.5b pkgrel=1 pkgdesc='PCB layout prototyping application' arch=(i686 x86_64) @@ -14,7 +14,7 @@ source=( fritzing.desktop ) md5sums=( - cbc4cebe442a9eb18a3c13328964d97a + 8ea0765b8fd31874da0ee00515a68576 5ab83056a367111e34e8f25d33dfdb61 ) diff --git a/gnome-shell-extension-package-installer-git/PKGBUILD b/gnome-shell-extension-package-installer-git/PKGBUILD index 70f99467c..88aed7451 100644 --- a/gnome-shell-extension-package-installer-git/PKGBUILD +++ b/gnome-shell-extension-package-installer-git/PKGBUILD @@ -2,13 +2,13 @@ # Author: sanderd17 pkgname=gnome-shell-extension-package-installer-git -pkgver=20120107 +pkgver=20120109 pkgrel=1 pkgdesc="Install packages directly from the Gnome-Shell overview." arch=(i686 x86_64) url="https://gitorious.org/gnome-shell-extension-application-installer" license=('LGPL') -depends=('packer' 'package-query' 'gnome-shell>=3.2') +depends=('packer' 'package-query' 'gnome-shell>=3.2', 'gnome-packagekit') makedepends=('git') provides=() conflicts=() @@ -43,7 +43,7 @@ build() { mkdir -p ${pkgdir}/usr/share/gnome-shell/extensions/installer@sanderd17.gmail.com - mv ${srcdir}/${_gitname}/* ${pkgdir}/usr/share/gnome-shell/extensions/installer@sanderd17.gmail.com + mv ${srcdir}/${_gitname}-build/* ${pkgdir}/usr/share/gnome-shell/extensions/installer@sanderd17.gmail.com } diff --git a/gnome-theme-chocolatte/PKGBUILD b/gnome-theme-chocolatte/PKGBUILD index 7a283947d..473d2ac87 100644 --- a/gnome-theme-chocolatte/PKGBUILD +++ b/gnome-theme-chocolatte/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: sanderd17 pkgname=gnome-theme-chocolatte -pkgver=1.0.4 -pkgrel=1 +pkgver=1.0.5 +pkgrel=2 pkgdesc="A brown-grey Gnome-Shell theme by cbowman. Also shipped with gtk and metacity themes." url="http://cbowman57.deviantart.com/art/ChocoLatte-273193264" license=('unknown') @@ -16,11 +16,7 @@ optdepends=( 'gnome-tweak-tool: A tool to customize advanced GNOME 3 options.') source=("http://www.deviantart.com/download/273193264/chocolatte_by_cbowman57-d4inh9s.7z") -md5sums=('08dda2f7aebafeacdf316addcc05cfd7') - - - - +md5sums=('9cb16603136c73d7109e736a402822f8') build() { mkdir -p ${pkgdir}/usr/share/themes/ diff --git a/hamsimanager/PKGBUILD b/hamsimanager/PKGBUILD index 2db31215a..65d54ea03 100644 --- a/hamsimanager/PKGBUILD +++ b/hamsimanager/PKGBUILD @@ -3,7 +3,7 @@ pkgname=hamsimanager _realname=HamsiManager -pkgver=0.9.74 +pkgver=1.0 pkgrel=1 pkgdesc="Hamsi Manager is a file manager,renamer,id3 tagger,information changer ,.... tool." arch=('i686' 'x86_64') @@ -35,3 +35,6 @@ install -d $pkgdir/{usr/bin/,usr/share/hamsi/} } # vim:set ts=8 sw=2 et: +md5sums=('f37f8e28100885711a1f2ae7a4029a65' + '603bd4ad05a3f2591424cd218950a6d6' + 'ec4a30c4c399cd72f42b2975ab5c5314') diff --git a/ipxe-git/PKGBUILD b/ipxe-git/PKGBUILD index 08abae24e..1041fd432 100644 --- a/ipxe-git/PKGBUILD +++ b/ipxe-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Christian Hesse pkgname=ipxe-git -pkgver=20111230 +pkgver=20120109 pkgrel=1 pkgdesc="iPXE open source boot firmware - git checkout" arch=('i686' 'x86_64') @@ -10,7 +10,6 @@ license=('GPL') makedepends=('git') provides=(ipxe) conflicts=(ipxe) -source=(ipxe_dns.diff) _gitroot="git://git.ipxe.org/ipxe.git" _gitname="ipxe" @@ -33,15 +32,12 @@ build() { git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" cd "${srcdir}/${_gitname}-build/" - # fix dns query, there's a double null byte - patch -Np1 < ${srcdir}/ipxe_dns.diff - cd "${srcdir}/${_gitname}-build/src" make install -D -m644 bin/ipxe.dsk ${pkgdir}/usr/share/ipxe/ipxe.dsk install -D -m644 bin/ipxe.usb ${pkgdir}/usr/share/ipxe/ipxe.usb install -D -m644 bin/ipxe.iso ${pkgdir}/usr/share/ipxe/ipxe.iso - install -D -m644 bin/undionly.kpxe ${pkgdir}/usr/share/ipxe/undionly.kpxe + install -D -m644 bin/undionly.kpxe ${pkgdir}/usr/lib/ipxe/undionly.kpxe } -md5sums=('7f27509a1ba72a84db43b30dc536e45b') +md5sums=() diff --git a/ipxe-git/ipxe_dns.diff b/ipxe-git/ipxe_dns.diff deleted file mode 100644 index 94951a14e..000000000 --- a/ipxe-git/ipxe_dns.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/net/udp/dns.c 2011-12-28 08:30:06.921093808 +0100 -+++ b/src/net/udp/dns.c 2011-12-28 08:34:23.387489741 +0100 -@@ -233,7 +233,6 @@ static char * dns_make_name ( const char - *(buf++) = c; - } - *length_byte = buf - length_byte - 1; -- *(buf++) = '\0'; - return buf; - } - diff --git a/kdeplasma-applets-plasma-crystal-git/PKGBUILD b/kdeplasma-applets-plasma-crystal-git/PKGBUILD new file mode 100644 index 000000000..05c1faece --- /dev/null +++ b/kdeplasma-applets-plasma-crystal-git/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: (epsilom) Xavier Corredor +# Contributor: alexwizard + +pkgname=kdeplasma-applets-plasma-crystal-git +_realname=plasma-crystal +pkgver=20120109 +pkgrel=1 +pkgdesc="A widget that can be used as search widget, or alternative file-open mechanism" +arch=('i686' 'x86_64') +url="http://quickgit.kde.org/?p=plasma-crystal.git&a=summary" +license=('GPL') +depends=('kdebase-plasma') +makedepends=('cmake' 'automoc4' 'git' 'docbook-xsl' 'bc') +provides=(kdeplasma-applets-${_realname}) +conflicts=(kdeplasma-applets-${_realname}) + +_gitroot="git://anongit.kde.org/${_realname}" +_gitname=${_realname} + +build() { + cd ${srcdir} + + msg "Connecting to GIT server...." + + if [ -d ${_gitname} ]; then + cd ${_gitname} && git pull origin + msg "The local files are updated." + else + git clone ${_gitroot} + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf ${srcdir}/build + git clone ${srcdir}/${_gitname} ${srcdir}/build + cd ${srcdir}/build + + cmake . -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/build + make DESTDIR=${pkgdir} install +} diff --git a/libgeier/PKGBUILD b/libgeier/PKGBUILD index afe8282fd..eb40aa330 100644 --- a/libgeier/PKGBUILD +++ b/libgeier/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Juergen Graefe pkgname=libgeier -pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc="A library for validating ELSTER data and processing financial XSLT stylesheets" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ license=('GPL') depends=('xmlsec') options=('!libtool') source=(http://www.taxbird.de/download/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('0b11df400a352d68b99514156edffab5') +md5sums=('baecd0d98148de0985e8fc3ea0291431') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/libmilter-shared/PKGBUILD b/libmilter-shared/PKGBUILD new file mode 100644 index 000000000..098aa6f30 --- /dev/null +++ b/libmilter-shared/PKGBUILD @@ -0,0 +1,72 @@ +# Contributor: Sergej Pupykin +# Contributor: mutantmonkey + +pkgname=libmilter-shared +_pkgname=libmilter +pkgver=8.14.5 +pkgrel=2 +pkgdesc="Sendmail Mail Filter API (Milter)" +arch=('i686' 'x86_64') +url="https://www.milter.org/developers/api/index" +depends=('glibc') +provides=('libmilter') +conflicts=('libmilter') +license=('custom:Sendmail open source license') +source=("ftp://ftp.sendmail.org/pub/sendmail/sendmail."$pkgver".tar.gz"{,.sig} + 'export-smfi.lds') +sha256sums=('fb65a86a0f87f12aefb933ee8990540f7a680a594f7fedfdd28918f3934bfb88' + 'ff121cf13cc1b3d3d45a4992915281dee031fe9d0e0d2b841f167a3d672a3c58' + '05f9ce8ffbc98cb18fa30ca70c281d2c27a6f15817a897aa12bd36d8cf990826') + +build(){ + + cd "$srcdir/sendmail-$pkgver" + + export CFLAGS="${CFLAGS} -DPIC -fPIC -fvisibility=hidden" + + # From http://www.j-chkmail.org/wiki/doku.php/doc/installation/start#libmilter + cat >> devtools/Site/site.config.m4 < pkgname=libmodbus -pkgver=2.1.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A Modbus library for Linux (and OSX) wrote in C and which supports RTU and TCP communications." arch=('i686' 'x86_64') @@ -21,17 +21,17 @@ replaces=() backup=() options=() install= -source=(http://launchpad.net/libmodbus/trunk/2.1.0/+download/$pkgname-$pkgver.tar.gz) +source=(http://github.com/downloads/stephane/libmodbus/$pkgname-$pkgver.tar.gz) noextract=() -md5sums=('85da943c6ae489b7d21e9381f79485a4') +md5sums=('7ad8afbd02a7a2afd70c5bb7271a593b') build() { cd "$srcdir/$pkgname-$pkgver" - ./autogen.sh + #./autogen.sh ./configure --prefix=/usr make || return 1 make DESTDIR="$pkgdir/" install rm $pkgdir/usr/lib/*.la } -# vim:set ts=2 sw=2 et: +# vim:set ts=2 sw=2 et: \ No newline at end of file diff --git a/linux-usermode/PKGBUILD b/linux-usermode/PKGBUILD index 48fd31168..9ebc6ec8e 100644 --- a/linux-usermode/PKGBUILD +++ b/linux-usermode/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linux-usermode _basekernel=3.1 -pkgver=3.1.7 +pkgver=3.1.8 pkgrel=1 _kernelname=-usermodelinux pkgdesc="User mode Linux kernel and modules" @@ -9,7 +9,7 @@ license=('GPL2') url="http://user-mode-linux.sourceforge.net/" depends=('coreutils') source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$pkgver.tar.bz2") -md5sums=('f45deba9a3892892d05232a61ba44d0b') +md5sums=('69dfba755ab8691a426d8061c94a7ddc') conflicts=('kernel26-usermode') build() { diff --git a/logitechmediaserver/PKGBUILD b/logitechmediaserver/PKGBUILD index f817deb31..7cc0f08c8 100644 --- a/logitechmediaserver/PKGBUILD +++ b/logitechmediaserver/PKGBUILD @@ -2,13 +2,14 @@ pkgname=logitechmediaserver pkgver=7.7.1 -pkgrel=1 +pkgrel=2 pkgdesc='Streaming audio server supported by Logitech' url='http://www.mysqueezebox.com/download' license=('GPL' 'custom') depends=('perl') arch=('i686' 'x86_64') makedepends=('nasm' 'yasm') +[[ $CARCH = x86_64 ]] && optdepends=('lib32-glibc: transcoding' 'lib32-gcc-libs: transcoding') depends=('perl>5.13' 'perl<5.15') # 'perl-dbi' too when building self cpan source=("http://downloads.slimdevices.com/LogitechMediaServer_v${pkgver}/logitechmediaserver-${pkgver}.tgz" 'perl-5.14.patch' diff --git a/lsx/PKGBUILD b/lsx/PKGBUILD index 681a62747..479f5c8bd 100644 --- a/lsx/PKGBUILD +++ b/lsx/PKGBUILD @@ -3,19 +3,18 @@ # Contributor: Giorgio Lando pkgname=lsx pkgver=0.1 -pkgrel=10 +pkgrel=11 pkgdesc="List executables" license=(MIT) arch=('i686' 'x86_64') url=http://www.suckless.org/programs/lsx.html depends=(glibc) -conflicts=('dmenu' 'dmenu-xft') source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz) md5sums=('d48fdce9868b13bf5ef3e7834768f89f') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk - make clean PREFIX=/usr DESTDIR=$startdir/pkg install - install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + make clean PREFIX=/usr DESTDIR=$pkgdir install + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/mfiler3/PKGBUILD b/mfiler3/PKGBUILD index 5288bf9dc..155253011 100644 --- a/mfiler3/PKGBUILD +++ b/mfiler3/PKGBUILD @@ -1,15 +1,15 @@ # Contributor: noonov pkgname=mfiler3 -pkgver=4.4.8 -pkgrel=2 +pkgver=4.4.9 +pkgrel=1 pkgdesc="A feature-rich console file manager" arch=('i686' 'x86_64') url="http://ab25cq.sakura.ne.jp/" license=('GPL2') -depends=('saphire>=3.6.4') +depends=('saphire>=3.6.5') optdepends=('lv' 'vim') -source=(http://dl.sourceforge.jp/mfiler3/54022/${pkgname}-${pkgver}.tgz) +source=(http://dl.sourceforge.jp/mfiler3/54457/${pkgname}-${pkgver}.tgz) build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -24,4 +24,4 @@ package() { make -j1 DESTDIR=${pkgdir} install } -md5sums=('7a1d38acfae984c6eeb2d3ba999898bc') +md5sums=('3f4942565b260e898d7ea60fb9474f95') diff --git a/ntfs-3g-ar/PKGBUILD b/ntfs-3g-ar/PKGBUILD index ae23edc71..af46f1b27 100644 --- a/ntfs-3g-ar/PKGBUILD +++ b/ntfs-3g-ar/PKGBUILD @@ -5,20 +5,20 @@ _pkgname=ntfs-3g_ntfsprogs pkgname=ntfs-3g-ar -pkgver=2011.4.12AR.3 +pkgver=2011.10.9AR.1 pkgrel=1 -pkgdesc="Read and write NTFS driver, with support for advanced features" +pkgdesc="NTFS driver and utilities with support for advanced features" url="http://b.andre.pagesperso-orange.fr/advanced-ntfs-3g.html" arch=('i686' 'x86_64') license=('GPL2') -depends=('glibc' 'fuse') +depends=('glibc' 'fuse' 'util-linux') makedepends=('pkgconfig') options=('!libtool') -provides=("ntfs-3g=$pkgver") -conflicts=(ntfs-3g) +provides=("ntfs-3g=$pkgver" "ntfsprogs=$pkgver") +conflicts=(ntfs-3g ntfsprogs) source=("http://pagesperso-orange.fr/b.andre/$_pkgname-$pkgver.tgz" 25-ntfs-config-write-policy.fdi) -sha1sums=('ce36118ab88301d73b0a61ac3a53d2ea29efe325' +sha1sums=('84d0cf61bac05e4ddd4f4777a6170879e62e5ee0' '200029f2999a2c284fd30ae25734abf6459c3501') build() { @@ -26,6 +26,7 @@ build() { ac_cv_path_LDCONFIG=/bin/true ./configure \ --prefix=/usr \ + --mandir=/usr/share/man \ --with-fuse=external \ --disable-static \ --enable-posix-acls \ @@ -37,12 +38,9 @@ build() { package() { cd "$srcdir/$_pkgname-$pkgver" - for _dir in src libntfs-3g include; do ( - cd $_dir - make DESTDIR="$pkgdir" install - ) done + make DESTDIR="$pkgdir" install ln -s /bin/ntfs-3g "$pkgdir/sbin/mount.ntfs" - install -m644 -D "$srcdir/25-ntfs-config-write-policy.fdi" \ + install -Dm644 "$srcdir/25-ntfs-config-write-policy.fdi" \ "$pkgdir/usr/share/hal/fdi/policy/10osvendor/25-ntfs-config-write-policy.fdi" } diff --git a/ocaml-fdinfo/PKGBUILD b/ocaml-fdinfo/PKGBUILD index a996f5c44..b6a0abb13 100644 --- a/ocaml-fdinfo/PKGBUILD +++ b/ocaml-fdinfo/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Gregory BELLIER pkgname=ocaml-fdinfo -pkgver=0.3 +pkgver=0.3.1 pkgrel=1 pkgdesc="OCaml library to get infos on files opened by another processus " arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('ocaml ocaml-findlib') options=('!strip') install= source=(http://gatekeeper.fr/tarball/ocaml-fdinfo/ocaml-fdinfo_$pkgver.tar.gz) -md5sums=('9171fa788fb93f571c8904e0234f8f24') +md5sums=('bc4d776f7feb39e9fec2caeca8e83df6') build() { diff --git a/pacaur-git/PKGBUILD b/pacaur-git/PKGBUILD index 62c15792b..4ef271970 100644 --- a/pacaur-git/PKGBUILD +++ b/pacaur-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Remy Marquis pkgname=pacaur-git -pkgver=20120105 +pkgver=20120109 pkgrel=1 pkgdesc="A fast workflow AUR wrapper using cower as backend" arch=('any') diff --git a/pacaur/PKGBUILD b/pacaur/PKGBUILD index 6a2eb7239..48ec68786 100644 --- a/pacaur/PKGBUILD +++ b/pacaur/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Remy Marquis pkgname=pacaur -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="A fast workflow AUR wrapper using cower as backend" arch=('any') @@ -12,7 +12,7 @@ optdepends=('pacman-color: colorized output') backup=('etc/xdg/pacaur/pacaur.conf') source=("https://github.com/downloads/Spyhawk/$pkgname/$pkgname-$pkgver.tar.gz") install=pacaur25.install -md5sums=('959ceb90ac14a4c909121e5bef565596') +md5sums=('301979aa855b098f6d199a7423ade3c5') build() { mkdir -p "$pkgdir/etc/xdg/pacaur" install -D -m644 ./$pkgname.conf $pkgdir/etc/xdg/pacaur/$pkgname.conf || return 1 diff --git a/pacaur/pacaur25.install b/pacaur/pacaur25.install index adbb6b3e4..300332466 100644 --- a/pacaur/pacaur25.install +++ b/pacaur/pacaur25.install @@ -2,7 +2,7 @@ ## arg 2: the old package version post_upgrade() { # warn 2.4.x users about conf file change - if [[ $(vercmp $1 $2) -gt 0 ]]; then + if [[ $(vercmp $2 2.5.0) -lt 0 ]]; then echo " Please note that pacaur $1 now support XDG standard properly and that the main configuration file has been moved to diff --git a/saphire/PKGBUILD b/saphire/PKGBUILD index af395c996..b4b1f190c 100644 --- a/saphire/PKGBUILD +++ b/saphire/PKGBUILD @@ -1,14 +1,14 @@ # Contributor: noonov pkgname=saphire -pkgver=3.6.4 +pkgver=3.6.5 pkgrel=1 pkgdesc="A command-line shell for mfiler3" arch=('i686' 'x86_64') url="http://ab25cq.sakura.ne.jp/" license=('GPL2') depends=('oniguruma' 'gc') -source=(http://dl.sourceforge.jp/sash/54193/${pkgname}-${pkgver}.tgz) +source=(http://dl.sourceforge.jp/sash/54458/${pkgname}-${pkgver}.tgz) build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -23,4 +23,4 @@ package() { make -j1 DESTDIR=${pkgdir} install } -md5sums=('3c8e9efa05a4b49f6d2c736c689dc5a4') +md5sums=('0c2c595c6ba616ded997bdbfb68e5e1c') diff --git a/taxbird/PKGBUILD b/taxbird/PKGBUILD index 6b16e2a44..03cb20a03 100644 --- a/taxbird/PKGBUILD +++ b/taxbird/PKGBUILD @@ -1,12 +1,12 @@ # Contributor: Juergen Graefe pkgname=taxbird -pkgver=0.16 +pkgver=0.18 pkgrel=1 pkgdesc="A tax client with German ELSTER compliance" arch=('i686' 'x86_64') url="http://www.taxbird.de/" license=('GPL3') -depends=('guile' 'libgeier' 'libgnomeui' 'libgtkhtml' 'gtkhtml') +depends=('guile' 'libgeier=>0.13' 'libgnomeui' 'libgtkhtml' 'gtkhtml') makedepends=('pkgconfig') optdepends=('cups: for printing transmission protocols' 'html2ps: for optimal formatting of transmission protocols') @@ -20,4 +20,4 @@ build() { make DESTDIR="$pkgdir" install || return 1 ln -sf /usr/share/pixmaps/$pkgname.xpm "$pkgdir/usr/share/$pkgname/$pkgname.xpm" } -md5sums=('54021d745becb1a05c22ecbb1f24969c') +md5sums=('213e63cb9283fbcc539259742271445f') diff --git a/thunderbird-beta-bin-all-localizations/PKGBUILD b/thunderbird-beta-bin-all-localizations/PKGBUILD new file mode 100644 index 000000000..9aedb657d --- /dev/null +++ b/thunderbird-beta-bin-all-localizations/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Simone Sclavi 'Ito' + +pkgname=thunderbird-beta-bin-all-localizations +_mypkgn=thunderbird-beta +pkgdesc='Perl script for installing latest TB beta in the language of your choice' +url='http://www.mozilla.com/thunderbird/channel/' +pkgver=10.0b1 +pkgrel=1 +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'GPL3') +depends=('desktop-file-utils' 'xulrunner' 'gnome-vfs' 'orbit2' 'hicolor-icon-theme' ) +makedepends=('gnupg' 'perl-gnupg' 'perl-libwww') +source=('ff-downloader.pl' 'thunderbird-beta-bin.desktop') +md5sums=('780d893b941cf6cf3fb03fecb7ca42f3' + 'f8a9b91202e8c85ad7b8f23fb82a4d7b') +install=thunderbird.install + +build() +{ + perl ff-downloader.pl -v $pkgver -p tb +} +package() { + bsdtar -jxf thunderbird-${pkgver}.tar.bz2 + mkdir -p $pkgdir/usr/{bin,lib} + cp -a thunderbird $pkgdir/usr/lib/$_mypkgn + ln -s /usr/lib/libnotify.so ${pkgdir}/usr/lib/${_mypkgn}/libnotify.so.1 + ln -s /usr/lib/$_mypkgn/thunderbird $pkgdir/usr/bin/thunderbird-beta + for i in 16x16 22x22 24x24 32x32 48x48 256x256; do + install -Dm644 thunderbird/chrome/icons/default/default${i/x*/}.png "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird-beta.png" + done + install -Dm644 $_mypkgn-bin.desktop $pkgdir/usr/share/applications/$_mypkgn-bin.desktop + ln -s /usr/share/hunspell $pkgdir/usr/lib/$_mypkgn/dictionaries + ln -s /usr/share/hyphen $pkgdir/usr/lib/$_mypkgn/hyphenation +} diff --git a/firefox-beta-bin-all-localizations/ff-downloader.pl b/thunderbird-beta-bin-all-localizations/ff-downloader.pl similarity index 62% copy from firefox-beta-bin-all-localizations/ff-downloader.pl copy to thunderbird-beta-bin-all-localizations/ff-downloader.pl index 67c2e0e02..fc9884aef 100755 --- a/firefox-beta-bin-all-localizations/ff-downloader.pl +++ b/thunderbird-beta-bin-all-localizations/ff-downloader.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# ff-downloader v0.4.1 +# ff-downloader v0.5 ## Copyright 2011 Simone Sclavi 'Ito' # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ use strict; use warnings; -use feature 'say'; +use feature qw(say switch); use Getopt::Long qw(:config no_ignore_case); use URI; use LWP; @@ -34,12 +34,7 @@ sub get_url my $resp = $browser->get($url, ':content_file' => $file); return $resp->is_success; } - -my $VER; -my $res = GetOptions("version|v=s" => \$VER); - -die ":: usage: $0 -v|--version=FIREFOX_BETA_VERSION\n" unless $res and (scalar @ARGV == 0) and $VER; -my @u_i18n = ( +my @ff_i18n = ( { language => 'Afrikaans (South Africa)', code => 'af' }, { language => 'Akan', code => 'ak' }, { language => 'Aarabic', code => 'ar' }, @@ -128,6 +123,78 @@ my @u_i18n = ( { language => 'Zulu', code => 'zu' }, ); +my @tb_i18n = ( +{ language => 'Aarabic', code => 'ar' }, +{ language => 'Asturian', code => 'ast' }, +{ language => 'Belarusian', code => 'be' }, +{ language => 'Bulgarian', code => 'bg' }, +{ language => 'Bengali (Bangladesh)', code => 'bn-BD' }, +{ language => 'Breton', code => 'br' }, +{ language => 'Catalan', code => 'ca' }, +{ language => 'Czech', code => 'cs' }, +{ language => 'Danish', code => 'da' }, +{ language => 'German', code => 'de' }, +{ language => 'Greek', code => 'el' }, +{ language => 'English (United Kingdom)', code => 'en-GB' }, +{ language => 'English (US)', code => 'en-US' }, +{ language => 'Spanish (Argentina)', code => 'es-AR' }, +{ language => 'Spanish (Spain)', code => 'es-ES' }, +{ language => 'Estonian', code => 'et' }, +{ language => 'Basque', code => 'eu' }, +{ language => 'Finnish', code => 'fi' }, +{ language => 'French', code => 'fr' }, +{ language => 'Frisian', code => 'fy-NL' }, +{ language => 'Irish', code => 'ga-IE' }, +{ language => 'Gaelic (Scotland)', code => 'gd' }, +{ language => 'Galician', code => 'gl' }, +{ language => 'Hebrew', code => 'he' }, +{ language => 'Hungarian', code => 'hu' }, +{ language => 'Indonesian', code => 'id' }, +{ language => 'Icelandic', code => 'is' }, +{ language => 'Italian', code => 'it' }, +{ language => 'Japanese', code => 'ja' }, +{ language => 'Korean', code => 'ko' }, +{ language => 'Lithuanian', code => 'lt' }, +{ language => 'Norwegian (Bokmal)', code => 'nb-NO' }, +{ language => 'Dutch', code => 'nl' }, +{ language => 'Norwegian (Nynorsk)', code => 'nn-NO' }, +{ language => 'Punjabi', code => 'pa-IN' }, +{ language => 'Polish', code => 'pl' }, +{ language => 'Portuguese (Brazil)', code => 'pt-BR' }, +{ language => 'Portuguese (Portugal)', code => 'pt-PT' }, +{ language => 'Romansh', code => 'rm' }, +{ language => 'Romanian', code => 'ro' }, +{ language => 'Russian', code => 'ru' }, +{ language => 'Sinhalese', code => 'si' }, +{ language => 'Slovak', code => 'sk' }, +{ language => 'Slovenian', code => 'sl' }, +{ language => 'Albanian', code => 'sq' }, +{ language => 'Serbian', code => 'sr' }, +{ language => 'Swedish', code => 'sv-SE' }, +{ language => 'Tamil (Sri Lanka)', code => 'ta-LK' }, +{ language => 'Turkish', code => 'tr' }, +{ language => 'Ukrainan', code => 'uk' }, +{ language => 'Vietnamese', code => 'vi' }, +{ language => 'Chinese (Simplified)', code => 'zh-CN' }, +{ language => 'Chinese (Traditional)', code => 'zh-TW' }, +); + +my ($VER, $PACKAGE, @u_i18n); +my $pkg = 'ff'; #default value for "--package" +my $res = GetOptions("version|v=s" => \$VER, + "package|p=s" => \$pkg ); + +die ":: usage: $0 -p|--package= -v|--version=\n" unless $res and (scalar @ARGV == 0); +given ($pkg) +{ + when ('ff') { $PACKAGE = 'firefox'; @u_i18n = @ff_i18n; } + when ('tb') { $PACKAGE = 'thunderbird'; @u_i18n = @tb_i18n } + default { die qq{:: "$pkg" is not a valid value for "--package"! Please use "ff" or "tb"\n}} + } +die qq{:: "--version" option is mandatory!\n} unless $VER; + + + my @i18n = sort { $a->{language} cmp $b->{language} } @u_i18n; my $size = scalar @i18n; @@ -153,23 +220,23 @@ chomp $ARCH; $| = 1; # turn on autoflush; -my $ff_path = "/pub/firefox/releases/${VER}/linux-${ARCH}/${i18n[$choice - 1]{code}}/firefox-${VER}.tar.bz2"; +my $ff_path = "/pub/${PACKAGE}/releases/${VER}/linux-${ARCH}/${i18n[$choice -1]{code}}/${PACKAGE}-${VER}.tar.bz2"; my $ff_url = URI->new('ftp://ftp.mozilla.org'); $ff_url->path($ff_path); ##Downloading firefox## -get_url( $ff_url, "firefox-${VER}.tar.bz2" ) or die qq(:: ERROR - can't download "firefox-${VER}.tar.bz2"\n); +get_url( $ff_url, "${PACKAGE}-${VER}.tar.bz2" ) or die qq(:: ERROR - can't download "${PACKAGE}-${VER}.tar.bz2"\n); ##downloading signature## $ff_url->path("${ff_path}.asc"); -get_url( $ff_url, "firefox-${VER}.tar.bz2.asc" ) or die qq(:: ERROR - can't download "firefox-${VER}.tar.bz2.asc"\n); +get_url( $ff_url, "$PACKAGE-${VER}.tar.bz2.asc" ) or die qq(:: ERROR - can't download "${PACKAGE}-${VER}.tar.bz2.asc"\n); ##downloading public key -$ff_url->path("pub/firefox/releases/${VER}/KEY"); +$ff_url->path("pub/${PACKAGE}/releases/${VER}/KEY"); get_url( $ff_url, "KEY" ) or die qq(:: ERROR - can't download 'KEY'\n); print ':: verifying gnupg signature ... '; my $gpg = new GnuPG(); $gpg->import_keys( keys => 'KEY'); -$gpg->verify ( signature => "firefox-${VER}.tar.bz2.asc", file => "firefox-${VER}.tar.bz2"); +$gpg->verify ( signature => "${PACKAGE}-${VER}.tar.bz2.asc", file => "${PACKAGE}-${VER}.tar.bz2"); say 'DONE'; diff --git a/thunderbird-beta-bin-all-localizations/thunderbird-beta-bin.desktop b/thunderbird-beta-bin-all-localizations/thunderbird-beta-bin.desktop new file mode 100644 index 000000000..d7e213765 --- /dev/null +++ b/thunderbird-beta-bin-all-localizations/thunderbird-beta-bin.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Thunderbird (Beta) +Comment=Mail & News Reader (Beta) +GenericName=Mail Client & News Reader (Beta) +Exec=thunderbird-beta %u +TryExec=thunderbird-beta +Icon=thunderbird-beta +Terminal=false +Type=Application +Categories=Network;Email; +MimeType=message/rfc822;x-scheme-handler/mailto; +StartupNotify=true \ No newline at end of file diff --git a/thunderbird-beta-bin-all-localizations/thunderbird.install b/thunderbird-beta-bin-all-localizations/thunderbird.install new file mode 100644 index 000000000..4d4a283db --- /dev/null +++ b/thunderbird-beta-bin-all-localizations/thunderbird.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/ttf-microsoft-arial/PKGBUILD b/ttf-microsoft-arial/PKGBUILD new file mode 100644 index 000000000..c6254a6a1 --- /dev/null +++ b/ttf-microsoft-arial/PKGBUILD @@ -0,0 +1,21 @@ +# Contributor: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) +# Maintainer: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) + +pkgname=ttf-microsoft-arial +pkgver=5.10 +pkgrel=1 +pkgdesc="A contemporary sans serif design, Arial contains more humanist characteristics than many of its predecessors and as such is more in tune with the mood of the last decades of the twentieth century." +arch=('any') +license=('unknown') +url="http://www.microsoft.com/typography/fonts/family.aspx?FID=8" +depends=('fontconfig') +install=ttf-microsoft-arial.install +source=('http://gthemes-china.googlecode.com/files/Arial.tar.gz') +md5sums=('b4df0863225f31c2d4d4c97b820279d1') + +build() { + install -Dm644 ${srcdir}/arial.ttf ${pkgdir}/usr/share/fonts/microsoft/arial.ttf + install -Dm644 ${srcdir}/arialbd.ttf ${pkgdir}/usr/share/fonts/microsoft/arialbd.ttf + install -Dm644 ${srcdir}/arialbi.ttf ${pkgdir}/usr/share/fonts/microsoft/arialbi.ttf + install -Dm644 ${srcdir}/ariali.ttf ${pkgdir}/usr/share/fonts/microsoft/ariali.ttf +} diff --git a/ttf-microsoft-arial/ttf-microsoft-arial.install b/ttf-microsoft-arial/ttf-microsoft-arial.install new file mode 100644 index 000000000..efa9beb32 --- /dev/null +++ b/ttf-microsoft-arial/ttf-microsoft-arial.install @@ -0,0 +1,12 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -f > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/ttf-microsoft-consolas/PKGBUILD b/ttf-microsoft-consolas/PKGBUILD new file mode 100644 index 000000000..9747ea4cf --- /dev/null +++ b/ttf-microsoft-consolas/PKGBUILD @@ -0,0 +1,21 @@ +# Contributor: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) +# Maintainer: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) + +pkgname=ttf-microsoft-consolas +pkgver=5.22 +pkgrel=1 +pkgdesc="Aimed for use in programming environments and other circumstances where a monospaced font is specified." +arch=('any') +license=('unknown') +url="http://www.microsoft.com/typography/fonts/family.aspx?FID=300" +depends=('fontconfig') +install=ttf-microsoft-consolas.install +source=('http://gthemes-china.googlecode.com/files/Consolas.tar.gz') +md5sums=('fb7b1efd6e2f159e9579f36252851ffe') + +build() { + install -Dm644 ${srcdir}/consola.ttf ${pkgdir}/usr/share/fonts/microsoft/consola.ttf + install -Dm644 ${srcdir}/consolab.ttf ${pkgdir}/usr/share/fonts/microsoft/consolab.ttf + install -Dm644 ${srcdir}/consolai.ttf ${pkgdir}/usr/share/fonts/microsoft/consolai.ttf + install -Dm644 ${srcdir}/consolaz.ttf ${pkgdir}/usr/share/fonts/microsoft/consolaz.ttf +} diff --git a/ttf-microsoft-consolas/ttf-microsoft-consolas.install b/ttf-microsoft-consolas/ttf-microsoft-consolas.install new file mode 100644 index 000000000..efa9beb32 --- /dev/null +++ b/ttf-microsoft-consolas/ttf-microsoft-consolas.install @@ -0,0 +1,12 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -f > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/ttf-microsoft-jhenghei/PKGBUILD b/ttf-microsoft-jhenghei/PKGBUILD new file mode 100644 index 000000000..c0b0eeced --- /dev/null +++ b/ttf-microsoft-jhenghei/PKGBUILD @@ -0,0 +1,19 @@ +# Contributor: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) +# Maintainer: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) + +pkgname=ttf-microsoft-jhenghei +pkgver=6.02 +pkgrel=1 +pkgdesc="Distributed with Windows Vista as default interface font. Designed by China Type Design Limited.Microsoft JhengHei include Regular and Bold style." +arch=('any') +license=('unknown') +url="http://www.microsoft.com/typography/fonts/family.aspx?FID=368" +depends=('fontconfig') +install=ttf-microsoft-jhenghei.install +source=('http://gthemes-china.googlecode.com/files/jhenghei.tar.gz') +md5sums=('85621b6b2a2762ee7e4bdb8ca8ee1c67') + +build() { + install -Dm644 ${srcdir}/msjh.ttf ${pkgdir}/usr/share/fonts/microsoft/msjh.ttf + install -Dm644 ${srcdir}/msjhbd.ttf ${pkgdir}/usr/share/fonts/microsoft/msjhbd.ttf +} diff --git a/ttf-microsoft-jhenghei/ttf-microsoft-jhenghei.install b/ttf-microsoft-jhenghei/ttf-microsoft-jhenghei.install new file mode 100644 index 000000000..efa9beb32 --- /dev/null +++ b/ttf-microsoft-jhenghei/ttf-microsoft-jhenghei.install @@ -0,0 +1,12 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -f > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/ttf-microsoft-lisu/PKGBUILD b/ttf-microsoft-lisu/PKGBUILD new file mode 100644 index 000000000..9885f036c --- /dev/null +++ b/ttf-microsoft-lisu/PKGBUILD @@ -0,0 +1,18 @@ +# Contributor: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) +# Maintainer: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) + +pkgname=ttf-microsoft-lisu +pkgver=3.01 +pkgrel=1 +pkgdesc="Microsoft LiSu fonts,Include Microsoft LiSu Regular style." +arch=('any') +license=('unknown') +url="http://www.microsoft.com" +depends=('fontconfig') +install=ttf-microsoft-lisu.install +source=('http://gthemes-china.googlecode.com/files/SIMLI.TTF.tar.gz') +md5sums=('6848cd03e199832edb8a294656150c4e') + +build() { + install -Dm644 ${srcdir}/SIMLI.TTF ${pkgdir}/usr/share/fonts/microsoft/SIMLI.TTF +} diff --git a/ttf-microsoft-lisu/ttf-microsoft-lisu.install b/ttf-microsoft-lisu/ttf-microsoft-lisu.install new file mode 100644 index 000000000..efa9beb32 --- /dev/null +++ b/ttf-microsoft-lisu/ttf-microsoft-lisu.install @@ -0,0 +1,12 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -f > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/ttf-microsoft-tahoma/PKGBUILD b/ttf-microsoft-tahoma/PKGBUILD new file mode 100644 index 000000000..596ff5252 --- /dev/null +++ b/ttf-microsoft-tahoma/PKGBUILD @@ -0,0 +1,19 @@ +# Contributor: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) +# Maintainer: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) + +pkgname=ttf-microsoft-tahoma +pkgver=5.10 +pkgrel=1 +pkgdesc="One of Microsoft's new sans serif typeface families. " +arch=('any') +license=('unknown') +url="http://www.microsoft.com/typography/fonts/family.aspx?FID=19" +depends=('fontconfig') +install=ttf-microsoft-tahoma.install +source=('http://gthemes-china.googlecode.com/files/tahoma.tar.gz') +md5sums=('0b9cd320b050d8a7b4641dd924546155') + +build() { + install -Dm644 ${srcdir}/tahoma.ttf ${pkgdir}/usr/share/fonts/microsoft/tahoma.ttf + install -Dm644 ${srcdir}/tahomabd.ttf ${pkgdir}/usr/share/fonts/microsoft/tahomabd.ttf +} diff --git a/ttf-microsoft-tahoma/ttf-microsoft-tahoma.install b/ttf-microsoft-tahoma/ttf-microsoft-tahoma.install new file mode 100644 index 000000000..efa9beb32 --- /dev/null +++ b/ttf-microsoft-tahoma/ttf-microsoft-tahoma.install @@ -0,0 +1,12 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -f > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/ttf-microsoft-wingding/PKGBUILD b/ttf-microsoft-wingding/PKGBUILD new file mode 100644 index 000000000..cbb9054f2 --- /dev/null +++ b/ttf-microsoft-wingding/PKGBUILD @@ -0,0 +1,20 @@ +# Contributor: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) +# Maintainer: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) + +pkgname=ttf-microsoft-wingding +pkgver=1.55 +pkgrel=1 +pkgdesc="Were designed by Kris Holmes and Charles Bigelow in 1990 and 1991. The fonts were originally named Lucida Icons, Arrows, and Stars to complement the Lucida text font family by the same designers." +arch=('any') +license=('unknown') +url="http://www.microsoft.com/typography/fonts/family.aspx?FID=16" +depends=('fontconfig') +install=ttf-microsoft-wingding.install +source=('http://gthemes-china.googlecode.com/files/wingding.tar.gz') +md5sums=('f325fc88c47d6f6f608a30cde490a877') + +build() { + install -Dm644 ${srcdir}/wingding.ttf ${pkgdir}/usr/share/fonts/microsoft/wingding.ttf + install -Dm644 ${srcdir}/WINGDNG2.TTF ${pkgdir}/usr/share/fonts/microsoft/WINGDNG2.TTF + install -Dm644 ${srcdir}/WINGDNG3.TTF ${pkgdir}/usr/share/fonts/microsoft/WINGDNG3.TTF +} diff --git a/ttf-microsoft-wingding/ttf-microsoft-wingding.install b/ttf-microsoft-wingding/ttf-microsoft-wingding.install new file mode 100644 index 000000000..efa9beb32 --- /dev/null +++ b/ttf-microsoft-wingding/ttf-microsoft-wingding.install @@ -0,0 +1,12 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -f > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/ttf-microsoft-yahei/PKGBUILD b/ttf-microsoft-yahei/PKGBUILD new file mode 100644 index 000000000..307eb9348 --- /dev/null +++ b/ttf-microsoft-yahei/PKGBUILD @@ -0,0 +1,19 @@ +# Contributor: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) +# Maintainer: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) + +pkgname=ttf-microsoft-yahei +pkgver=6.02 +pkgrel=2 +pkgdesc="Microsoft Yahei fonts,Include Microsoft YaHei Regular and Bold style." +arch=('any') +license=('unknown') +url="http://www.microsoft.com" +depends=('fontconfig') +install=ttf-microsoft-yahei.install +source=('http://gthemes-china.googlecode.com/files/Microsoft_YaHei.tar.gz') +md5sums=('035df6b53afdb1b1813a2aba96da6b75') + +build() { + install -Dm644 ${srcdir}/msyh.ttf ${pkgdir}/usr/share/fonts/microsoft/msyh.ttf + install -Dm644 ${srcdir}/msyhbd.ttf ${pkgdir}/usr/share/fonts/microsoft/msyhbd.ttf +} diff --git a/ttf-microsoft-yahei/ttf-microsoft-yahei.install b/ttf-microsoft-yahei/ttf-microsoft-yahei.install new file mode 100644 index 000000000..efa9beb32 --- /dev/null +++ b/ttf-microsoft-yahei/ttf-microsoft-yahei.install @@ -0,0 +1,12 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -f > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/ttf-microsoft-youyuan/PKGBUILD b/ttf-microsoft-youyuan/PKGBUILD new file mode 100644 index 000000000..04a0b0004 --- /dev/null +++ b/ttf-microsoft-youyuan/PKGBUILD @@ -0,0 +1,18 @@ +# Contributor: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) +# Maintainer: dongfengweixiao ( dongfengweixiao [at] gmail [dot] com ) + +pkgname=ttf-microsoft-youyuan +pkgver=3.01 +pkgrel=1 +pkgdesc="Include YouYuan Regular style." +arch=('any') +license=('unknown') +url="http://www.microsoft.com" +depends=('fontconfig') +install=ttf-microsoft-youyuan.install +source=('http://gthemes-china.googlecode.com/files/SIMYOU.tar.gz') +md5sums=('e0e82d9f1b03611fb163188b2c36192b') + +build() { + install -Dm644 ${srcdir}/SIMYOU.TTF ${pkgdir}/usr/share/fonts/microsoft/SIMYOU.TTF +} diff --git a/ttf-microsoft-youyuan/ttf-microsoft-youyuan.install b/ttf-microsoft-youyuan/ttf-microsoft-youyuan.install new file mode 100644 index 000000000..efa9beb32 --- /dev/null +++ b/ttf-microsoft-youyuan/ttf-microsoft-youyuan.install @@ -0,0 +1,12 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -f > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/upp-svn/PKGBUILD b/upp-svn/PKGBUILD index 6c7ac0894..c7151a53a 100644 --- a/upp-svn/PKGBUILD +++ b/upp-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Dolinar pkgname=upp-svn -pkgver=4370 +pkgver=4377 pkgrel=1 pkgdesc="Radical and innovative multiplatform C++ framework (known as U++)" arch=('any') diff --git a/user-mode-linux/PKGBUILD b/user-mode-linux/PKGBUILD index cb7a75ae7..a885b5117 100644 --- a/user-mode-linux/PKGBUILD +++ b/user-mode-linux/PKGBUILD @@ -1,13 +1,13 @@ pkgname=user-mode-linux _kernelname=-uml -pkgver=3.1.6 +pkgver=3.1.8 pkgrel=1 pkgdesc="Run multiple virtual Linux systems as applications within a normal Linux system" arch=('i686' 'x86_64') license=('GPL2') source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$pkgver.tar.bz2" 'config') -md5sums=('7b211c1896809658584457ece4542f7e' +md5sums=('69dfba755ab8691a426d8061c94a7ddc' '4da6efc2a429268018cf4bbf84aec11d') depends=('glibc' 'uml_utilities') makedepends=('libpcap') diff --git a/varicad-view/PKGBUILD b/varicad-view/PKGBUILD index b2bc7c429..a45f2bcb7 100644 --- a/varicad-view/PKGBUILD +++ b/varicad-view/PKGBUILD @@ -1,12 +1,13 @@ # Contributor: Piotr Rogoża pkgname=varicad-view _pkgname=varicad2012-view -pkgver=2012.1.03 -_pkgver=1.03 +pkgver=2012.1.04 +_pkgver=${pkgver#*.} pkgrel=1 pkgdesc='Viewer VariCAD files. It can also open STEP (3D), DWG (2D), DXF (2D) and IGES (2D) files.' arch=('i686' 'x86_64') url='http://www.varicad.com' +#http://www.varicad.com/userdata/files/release/en license=('custom: "free, requirement login or register"') depends=('hicolor-icon-theme' 'mesa' 'gtk2' 'desktop-file-utils') install=$pkgname.install @@ -16,13 +17,12 @@ case $CARCH in i686) source=("http://www.varicad.com/userdata/files/release/en/${_pkgname}-en_${_pkgver}_i386.deb") _pkgname1=${_pkgname}-en_${_pkgver}_i386.deb - md5sums=('eba63f9f7044e493df8e6e9269bec114') + md5sums=('b1f398d68b4d5c087c45ac04870c34cd') ;; x86_64) source=("http://www.varicad.com/userdata/files/release/en/${_pkgname}-en_${_pkgver}_amd64.deb") - _pkgname1=${_pkgname}-en_${_pkgver}_amd64.deb - md5sums=('d30172322b105d177f81d6899b7c3e66') + md5sums=('dfb52da1ca7b8f0259d8e4c8872194ee') ;; esac noextract=(${_pkgname1}) diff --git a/virt-manager-light/PKGBUILD b/virt-manager-light/PKGBUILD index 19b29c459..bb0f302dd 100644 --- a/virt-manager-light/PKGBUILD +++ b/virt-manager-light/PKGBUILD @@ -3,26 +3,32 @@ # Contributor: Jonathan Wiersma pkgname=virt-manager-light -pkgver=0.8.5 -pkgrel=2 +pkgver=0.9.0 +pkgrel=1 pkgdesc="A desktop user interface for managing virtual machines." arch=('any') url="http://virt-manager.et.redhat.com" license=('GPL') depends=('dbus-python' 'libvirt' 'libxml2' 'vte' 'virtinst' 'gtk-vnc' 'rarian' 'gconf' - 'yajl' 'librsvg' 'python2' 'pygtk' 'python2-gconf') + 'yajl' 'librsvg' 'python2' 'python2-gconf') makedepends=('intltool>=0.35.0') -optdepends=('x11-ssh-askpass: for ssh authentication to remote servers') +optdepends=('x11-ssh-askpass: for ssh authentication to remote servers' + 'libuser: for virt-manager-tui' + 'python2-ipy: for virt-manager-tui' + 'newt-syrup: for virt-manager-tui' + 'openbsd-netcat: for remote server access') +conflicts=('virt-manager') +provides=('virt-manager') install=virt-manager.install -source=("http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-$pkgver.tar.gz" +source=("http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-${pkgver}.tar.gz" "openbsd-netcat-default.patch") -md5sums=('038668be9e5edcb86ebae2495240b6ff' - 'd4aad201758c2275e4237f5239d7ffb2') +md5sums=('a10331b467f92f4134a39bf636e04adc' + 'd4aad201758c2275e4237f5239d7ffb2') build() { cd $srcdir/virt-manager-$pkgver export LDFLAGS=-lX11 - sed -i 's#python#python2#' src/virt-manager.in + sed -i 's#python#python2#' src/virt-manager.in src/virt-manager-tui.in patch -p1 <$srcdir/openbsd-netcat-default.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -37,7 +43,7 @@ package() { # Set-up schema file in correct location install -m755 -d $pkgdir/usr/share/gconf/schemas gconf-merge-schema \ - $pkgdir/usr/share/gconf/schemas/virt-manager.schemas \ + $pkgdir/usr/share/gconf/schemas/${pkgname}.schemas \ $pkgdir/etc/gconf/schemas/*.schemas rm -rf $pkgdir/etc/gconf/schemas rmdir --ignore-fail-on-non-empty $pkgdir/etc/gconf $pkgdir/etc diff --git a/virt-manager-light/virt-manager.install b/virt-manager-light/virt-manager.install index 74772f306..87f33c166 100644 --- a/virt-manager-light/virt-manager.install +++ b/virt-manager-light/virt-manager.install @@ -3,9 +3,8 @@ pkgname=virt-manager post_install() { rm -f /usr/share/virt-manager/virtManager/*.pyc usr/sbin/gconfpkg --install $pkgname - update-desktop-database -q + [ -x usr/bin/update-desktop-database ] && update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - /bin/true } @@ -20,18 +19,11 @@ post_upgrade() { pre_remove() { rm -f /usr/share/virt-manager/virtManager/*.pyc usr/sbin/gconfpkg --uninstall $pkgname - /bin/true } post_remove() { - update-desktop-database -q || return 1 + [ -x usr/bin/update-desktop-database ] && update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - /bin/true } - -op=$1 -shift -$op $* - -- 2.11.4.GIT