diff options
Diffstat (limited to 'community')
41 files changed, 698 insertions, 379 deletions
diff --git a/community/arptables/PKGBUILD b/community/arptables/PKGBUILD index ac6942bcb..40eba2685 100644 --- a/community/arptables/PKGBUILD +++ b/community/arptables/PKGBUILD @@ -1,18 +1,27 @@ -# $Id: PKGBUILD 64145 2012-02-09 09:48:15Z seblu $ +# $Id: PKGBUILD 71317 2012-05-26 14:59:39Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=arptables pkgver=0.0.3_4 -pkgrel=2 +pkgrel=3 pkgdesc='ARP filtering utility' arch=('i686' 'x86_64') url='http://ebtables.sourceforge.net/' license=('GPL') -source=("http://downloads.sourceforge.net/ebtables/$pkgname-v${pkgver//_/-}.tar.gz" 'arptables.rc') +backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") +install=$pkgname.install +source=("http://downloads.sourceforge.net/ebtables/$pkgname-v${pkgver//_/-}.tar.gz" + "$pkgname.conf" + "$pkgname.rc" + "$pkgname.systemd" + "$pkgname.service") md5sums=('1d4ab05761f063b0751645d8f2b8f8e5' - 'f8c0ecad9151a16347c133e043232d4a') + '00bfb5bd8a83a5b466c650ee5d8f86f3' + '60e0319b55b1ef9e13d9ac03dd98c8d4' + '65a9ed0b866f727184a87e4d480975bd' + 'b26771191e52905d8aea6333c26cb1c3') build() { cd $pkgname-v${pkgver//_/-} @@ -20,8 +29,7 @@ build() { } package() { - # setup arptables - cd $pkgname-v${pkgver//_/-} + pushd $pkgname-v${pkgver//_/-} make install \ DESTDIR="$pkgdir" \ PREFIX=/usr \ @@ -29,10 +37,18 @@ package() { BINDIR=/usr/sbin \ MANDIR=/usr/share/man \ INITDIR=/etc/rc.d \ - SYSCONFIGDIR=/etc/arptables - - # install rc script - install -D -m 0755 ../arptables.rc "$pkgdir/etc/rc.d/arptables" + SYSCONFIGDIR=/etc + popd + # install initscripts + install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + # install systemd service + install -Dm 755 $pkgname.systemd \ + "$pkgdir/usr/lib/systemd/scripts/$pkgname" + install -Dm 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" + # default config file + install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.conf b/community/arptables/arptables.conf new file mode 100644 index 000000000..8b5456788 --- /dev/null +++ b/community/arptables/arptables.conf @@ -0,0 +1,7 @@ +# Configuration file used to load/save configuration. +CONFIG_FILE='/etc/arptables.conf' + +# Save configuration on stop/restart. +#SAVE_ON_STOP=yes + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.install b/community/arptables/arptables.install new file mode 100644 index 000000000..5f03b6e24 --- /dev/null +++ b/community/arptables/arptables.install @@ -0,0 +1,10 @@ +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + [ $(vercmp "$2" '0.0.3_4-2') -gt 0 ] || cat <<EOF +Config file have been moved from /etc/arptables/arptables to /etc/arptables.conf. +You can revert to the previous location by editing /etc/conf.d/arptables. +EOF +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.rc b/community/arptables/arptables.rc index dae90ac2a..a188c65c1 100644 --- a/community/arptables/arptables.rc +++ b/community/arptables/arptables.rc @@ -2,57 +2,33 @@ . /etc/rc.conf . /etc/rc.d/functions - -[[ -x /usr/sbin/arptables ]] || exit 1 -[[ -x /usr/sbin/arptables-save ]] || exit 1 -[[ -x /usr/sbin/arptables-restore ]] || exit 1 - -do_start() { - stat_busy "Restore arptables rules" - if [[ -r /etc/arptables/arptables ]]; then - /usr/sbin/arptables-restore </etc/arptables/arptables - (( $? == 0 )) && stat_done && add_daemon arptables && return - fi - stat_fail -} - -do_stop() { - stat_busy "Flushing arptables rules" - /usr/sbin/arptables-restore </dev/null - if (( $? == 0 )); then - stat_done - rm_daemon arptables - else - stat_fail - fi -} - -do_save() { - stat_busy "Saving arptables rules" - /usr/sbin/arptables-save >/etc/arptables/arptables - (( $? == 0 )) && stat_done || stat_fail -} +. /etc/conf.d/${0##*/} case "$1" in start) - do_start - ;; + stat_busy 'Loading arptables rules' + arptables-restore < "$CONFIG_FILE" && + add_daemon ${0##*/} && stat_done || stat_die + ;; stop) - do_stop - ;; + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + stat_busy 'Clearing arptables rules' + arptables-restore < /dev/null && + rm_daemon ${0##*/} && stat_done || stat_die + ;; restart) - do_stop - do_start - ;; + $0 start + $0 stop + ;; save) - do_save - ;; - status) - /usr/sbin/arptables-save - ;; + stat_busy 'Saving arptables rules' + arptables-save > "$CONFIG_FILE" && + stat_done || stat_die + ;; *) - echo "Usage $0 {start|stop|restart|save|status}" >&2 + echo "usage: ${0##*/} {start|stop|restart|save}" >&2 exit 1 + ;; esac # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.service b/community/arptables/arptables.service new file mode 100644 index 000000000..4fc11f17d --- /dev/null +++ b/community/arptables/arptables.service @@ -0,0 +1,11 @@ +[Unit] +Description=ARP Tables + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/arptables start +ExecStop=/usr/lib/systemd/scripts/arptables stop + +[Install] +WantedBy=multi-user.target diff --git a/community/arptables/arptables.systemd b/community/arptables/arptables.systemd new file mode 100644 index 000000000..bc5acdbcf --- /dev/null +++ b/community/arptables/arptables.systemd @@ -0,0 +1,22 @@ +#!/bin/bash + +. /etc/conf.d/arptables + +case $1 in + start) + arptables-restore < "$CONFIG_FILE" + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + arptables-restore < /dev/null + ;; + save) + arptables-save > "$CONFIG_FILE" + ;; + *) + echo "usage: ${0##*/} {start|stop|save}" >&2 + exit 1 + ;; +esac + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index 93507ca60..b1479a41f 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65084 2012-02-20 03:33:55Z spupykin $ +# $Id: PKGBUILD 71264 2012-05-26 07:35:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -6,9 +6,9 @@ # Development: http://closure.ath.cx/aur-dev pkgname=cgit -pkgver=0.9.0.2 +pkgver=0.9.0.3 _gitver=1.7.4 -pkgrel=4 +pkgrel=1 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64') url="http://hjemli.net/git/cgit" @@ -20,7 +20,7 @@ install=cgit.install source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2" "http://arch.p5n.pp.ru/~sergej/dl/2011/git-${_gitver}.tar.bz2" "apache.example.conf") -md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2' +md5sums=('3d5481bf8a507694108f0996b8bde235' 'fa24dc1ef0b663327ea0fe1981365b39' 'bd5696bea0654bfcf98f249b1a36737d') diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD index f3400453c..ffc3b451b 100644 --- a/community/ebtables/PKGBUILD +++ b/community/ebtables/PKGBUILD @@ -1,48 +1,56 @@ -# $Id: PKGBUILD 60674 2011-12-16 19:18:54Z seblu $ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 71322 2012-05-26 15:04:32Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=ebtables pkgver=2.0.10_4 -pkgrel=1 +pkgrel=2 pkgdesc='Ethernet bridge filtering utilities' arch=('i686' 'x86_64') -backup=('etc/conf.d/ebtables') url='http://ebtables.sourceforge.net/' license=('GPL2') +backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") # ebtables segfault with --as-needed options=('!buildflags') -source=( - "http://downloads.sourceforge.net/${pkgname}/${pkgname}-v${pkgver/_/-}.tar.gz" - 'ebtables.rc' - 'ebtables.conf' - ) +install=$pkgname.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-v${pkgver/_/-}.tar.gz" + "$pkgname.conf" + "$pkgname.rc" + "$pkgname.systemd" + "$pkgname.service") md5sums=('506742a3d44b9925955425a659c1a8d0' - '368825c83a2b1180d2223e61b9f3bd07' - '86fc3622e6fc0a7a7920c90ff576cc38') + 'c6f0838de4429af68d21b4d61f00db59' + 'd0e340f2cefe91b1569c0e87c2a1288f' + '5a49ea09af202cb438c8a1b15abf9147' + 'baf923443c3b16277e50d60d2e68f534') build() { - cd ${pkgname}-v${pkgver/_/-} + cd $pkgname-v${pkgver/_/-} make CFLAGS='-Wunused -Wall -Werror -Wno-error=unused-but-set-variable' } package() { - cd "${pkgname}-v${pkgver/_/-}" + pushd $pkgname-v${pkgver/_/-} make install \ - DESTDIR="${pkgdir}" \ + DESTDIR="$pkgdir" \ LIBDIR=/usr/lib \ MANDIR=/usr/share/man \ BINDIR=/usr/sbin \ INITDIR=/etc/rc.d \ - SYSCONFIGDIR=/etc/ebtables - + SYSCONFIGDIR=/etc + popd # rm package ebtables rc.d scripts - rm "${pkgdir}/etc/rc.d/ebtables" - rm "${pkgdir}/etc/ebtables/ebtables-config" - - # install custom ebtables rc.d scripts - install -D -m 0755 "${srcdir}/$pkgname.rc" "${pkgdir}/etc/rc.d/$pkgname" - install -D -m 0644 "${srcdir}/$pkgname.conf" "${pkgdir}/etc/conf.d/$pkgname" + rm "$pkgdir/etc/ebtables-config" + # install initscripts + install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + # install systemd service + install -Dm 755 $pkgname.systemd \ + "$pkgdir/usr/lib/systemd/scripts/$pkgname" + install -Dm 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" + # default config file + install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.conf b/community/ebtables/ebtables.conf index 0005444e7..386f94249 100644 --- a/community/ebtables/ebtables.conf +++ b/community/ebtables/ebtables.conf @@ -1,37 +1,7 @@ -# Save (and possibly restore) in text format. -# Value: yes|no, default: yes -# Save the firewall rules in text format to /etc/conf.d/ebtables -# If EBTABLES_BINARY_FORMAT="no" then restoring the firewall rules -# is done using this text format. -EBTABLES_TEXT_FORMAT="yes" +# Configuration file used to load/save configuration. +CONFIG_FILE='/etc/ebtables.conf' -# Save (and restore) in binary format. -# Value: yes|no, default: yes -# Save (and restore) the firewall rules in binary format to (and from) -# /etc/ebtables/ebtables.<chain>. Enabling this option will make -# firewall initialisation a lot faster. -EBTABLES_BINARY_FORMAT="yes" +# Save configuration on stop/restart. +#SAVE_ON_STOP=yes -# Unload modules on restart and stop -# Value: yes|no, default: yes -# This option has to be 'yes' to get to a sane state for a firewall -# restart or stop. Only set to 'no' if there are problems unloading netfilter -# modules. -EBTABLES_MODULES_UNLOAD="yes" - -# Save current firewall rules on stop. -# Value: yes|no, default: no -# Saves all firewall rules if firewall gets stopped -# (e.g. on system shutdown). -EBTABLES_SAVE_ON_STOP="no" - -# Save current firewall rules on restart. -# Value: yes|no, default: no -# Saves all firewall rules if firewall gets restarted. -EBTABLES_SAVE_ON_RESTART="no" - -# Save (and restore) rule counters. -# Value: yes|no, default: no -# Save rule counters when saving a kernel table to a file. If the -# rule counters were saved, they will be restored when restoring the table. -EBTABLES_SAVE_COUNTER="no" +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.install b/community/ebtables/ebtables.install new file mode 100644 index 000000000..7dd6921ed --- /dev/null +++ b/community/ebtables/ebtables.install @@ -0,0 +1,9 @@ +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + [ $(vercmp "$2" '2.0.10_4-1') -gt 0 ] || cat <<EOF +Config file have been moved to /etc/ebtables.conf and only support text format. +EOF +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.rc b/community/ebtables/ebtables.rc index 3a889b914..a845449fe 100644 --- a/community/ebtables/ebtables.rc +++ b/community/ebtables/ebtables.rc @@ -1,128 +1,31 @@ #!/bin/bash -# Credits to: -# Sebastien Luttringer <seblu+arch@seblu.net> -# Bart De Schuymer <bdschuym@pandora.be> -# Rok Papez <rok.papez@arnes.si> -# Dag Wieers <dag@wieers.com> - . /etc/rc.conf . /etc/rc.d/functions - -#default configuration: -EBTABLES_TEXT_FORMAT="yes" -EBTABLES_BINARY_FORMAT="yes" -EBTABLES_MODULES_UNLOAD="yes" -EBTABLES_SAVE_ON_STOP="no" -EBTABLES_SAVE_ON_RESTART="no" -EBTABLES_SAVE_COUNTER="no" - -[[ -r "/etc/conf.d/ebtables" ]] && . "/etc/conf.d/ebtables" - -RETVAL=0 - -start() { - stat_busy "Starting ebtables" - ! ck_daemon ebtables && stat_done && RETVAL=0 && return - if [[ "$EBTABLES_BINARY_FORMAT" = yes ]]; then - for table in $(ls /etc/ebtables/ebtables.* 2>/dev/null | sed -e 's/.*ebtables\.//' -e '/save/d' ); do - /usr/sbin/ebtables -t ${table} --atomic-file /etc/ebtables/ebtables.${table} --atomic-commit || RETVAL=1 - done - elif [[ "$EBTABLES_TEXT_FORMAT" = "yes" ]]; then - [[ ! -r /etc/ebtables/ebtables ]] && :>/etc/ebtables/ebtables - /usr/sbin/ebtables-restore </etc/ebtables/ebtables || RETVAL=1 - else - RETVAL=1 - fi - - if (( RETVAL == 0 )); then - stat_done - add_daemon ebtables - else - stat_fail - fi -} - -stop() { - stat_busy "Stopping ebtables" - ck_daemon ebtables && stat_done && RETVAL=0 && return - for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do - /usr/sbin/ebtables -t $table --init-table || RETVAL=1 - done - - if [[ "$EBTABLES_MODULES_UNLOAD" = yes ]]; then - for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -f1 -d' ') ebtables; do - /sbin/rmmod $mod 2> /dev/null - done - fi - - if (( RETVAL == 0 )); then - rm_daemon ebtables - stat_done - else - stat_fail - fi -} - -restart() { - stop - sleep 1 - start -} - -save() { - stat_busy "Saving ebtables" - if [[ "$EBTABLES_TEXT_FORMAT" = yes ]]; then - if [[ -r /etc/ebtables/ebtables ]]; then - mv -f /etc/ebtables/ebtables /etc/ebtables/ebtables.save - fi - /usr/sbin/ebtables-save >/etc/ebtables/ebtables || RETVAL=1 - fi - if [[ "$EBTABLES_BINARY_FORMAT" = yes ]]; then - rm -f /etc/ebtables/ebtables.*.save - for oldtable in $(ls /etc/ebtables/ebtables.* 2>/dev/null | grep -vF 'ebtables.save'); do - mv -f $oldtable $oldtable.save - done - for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do - :> /etc/ebtables/ebtables.$table - /usr/sbin/ebtables -t $table --atomic-file /etc/ebtables/ebtables.$table --atomic-save || RETVAL=1 - if [[ "$EBTABLES_SAVE_COUNTER" = no ]]; then - /usr/sbin/ebtables -t $table --atomic-file /etc/ebtables/ebtables.$table -Z || RETVAL=1 - fi - done - fi - - (( RETVAL == 0 )) && stat_done || stat_fail -} +. /etc/conf.d/${0##*/} case "$1" in start) - start - ;; + stat_busy 'Loading ebtables rules' + ebtables-restore < "$CONFIG_FILE" && + add_daemon ${0##*/} && stat_done || stat_die + ;; stop) - [[ "$EBTABLES_SAVE_ON_STOP" = yes ]] && save - stop - ;; - restart|reload) - [[ "$EBTABLES_SAVE_ON_RESTART" = yes ]] && save - restart - ;; - condrestart) - ! ck_daemon ebtables && restart - RETVAL=$? - ;; + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + status 'Clearing ebtables rules' ebtables -F && rm_daemon ${0##*/} || exit 1 + ;; + restart) + $0 stop + $0 start + ;; save) - save - ;; - status) - /usr/sbin/ebtables-save - RETVAL=$? - ;; + stat_busy 'Saving ebtables rules' + ebtables-save > "$CONFIG_FILE" && stat_done || stat_die + ;; *) - echo "Usage $0 {start|stop|restart|condrestart|save|status}" - RETVAL=1 + echo "usage: ${0##*/} {start|stop|restart|save}" >&2 + exit 1 + ;; esac -exit $RETVAL - -# vim:set ts=2 sw=2 ft=sh noet: +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.service b/community/ebtables/ebtables.service new file mode 100644 index 000000000..25e6b76cc --- /dev/null +++ b/community/ebtables/ebtables.service @@ -0,0 +1,11 @@ +[Unit] +Description=Ethernet bridge table + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/ebtables start +ExecStop=/usr/lib/systemd/scripts/ebtables stop + +[Install] +WantedBy=multi-user.target diff --git a/community/ebtables/ebtables.systemd b/community/ebtables/ebtables.systemd new file mode 100644 index 000000000..4c51e9b6f --- /dev/null +++ b/community/ebtables/ebtables.systemd @@ -0,0 +1,22 @@ +#!/bin/bash + +. /etc/conf.d/ebtables + +case $1 in + start) + ebtables-restore < "$CONFIG_FILE" + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + ebtables -F + ;; + save) + ebtables-save > "$CONFIG_FILE" + ;; + *) + echo "usage: ${0##*/} {start|stop|save}" >&2 + exit 1 + ;; +esac + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index 53693e857..7591abe02 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70013 2012-04-28 09:24:06Z allan $ +# $Id: PKGBUILD 71272 2012-05-26 07:54:42Z pschmitz $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -19,8 +19,8 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') -pkgver=2.23.1 -pkgrel=10 +pkgver=2.24.0 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" @@ -34,13 +34,11 @@ groups=('gambas2') replaces=('gambas2') conflicts=('gambas2') source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 - 'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch' - 'poppler-0.18.patch' - 'gambas2-script.install' 'gambas2-runtime.install') -md5sums=('ff8d2c1f310222c150b114e7ce247dfd' + 'fix-gbi-gba-path.patch' + 'gambas2-script.install' 'gambas2-runtime.install' + 'poppler-0.20.patch') +md5sums=('b59072b6f57b681d586cc84c02333690' '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - 'ac9703b390502ed3242c8d34485c9236' - 'a551b4b216bbdb3489f3c264bf73ee66' '870ff5b4b33cd75aa9c290539e6fdd5d' 'ab5667175c4945282d2f40a35d0e9e5b') _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" @@ -66,12 +64,14 @@ _buildgbcomp() { build() { cd "${srcdir}/$pkgbase-$pkgver" - ## workaround to allow package splitting msg "Applying patches ..." - patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch" - # merged upstream - patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch" - patch -Np2 -i "${srcdir}/poppler-0.18.patch" + # workaround to allow package splitting + patch -Np1 -i ../fix-gbi-gba-path.patch + # fix building with poppler-0.20.x (merged upstream) + cd gb.pdf + patch -Np0 -i ../../poppler-0.20.patch + cd .. + ./reconf-all ## @@ -947,3 +947,8 @@ package_gambas2-gb-xml-xslt() { rm -rf ${pkgdir}/usr/bin ## } +md5sums=('b59072b6f57b681d586cc84c02333690' + '9dda03a1bbfb7e7ba8b6a4ae91b6752b' + '870ff5b4b33cd75aa9c290539e6fdd5d' + 'ab5667175c4945282d2f40a35d0e9e5b' + '5eb70afe712c0f8667a700df4d9a6735') diff --git a/community/gambas2/poppler-0.20.patch b/community/gambas2/poppler-0.20.patch new file mode 100644 index 000000000..a73d42a7f --- /dev/null +++ b/community/gambas2/poppler-0.20.patch @@ -0,0 +1,100 @@ +Index: src/CPdfDocument.cpp +=================================================================== +--- src/CPdfDocument.cpp (révision 4732) ++++ src/CPdfDocument.cpp (copie de travail) +@@ -407,7 +407,11 @@ + white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; + THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); + ++ #if POPPLER_VERSION_0_20 ++ THIS->dev->startDoc(THIS->doc); ++ #else + THIS->dev->startDoc(THIS->doc->getXRef ()); ++ #endif + + outline=THIS->doc->getOutline(); + if (outline) THIS->index=outline->getItems(); +@@ -833,13 +837,22 @@ + + if ( (w<0) || (h<0) ) return NULL; + ++ #if POPPLER_VERSION_0_20 + THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, + rotation, + gFalse, + gTrue, + x,y,w,h, ++ gFalse); ++ #else ++ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, ++ rotation, + gFalse, ++ gTrue, ++ x,y,w,h, ++ gFalse, + THIS->doc->getCatalog ()); ++ #endif + + map=THIS->dev->getBitmap(); + +@@ -929,9 +942,14 @@ + w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); + h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); + ++ #if POPPLER_VERSION_0_20 ++ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); ++ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); ++ #else + dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); + gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \ + gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); ++ #endif + + THIS->page->display(gfx); + dev->endPage(); +@@ -960,7 +978,9 @@ + + void aux_fill_links(void *_object) + { +- #if POPPLER_VERSION_0_17 ++ #if POPPLER_VERSION_0_20 ++ THIS->links = new Links (THIS->page->getAnnots ()); ++ #elif POPPLER_VERSION_0_17 + THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); + #else + Object obj; +@@ -1200,12 +1220,21 @@ + + if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); + ++ #if POPPLER_VERSION_0_20 ++ textdev = new TextOutputDev (NULL, true, 0, false, false); ++ THIS->page->display (textdev, 72, 72, 0, false, false, false); ++ #else + textdev = new TextOutputDev (NULL, true, false, false); + THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); ++ #endif + + if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } + ++ #if POPPLER_VERSION_0_20 ++ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) ++ #else + while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) ++ #endif + { + if (!THIS->Found) { + GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1); +Index: configure.ac +=================================================================== +--- configure.ac (révision 4732) ++++ configure.ac (copie de travail) +@@ -25,6 +25,8 @@ + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) + pkg-config --atleast-version=0.17.0 poppler + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) ++ pkg-config --atleast-version=0.20.0 poppler ++ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) + fi + + AC_OUTPUT( \ diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index be9037be9..cf13c1a9b 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70015 2012-04-28 09:24:08Z allan $ +# $Id: PKGBUILD 71274 2012-05-26 07:54:52Z pschmitz $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -27,14 +27,21 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils 'gsl') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install') + 'gambas3-script.install' 'gambas3-runtime.install' + 'poppler-0-20.patch') md5sums=('bdf387f435d7aeedb7efa488ea1a5d62' 'b284be39d147ec799f1116a6abc068b4' - 'b5cc403990f31b8ea1c5cf37366d3d29') + 'b5cc403990f31b8ea1c5cf37366d3d29' + '39d2ae1e2096a29df7857fce083eafaf') build() { cd ${srcdir}/${pkgbase}-${pkgver} + # fix building with poppler-0.20.x (merged upstream) + cd gb.pdf + patch -Np1 -i ../../poppler-0-20.patch + cd .. + ./reconf-all ./configure --prefix=/usr -C diff --git a/community/gambas3/poppler-0-20.patch b/community/gambas3/poppler-0-20.patch new file mode 100644 index 000000000..3b0e4612a --- /dev/null +++ b/community/gambas3/poppler-0-20.patch @@ -0,0 +1,106 @@ +diff -ur gb.pdf/configure.ac gb.pdf.fixed/configure.ac +--- gb.pdf/configure.ac 2012-05-14 08:55:02.448921378 +0200 ++++ gb.pdf.fixed/configure.ac 2012-05-14 08:52:19.098596499 +0200 +@@ -24,6 +24,8 @@ + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) + pkg-config --atleast-version=0.17.0 poppler + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) ++ pkg-config --atleast-version=0.20.0 poppler ++ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) + fi + + AC_OUTPUT( \ +diff -ur gb.pdf/src/CPdfDocument.cpp gb.pdf.fixed/src/CPdfDocument.cpp +--- gb.pdf/src/CPdfDocument.cpp 2012-05-14 08:55:02.388922483 +0200 ++++ gb.pdf.fixed/src/CPdfDocument.cpp 2012-05-15 09:25:45.168457227 +0200 +@@ -449,9 +449,13 @@ + + white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; + THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); +- +- THIS->dev->startDoc(THIS->doc->getXRef ()); + ++ #if POPPLER_VERSION_0_20 ++ THIS->dev->startDoc(THIS->doc); ++ #else ++ THIS->dev->startDoc(THIS->doc->getXRef ()); ++ #endif ++ + outline=THIS->doc->getOutline(); + if (outline) THIS->index=outline->getItems(); + +@@ -875,6 +879,14 @@ + + if ( (w<0) || (h<0) ) return NULL; + ++ #if POPPLER_VERSION_0_20 ++ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, ++ rotation, ++ gFalse, ++ gTrue, ++ x,y,w,h, ++ gFalse); ++ #else + THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, + rotation, + gFalse, +@@ -882,7 +894,8 @@ + x,y,w,h, + gFalse, + THIS->doc->getCatalog ()); +- ++ #endif ++ + map=THIS->dev->getBitmap(); + + data=(uint32_t*)map->getDataPtr(); +@@ -940,9 +953,14 @@ + w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); + h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); + ++ #if POPPLER_VERSION_0_20 ++ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); ++ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); ++ #else + dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); + gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); +- ++ #endif ++ + THIS->page->display(gfx); + dev->endPage(); + +@@ -970,7 +988,9 @@ + + void aux_fill_links(void *_object) + { +- #if POPPLER_VERSION_0_17 ++ #if POPPLER_VERSION_0_20 ++ THIS->links = new Links (THIS->page->getAnnots ()); ++ #elif POPPLER_VERSION_0_17 + THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); + #else + Object obj; +@@ -1152,13 +1172,22 @@ + + if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); + ++ #if POPPLER_VERSION_0_20 ++ textdev = new TextOutputDev (NULL, true, 0, false, false); ++ THIS->page->display (textdev, 72, 72, 0, false, false, false); ++ #else + textdev = new TextOutputDev (NULL, true, false, false); + THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); ++ #endif + + if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } + + count = 0; ++ #if POPPLER_VERSION_0_20 ++ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) ++ #else + while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) ++ #endif + { + if (!THIS->Found) + GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1); diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 76c732531..9a7ebc1e5 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 70556 2012-05-11 12:51:57Z seblu $ +# $Id: PKGBUILD 71313 2012-05-26 14:56:36Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ipset pkgver=6.12.1 -pkgrel=1 +pkgrel=2 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') url='http://ipset.netfilter.org' license=('GPL2') depends=('libmnl') -backup=('etc/ipset.conf' "etc/conf.d/$pkgname") +backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") options=('!libtool') source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.conf" @@ -17,10 +17,10 @@ source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.systemd" "$pkgname.service") md5sums=('80df500a4d93cb14e1373ae290716cda' - '61963bda45c002fb37977e58bb5b829c' - '888bf1eadffcc076b9e97de02e2147c8' - 'c5f38e5f3027066c1491a563e734796e' - 'b9ff3bd7b959cb1b97b8c492b52b8377') + '3e606a2823a700b4e9c5f17511a6f6a5' + 'de89b054d967036e08b13bc6a7235286' + 'dfc3105b89ed41fc4a1feb4f4f13f2a3' + 'b032241b96b5802975fe4321cc511c6b') build() { cd $pkgname-$pkgver @@ -29,13 +29,13 @@ build() { } package() { - cd $pkgname-$pkgver + pushd $pkgname-$pkgver make DESTDIR="$pkgdir" install # install doc install -dm755 "$pkgdir/usr/share/doc/$pkgname" install -m644 README UPGRADE ChangeLog "$pkgdir/usr/share/doc/$pkgname" + popd # install initscripts - cd .. install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" # install systemd service diff --git a/community/ipset/ipset.conf b/community/ipset/ipset.conf index 686931f4c..d5d3cb699 100644 --- a/community/ipset/ipset.conf +++ b/community/ipset/ipset.conf @@ -1,3 +1,7 @@ -# vim:set ts=2 sw=2 ft=sh et: +# Configuration file used to load/save configuration. +CONFIG_FILE='/etc/ipset.conf' + +# Save configuration on stop/restart. +#SAVE_ON_STOP=yes -IPSET_CONF='/etc/ipset.conf' +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipset/ipset.rc b/community/ipset/ipset.rc index 1d5f7df8b..517eff1ea 100644 --- a/community/ipset/ipset.rc +++ b/community/ipset/ipset.rc @@ -2,38 +2,32 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ipset +. /etc/conf.d/${0##*/} case "$1" in start) - stat_busy 'Loading IP Sets' - if [[ -f $IPSET_CONF ]] && ipset restore < "$IPSET_CONF"; then - add_daemon ipset - stat_done - else - stat_fail - fi + stat_busy 'Loading IP sets' + ipset restore < "$CONFIG_FILE" && add_daemon ${0##*/} && stat_done || stat_die ;; stop) - status 'Clearing IP Sets' ipset destroy - rm_daemon ipset + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + stat_busy 'Clearing IP sets' + ipset destroy && + rm_daemon ${0##*/} && stat_done || stat_die ;; restart) $0 stop - sleep 1 $0 start ;; save) - stat_busy 'Saving IP Sets' - if ipset save > "$IPSET_CONF" 2>/dev/null; then - stat_done - else - stat_fail - fi + stat_busy 'Saving IP sets' + ipset save > "$CONFIG_FILE" && + stat_done || stat_die ;; *) - echo "usage: ${0##*/} {start|stop|restart|save}" + echo "usage: ${0##*/} {start|stop|restart|save}" >&2 + exit 1 + ;; esac -exit 0 # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service index 0e0dd4ff7..8c4889d3c 100644 --- a/community/ipset/ipset.service +++ b/community/ipset/ipset.service @@ -1,12 +1,12 @@ [Unit] Description=IP Sets +Before=iptables.service [Service] Type=oneshot -ExecStart=/usr/lib/systemd/scripts/ipset start -ExecStop=/usr/sbin/ipset destroy RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/ipset start +ExecStop=/usr/lib/systemd/scripts/ipset stop [Install] WantedBy=multi-user.target -Before=iptables.service diff --git a/community/ipset/ipset.systemd b/community/ipset/ipset.systemd index 36df5124a..92397f3a7 100644 --- a/community/ipset/ipset.systemd +++ b/community/ipset/ipset.systemd @@ -2,7 +2,21 @@ . /etc/conf.d/ipset -[[ -f $IPSET_CONF ]] || exit 1 -ipset restore < "$IPSET_CONF" +case $1 in + start) + ipset restore < "$CONFIG_FILE" + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + ipset destroy + ;; + save) + ipset save > "$CONFIG_FILE" + ;; + *) + echo "usage: ${0##*/} {start|stop|save}" >&2 + exit 1 + ;; +esac # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD index a8126aca1..42132b7b6 100644 --- a/community/ipvsadm/PKGBUILD +++ b/community/ipvsadm/PKGBUILD @@ -1,47 +1,56 @@ -# $Id: PKGBUILD 69082 2012-04-09 02:20:59Z seblu $ +# $Id: PKGBUILD 71320 2012-05-26 15:01:34Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ipvsadm pkgver=1.26 -pkgrel=4 +pkgrel=5 pkgdesc='The IP Virtual Server administration utility' arch=('i686' 'x86_64') url='http://www.linuxvirtualserver.org/software/ipvs.html' license=('GPL2') depends=('libnl1' 'popt') -backup=('etc/conf.d/ipvsadm') +backup=("etc/$pkgname.conf" "etc/conf.d/$pkgname") +options=('!makeflags') +install=$pkgname.install source=("http://www.linuxvirtualserver.org/software/kernel-2.6/$pkgname-$pkgver.tar.gz" - 'ipvsadm.rc' - 'ipvsadm.conf' - 'ipvsadm.rules' + "$pkgname.conf" + "$pkgname.rc" + "$pkgname.systemd" + "$pkgname.service" '01-fix-not-showing-all-server.patch') md5sums=('eac3ba3f62cd4dea2da353aeddd353a8' - '89b15096bb243dc694b6c5d4200561fd' - 'cd358130967a9cc0d31fc61282df43e7' - 'cd6649c647e495d4d6f981542ce5a93b' + 'b6cb7724aa6c61c3a9cdd40e8eaa973e' + 'f2f4a7c6d57c5301c5f12f9b323fdea8' + 'df28308873b437eeb55657f6aa438ecd' + 'dc87684064f85b64c1e79c1eac336303' 'e9fb77d2fbe2d3f41d60257316338543') build() { cd $pkgname-$pkgver patch -p1 -i ../01-fix-not-showing-all-server.patch - make INCLUDE="-I/usr/src/linux-$(uname -r)/include -I.. -I." + make #INCLUDE="-I/usr/src/linux-$(uname -r)/include -I.. -I." } package() { - cd $pkgname-$pkgver + pushd $pkgname-$pkgver make \ BUILD_ROOT="$pkgdir" \ MANDIR=usr/share/man \ SBIN="$pkgdir/usr/sbin" \ INIT="$pkgdir/etc/rc.d" \ install - cd "$srcdir" - # add initscripts - install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" - install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" - # add ipvsadm rules - install -D -m 644 $pkgname.rules "$pkgdir/etc/$pkgname.rules" + popd + # install initscripts + install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + # install systemd service + install -Dm 755 $pkgname.systemd \ + "$pkgdir/usr/lib/systemd/scripts/$pkgname" + install -Dm 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" + # default config file + install -Dm 644 /dev/null "$pkgdir/etc/$pkgname.conf" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.conf b/community/ipvsadm/ipvsadm.conf index aac7ba729..b9a98a36e 100644 --- a/community/ipvsadm/ipvsadm.conf +++ b/community/ipvsadm/ipvsadm.conf @@ -1,3 +1,7 @@ -# vim:set ts=2 sw=2 ft=sh et: +# Configuration file used to load/save configuration. +CONFIG_FILE='/etc/ipvsadm.conf' + +# Save configuration on stop/restart. +#SAVE_ON_STOP=yes -IPVSADM_CONF='/etc/ipvsadm.rules' +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.install b/community/ipvsadm/ipvsadm.install new file mode 100644 index 000000000..d235b560a --- /dev/null +++ b/community/ipvsadm/ipvsadm.install @@ -0,0 +1,10 @@ +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + [ $(vercmp "$2" '1.26-4') -gt 0 ] || cat <<EOF +Config file have been moved from /etc/ipvsadm.rules to /etc/ipvsadm.conf. +You can revert to the previous location by editing /etc/conf.d/ipvsadm. +EOF +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.rc b/community/ipvsadm/ipvsadm.rc index 5a9614106..b810dcd62 100644 --- a/community/ipvsadm/ipvsadm.rc +++ b/community/ipvsadm/ipvsadm.rc @@ -2,38 +2,30 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ipvsadm +. /etc/conf.d/${0##*/} case "$1" in - start) + start) stat_busy 'Loading IPVS table' - if [[ -f $IPVSADM_CONF ]] && ipvsadm-restore < "$IPVSADM_CONF"; then - add_daemon ipvsadm - stat_done - else - stat_fail - fi - ;; - stop) - status 'Clearing IPVS table' ipvsadm -C - rm_daemon ipvsadm - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - save) - stat_busy 'Saving IPVS table' - if ipvsadm-save -n > "$IPVSADM_CONF" 2>/dev/null; then - stat_done - else - stat_fail - fi - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|save}" + ipvsadm-restore < "$CONFIG_FILE" && + add_daemon ${0##*/} && stat_done || stat_die + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + stat_busy 'Clearing IPVS table' + ipvsadm -C && rm_daemon ${0##*/} && stat_done || stat_die + ;; + restart) + $0 stop + $0 start + ;; + save) + stat_busy 'Saving IPVS table' + ipvsadm-save -n > "$CONFIG_FILE" && stat_done || stat_die + ;; + *) + echo "usage: ${0##*/} {start|stop|restart|save}" >&2 + exit 1 esac -exit 0 # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.service b/community/ipvsadm/ipvsadm.service new file mode 100644 index 000000000..bb6b01c3f --- /dev/null +++ b/community/ipvsadm/ipvsadm.service @@ -0,0 +1,11 @@ +[Unit] +Description=IP Virtual Server + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/ipvsadm start +ExecStop=/usr/lib/systemd/scripts/ipvsadm stop + +[Install] +WantedBy=multi-user.target diff --git a/community/ipvsadm/ipvsadm.systemd b/community/ipvsadm/ipvsadm.systemd new file mode 100644 index 000000000..3b72bd3ef --- /dev/null +++ b/community/ipvsadm/ipvsadm.systemd @@ -0,0 +1,22 @@ +#!/bin/bash + +. /etc/conf.d/ipvsadm + +case $1 in + start) + ipvsadm-restore < "$CONFIG_FILE" + ;; + stop) + [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save + ipvsadm -C + ;; + save) + ipvsadm-save -n > "$CONFIG_FILE" + ;; + *) + echo "usage: ${0##*/} {start|stop|save}" >&2 + exit 1 + ;; +esac + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ktikz/PKGBUILD b/community/ktikz/PKGBUILD index 850a926be..d20dfbdcb 100644 --- a/community/ktikz/PKGBUILD +++ b/community/ktikz/PKGBUILD @@ -4,7 +4,7 @@ pkgname=ktikz pkgver=0.10 -pkgrel=3 +pkgrel=4 pkgdesc="A small application helping you to create TikZ diagrams (from the LaTeX pgf package)" arch=('i686' 'x86_64') url="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/" @@ -13,7 +13,6 @@ depends=('poppler-qt' 'kdelibs') makedepends=('automoc4' 'cmake' 'docbook-xml') source=("http://www.hackenberger.at/ktikz/"$pkgname"_"$pkgver".tar.gz") md5sums=('e8f0826cba2447250bcdcd389a71a2ac') -install=ktikz.install build() { cd "$srcdir"/"$pkgname" diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 9f71b9bb1..512560db8 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70977 2012-05-21 07:59:49Z spupykin $ +# $Id: PKGBUILD 71278 2012-05-26 07:55:04Z pschmitz $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor pkgver=0.6.3 -pkgrel=3 +pkgrel=4 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64") license=('GPL') diff --git a/community/libmnl/PKGBUILD b/community/libmnl/PKGBUILD index 8a00d0a65..bc4e355c2 100644 --- a/community/libmnl/PKGBUILD +++ b/community/libmnl/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 61555 2012-01-02 21:43:24Z seblu $ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net +# $Id: PKGBUILD 71327 2012-05-26 23:26:09Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Christian Hesse <mail@earthworm.de> pkgname=libmnl -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc='Minimalistic user-space library oriented to Netlink developers.' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/libmnl/' license=('LGPL2.1') +depends=('glibc') +options=('!libtool') source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -sha1sums=('62440193d128adc0946a8737e86dc0068424eedb') +sha1sums=('c27e25f67c6422ebf893fc3a844af8085a1c5b63') build() { cd $pkgname-$pkgver diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD index ecee22ddf..e8e54ee08 100644 --- a/community/milkytracker/PKGBUILD +++ b/community/milkytracker/PKGBUILD @@ -4,7 +4,7 @@ pkgname=milkytracker pkgver=0.90.85 -pkgrel=4 +pkgrel=5 pkgdesc="Fast Tracker II inspired music tracker" arch=('x86_64' 'i686') url="http://www.milkytracker.org/" @@ -12,7 +12,7 @@ license=('GPL3') depends=('sdl>=1.2.0' 'alsa-lib' 'zlib' 'gcc-libs') makedepends=('jack-audio-connection-kit') optdepends=('jack-audio-connection-kit: JACK audio support') -options=('docs') +options=('docs' '!strip') install=$pkgname.install source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2" 'arch.patch' diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 0025391bb..d7da983a3 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,10 +1,11 @@ +# $Id: PKGBUILD 71255 2012-05-26 06:36:27Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 -pkgver=20120414 -pkgrel=4 +pkgver=20120517 +pkgrel=1 pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" arch=('i686' 'x86_64') license=('GPL') @@ -20,19 +21,17 @@ provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('95d981808cbfa66ad238f6c044f4f746') +md5sums=('814cc9545937e13796df1d4747c3c5d0') build() { cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr \ --enable-runtime-cpudetection \ - --disable-arts \ --disable-speex \ --disable-openal \ --disable-libdv \ --disable-musepack \ - --disable-esd \ --disable-mga \ --language=all \ --enable-translation \ diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD index 3e4ec0182..65c255a9a 100644 --- a/community/ngircd/PKGBUILD +++ b/community/ngircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67247 2012-03-05 20:22:45Z kkeen $ +# $Id: PKGBUILD 71251 2012-05-26 05:48:55Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ngircd -pkgver=19 +pkgver=19.1 pkgrel=1 pkgdesc="Next Generation IRC Daemon" arch=('x86_64' 'i686') @@ -14,7 +14,7 @@ license=('GPL') depends=('openssl' 'libident') source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz" ngircd.sh) -sha256sums=('10d153ea88f5108aedf49e044b5daf8f19ad8053b7721e72408aabe77505388b' +sha256sums=('3e5cf62ab5164a310aa47f384387803a4c2b5221005ad1eb648ae2c5f0796f60' 'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5') build() { diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index a1376c92c..40fe354a8 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 58479 2011-11-13 13:51:40Z jelle $ +# $Id: PKGBUILD 71280 2012-05-26 07:55:10Z pschmitz $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu -pkgver=0.7.11 -pkgrel=3 +pkgver=0.7.12 +pkgrel=1 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" license=('GPL') depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs') makedepends=('pstreams') -source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") -md5sums=('cdc0cbb46512aaf7109d6ebc7aef1a7a') +source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz" + "poppler-0.20.patch") +md5sums=('4fd56c0763b56b4081fc9c85be16d9d7' + '9f9c5b098a3a13256beac04553ee67c3') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 <$srcdir/poppler-0.20.patch ./configure --prefix=/usr make } @@ -25,4 +28,3 @@ package() { make install DESTDIR=${pkgdir} install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 } -md5sums=('37c3d5a31c155bc65a39912da4c6bce1') diff --git a/community/pdf2djvu/poppler-0.20.patch b/community/pdf2djvu/poppler-0.20.patch new file mode 100644 index 000000000..36d23f73a --- /dev/null +++ b/community/pdf2djvu/poppler-0.20.patch @@ -0,0 +1,69 @@ +diff -wbBur pdf2djvu-0.7.12/configure pdf2djvu-0.7.12.my/configure +--- pdf2djvu-0.7.12/configure 2012-01-22 03:17:01.000000000 +0400 ++++ pdf2djvu-0.7.12.my/configure 2012-05-17 20:44:06.000000000 +0400 +@@ -6653,7 +6653,7 @@ + + if test "$GXX" = yes + then +- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" ++ CXXFLAGS="$CXXFLAGS " + fi + + # Output files +diff -wbBur pdf2djvu-0.7.12/configure.ac pdf2djvu-0.7.12.my/configure.ac +--- pdf2djvu-0.7.12/configure.ac 2012-01-22 03:16:50.000000000 +0400 ++++ pdf2djvu-0.7.12.my/configure.ac 2012-05-17 20:43:37.000000000 +0400 +@@ -225,7 +225,7 @@ + AX_CXXFLAGS_WARN_ALL(CXXFLAGS) + if test "$GXX" = yes + then +- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" ++ CXXFLAGS="$CXXFLAGS " + fi + + # Output files +diff -wbBur pdf2djvu-0.7.12/pdf-backend.cc pdf2djvu-0.7.12.my/pdf-backend.cc +--- pdf2djvu-0.7.12/pdf-backend.cc 2012-01-22 03:16:50.000000000 +0400 ++++ pdf2djvu-0.7.12.my/pdf-backend.cc 2012-05-17 20:47:24.000000000 +0400 +@@ -32,10 +32,10 @@ + * ====================== + */ + +-static void poppler_error_handler(int pos, char *message, va_list args) ++static void poppler_error_handler(void *data, ErrorCategory ec, int pos, char *message) + { + std::string format; +- std::string expanded_message = string_vprintf(message, args); ++ std::string expanded_message = message; + const char *c_message = expanded_message.c_str(); + if (pos >= 0) + { +@@ -61,7 +61,7 @@ + Cwd cwd(argv0_dir_name); + #endif + globalParams = new GlobalParams(); +- setErrorFunction(poppler_error_handler); ++ setErrorCallback(poppler_error_handler, 0); + } + + void pdf::Environment::set_antialias(bool value) +diff -wbBur pdf2djvu-0.7.12/pdf2djvu.cc pdf2djvu-0.7.12.my/pdf2djvu.cc +--- pdf2djvu-0.7.12/pdf2djvu.cc 2012-01-22 03:16:50.000000000 +0400 ++++ pdf2djvu-0.7.12.my/pdf2djvu.cc 2012-05-17 20:55:07.000000000 +0400 +@@ -1387,13 +1387,13 @@ + debug(0)++; + } + out1.reset(new pdf::Renderer(paper_color, config.monochrome)); +- out1->startDoc(doc->getXRef()); ++ out1->startDoc((PDFDoc*)doc->getXRef()); + outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); +- outm->startDoc(doc->getXRef()); ++ outm->startDoc((PDFDoc*)doc->getXRef()); + if (!config.monochrome) + { + outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); +- outs->startDoc(doc->getXRef()); ++ outs->startDoc((PDFDoc*)doc->getXRef()); + } + } + assert(doc.get() != NULL); diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 1ba831faa..021ad1b5b 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 68175 2012-03-18 20:53:22Z jlichtblau $ +#$Id: PKGBUILD 71311 2012-05-26 14:22:36Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('6f95d1bb97cb1ef91b9d664f4d5ce013c6cc93f3aefb24cd64cf2500a525be0f') +sha256sums=('525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index a69c0df58..04be7b9e8 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2012-05-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.5-1 + 2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.5.4-1 diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index ec363d5ec..3e44c662f 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68098 2012-03-18 05:46:56Z svenstaro $ +# $Id: PKGBUILD 71324 2012-05-26 15:26:22Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.144 +pkgver=0.147 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64') @@ -14,12 +14,12 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer') makedepends=('boost' 'asio' 'cmake') install=springlobby.install source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2) -md5sums=('facde8ab25100e50be5fc9b33deceb5c') +md5sums=('1dd17f3f573d40b10b66bdbdc77181f0') build() { cd $srcdir/${pkgname}-$pkgver - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + #export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD index 4377089ff..d4b132fd5 100644 --- a/community/tellico/PKGBUILD +++ b/community/tellico/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 62153 2012-01-16 21:08:22Z andrea $ -# Maintainer: Ray Rashif <schiv@archlinux.org +# $Id: PKGBUILD 71282 2012-05-26 07:55:16Z pschmitz $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Maintainer: Ray Rashif <schiv@archlinux.org # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=tellico pkgver=2.3.5 -pkgrel=1 +pkgrel=2 pkgdesc="A collection manager for KDE" arch=('i686' 'x86_64') url="http://tellico-project.org/" license=('GPL') -depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' - 'kdemultimedia-kioslave' 'poppler-qt' 'qjson') +depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-kioslave' 'poppler-qt' 'qjson') makedepends=('automoc4' 'cmake') install=$pkgname.install -source=("http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2") -md5sums=('e6a1835d2622b79c4bfd95271bce858e') +source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c') build() { - cd "${srcdir}" + cd ${srcdir} + mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr - make } package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install + cd ${srcdir}/build + + make DESTDIR=${pkgdir} install - # fix python 2.7 path - find "$pkgdir" -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +# fix python 2.7 path + find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' } diff --git a/community/tellico/tellico.install b/community/tellico/tellico.install index 3f06b8deb..3b3aff7d9 100644 --- a/community/tellico/tellico.install +++ b/community/tellico/tellico.install @@ -1,12 +1,13 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } |