From 2e5b72e5e8dfb5199a9b0da7c76d052a456662c2 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 May 2013 01:18:40 -0700 Subject: Tue May 14 01:18:40 PDT 2013 --- community/pdnsd/PKGBUILD | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'community/pdnsd/PKGBUILD') diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD index b6c872299..db92359f5 100644 --- a/community/pdnsd/PKGBUILD +++ b/community/pdnsd/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 75512 2012-08-26 18:24:09Z bpiotrowski $ +# $Id: PKGBUILD 90701 2013-05-13 14:33:26Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Henrik Nymann Jensen pkgname=pdnsd pkgver=1.2.9.a _pkgver=${pkgver/.a/a} -pkgrel=1 +pkgrel=2 pkgdesc="Proxy DNS server with permanent caching" arch=(i686 x86_64) url="http://members.home.nl/p.a.rombouts/pdnsd/" license=('GPL') depends=('glibc') source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz - rc.d - service) + service) md5sums=('2f3e705d59a0f9308ad9504b24400769' - '3670bd47c9303fbb655d9216715512de' 'fad5e518d126b29fc947941d57a0a494') build() { @@ -27,7 +25,5 @@ build() { package() { cd $srcdir/$pkgname-$_pkgver make DESTDIR=$pkgdir install - - install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/pdnsd install -Dm0644 $srcdir/service $pkgdir/usr/lib/systemd/system/pdnsd.service } -- cgit v1.2.3-54-g00ecf From e3f225daecfd5cfea4af1a4e8ac4b6c46c7ec363 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 May 2013 00:28:39 -0700 Subject: Tue May 21 00:28:39 PDT 2013 --- community/bonnie++/PKGBUILD | 11 +- community/bonnie++/move_away_from_sbin.patch | 14 ++ community/collectd/PKGBUILD | 14 +- community/collectd/rc.d | 39 ---- community/collectd/service | 2 +- community/compiz-bcop/PKGBUILD | 29 --- community/compiz-fusion-plugins-extra/PKGBUILD | 34 ---- community/compiz-fusion-plugins-main/PKGBUILD | 34 ---- .../compiz-fusion-plugins-main/magiclamp.patch | 33 ---- community/compiz/PKGBUILD | 142 -------------- community/compiz/compiz-decorator-gtk.install | 28 --- community/compiz/compiz-gcc-4.7.patch | 38 ---- community/compiz/compiz-kde-4.10.patch | 30 --- community/compiz/compiz-kde-4.8.patch | 18 -- community/compiz/compiz-kde-4.9.patch | 196 ------------------- community/compizconfig-backend-gconf/PKGBUILD | 36 ---- community/compizconfig-python/PKGBUILD | 29 --- community/geany-plugins/PKGBUILD | 6 +- community/geany/PKGBUILD | 22 ++- community/golangide/PKGBUILD | 20 +- community/i2c-tools/PKGBUILD | 6 +- community/kmess/PKGBUILD | 13 +- community/libcompizconfig/PKGBUILD | 33 ---- community/nsd/PKGBUILD | 17 +- community/nsd/service | 6 +- community/pdnsd/PKGBUILD | 10 +- community/sdcc/PKGBUILD | 20 +- community/sysstat/PKGBUILD | 5 +- community/unbound/PKGBUILD | 34 ++-- community/unbound/conf | 4 + community/unbound/rc.d | 39 ---- community/unbound/service | 12 ++ community/unbound/unbound.conf | 4 - community/unbound/unbound.service | 12 -- community/uriparser/PKGBUILD | 6 +- core/gpm/PKGBUILD | 10 +- core/gpm/gpm.service | 2 +- core/man-db/PKGBUILD | 25 ++- core/man-db/man-db.cron.daily | 2 +- core/openssh/PKGBUILD | 33 ++-- core/openssh/install | 10 + core/openssh/sshd | 44 ----- core/openssh/sshd.close-sessions | 17 -- core/openssh/sshd.confd | 4 - core/openssh/sshd.service | 2 +- core/openssh/sshd@.service | 2 +- core/procps-ng/PKGBUILD | 21 +- extra/avahi/PKGBUILD | 33 ++-- extra/avahi/rc.d.patch | 11 -- extra/clamav/PKGBUILD | 15 +- extra/clamav/conf.d | 8 - extra/clamav/rc.d | 66 ------- extra/clamav/service | 2 +- extra/dovecot/PKGBUILD | 8 +- extra/empathy/PKGBUILD | 6 +- extra/fontconfig/PKGBUILD | 10 +- extra/gparted/PKGBUILD | 21 +- extra/gparted/gparted.install | 7 +- extra/gparted/gparted_polkit | 6 + extra/hddtemp/PKGBUILD | 14 +- extra/hddtemp/conf.d | 2 - extra/hddtemp/rc.d | 39 ---- extra/hddtemp/service | 3 +- extra/java7-openjdk/01_fix_openjdk_cmds_path.diff | 39 ++++ extra/java7-openjdk/02_fix_corba_cmds_path.diff | 32 +++ extra/java7-openjdk/PKGBUILD | 20 +- extra/java7-openjdk/fix_corba_cmds_path.diff | 29 --- .../java7-openjdk/openjdk7_fix_jdk_cmds_path.diff | 36 ---- extra/konversation/PKGBUILD | 12 +- extra/licq/PKGBUILD | 23 ++- extra/misdnuser/PKGBUILD | 55 ++++++ extra/misdnuser/c2faxrecv-mISDNcapid.service | 11 ++ extra/misdnuser/fix-compile-gcc48.patch | 15 ++ extra/misdnuser/mISDNcapid.conf | 1 + extra/misdnuser/mISDNcapid.service | 11 ++ extra/pigeonhole/PKGBUILD | 8 +- extra/sqlite/PKGBUILD | 10 +- extra/vde2/PKGBUILD | 19 +- extra/vde2/vde.conf | 11 -- extra/vde2/vde.rc | 113 ----------- extra/vde2/vde2.install | 1 - extra/weechat/PKGBUILD | 16 +- extra/weechat/ruby-2.0.0-crash-fix.diff | 76 -------- extra/wireshark/01_patch-automake-1.13.diff | 11 -- extra/wireshark/PKGBUILD | 12 +- extra/wireshark/wireshark.install | 6 +- extra/x2goserver/PKGBUILD | 20 +- extra/x2goserver/revert.patch | 152 +++++++++++++++ extra/x2goserver/x2goserver.install | 2 +- kernels/linux-libre-pae/PKGBUILD | 20 +- kernels/linux-libre-pae/config | 212 +++++++++++++------- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 20 +- kernels/linux-libre-xen/config | 214 ++++++++++++++------- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/icedove-l10n/PKGBUILD | 2 +- libre/icedove-libre/PKGBUILD | 11 +- libre/iceweasel-l10n/PKGBUILD | 14 +- libre/iceweasel-libre/PKGBUILD | 17 +- libre/iceweasel-libre/libre.patch | 45 +---- libre/iceweasel-libre/replace-urls.txt | 26 +-- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 6 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 14 +- libre/linux-libre/config.i686 | 11 +- libre/linux-libre/config.x86_64 | 10 +- libre/linux-libre/linux-libre.install | 2 +- libre/parabola-xdg-menu/PKGBUILD | 10 +- pcr/bamf2/PKGBUILD | 52 +++++ pcr/frame/PKGBUILD | 32 +++ pcr/geis/PKGBUILD | 33 ++++ pcr/ginn/PKGBUILD | 21 ++ pcr/grail/PKGBUILD | 34 ++++ pcr/jalv/PKGBUILD | 33 ++++ pcr/mda-lv2/PKGBUILD | 26 +++ pcr/nicotine/PKGBUILD | 43 +++++ pcr/python2-sexy/PKGBUILD | 24 +++ 119 files changed, 1323 insertions(+), 1783 deletions(-) create mode 100644 community/bonnie++/move_away_from_sbin.patch delete mode 100644 community/collectd/rc.d delete mode 100644 community/compiz-bcop/PKGBUILD delete mode 100644 community/compiz-fusion-plugins-extra/PKGBUILD delete mode 100644 community/compiz-fusion-plugins-main/PKGBUILD delete mode 100644 community/compiz-fusion-plugins-main/magiclamp.patch delete mode 100644 community/compiz/PKGBUILD delete mode 100644 community/compiz/compiz-decorator-gtk.install delete mode 100644 community/compiz/compiz-gcc-4.7.patch delete mode 100644 community/compiz/compiz-kde-4.10.patch delete mode 100644 community/compiz/compiz-kde-4.8.patch delete mode 100644 community/compiz/compiz-kde-4.9.patch delete mode 100644 community/compizconfig-backend-gconf/PKGBUILD delete mode 100644 community/compizconfig-python/PKGBUILD delete mode 100644 community/libcompizconfig/PKGBUILD create mode 100644 community/unbound/conf delete mode 100644 community/unbound/rc.d create mode 100644 community/unbound/service delete mode 100644 community/unbound/unbound.conf delete mode 100644 community/unbound/unbound.service create mode 100644 core/openssh/install delete mode 100755 core/openssh/sshd delete mode 100644 core/openssh/sshd.close-sessions delete mode 100644 core/openssh/sshd.confd delete mode 100644 extra/avahi/rc.d.patch delete mode 100644 extra/clamav/conf.d delete mode 100644 extra/clamav/rc.d create mode 100644 extra/gparted/gparted_polkit delete mode 100644 extra/hddtemp/conf.d delete mode 100644 extra/hddtemp/rc.d create mode 100644 extra/java7-openjdk/01_fix_openjdk_cmds_path.diff create mode 100644 extra/java7-openjdk/02_fix_corba_cmds_path.diff delete mode 100644 extra/java7-openjdk/fix_corba_cmds_path.diff delete mode 100644 extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff create mode 100644 extra/misdnuser/PKGBUILD create mode 100644 extra/misdnuser/c2faxrecv-mISDNcapid.service create mode 100644 extra/misdnuser/fix-compile-gcc48.patch create mode 100644 extra/misdnuser/mISDNcapid.conf create mode 100644 extra/misdnuser/mISDNcapid.service delete mode 100644 extra/vde2/vde.conf delete mode 100755 extra/vde2/vde.rc delete mode 100644 extra/weechat/ruby-2.0.0-crash-fix.diff delete mode 100644 extra/wireshark/01_patch-automake-1.13.diff create mode 100644 extra/x2goserver/revert.patch create mode 100644 pcr/bamf2/PKGBUILD create mode 100644 pcr/frame/PKGBUILD create mode 100644 pcr/geis/PKGBUILD create mode 100644 pcr/ginn/PKGBUILD create mode 100644 pcr/grail/PKGBUILD create mode 100644 pcr/jalv/PKGBUILD create mode 100644 pcr/mda-lv2/PKGBUILD create mode 100644 pcr/nicotine/PKGBUILD create mode 100644 pcr/python2-sexy/PKGBUILD (limited to 'community/pdnsd/PKGBUILD') diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD index 27e176e37..f45a04241 100644 --- a/community/bonnie++/PKGBUILD +++ b/community/bonnie++/PKGBUILD @@ -4,19 +4,20 @@ pkgname=bonnie++ pkgver=1.03e -pkgrel=6 +pkgrel=7 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray" arch=('i686' 'x86_64') url="http://www.coker.com.au/bonnie++/" license=('GPL') depends=('perl') -source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz) -sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb') +source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz move_away_from_sbin.patch) +sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb' + 'c100df652c26f38c950baaf3fe25a74d51ba830066f9d02d273cbb5fc5660814') build() { cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr sed -i "s:CFLAGS=-O2 -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile make } @@ -24,6 +25,8 @@ build() { package() { cd $srcdir/${pkgname}-${pkgver} + # https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/ + patch -Np1 -i $srcdir/move_away_from_sbin.patch make prefix="${pkgdir}/usr" install install -d $pkgdir/usr/share/doc/bonnie++ diff --git a/community/bonnie++/move_away_from_sbin.patch b/community/bonnie++/move_away_from_sbin.patch new file mode 100644 index 000000000..18e99e976 --- /dev/null +++ b/community/bonnie++/move_away_from_sbin.patch @@ -0,0 +1,14 @@ +diff -aur bonnie++-1.03e/Makefile bonnie++-1.03ef/Makefile +--- bonnie++-1.03e/Makefile 2013-05-13 08:40:45.122959831 +0000 ++++ bonnie++-1.03ef/Makefile 2013-05-13 08:43:20.365248937 +0000 +@@ -33,8 +33,8 @@ + $(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS) + + install-bin: $(EXES) +- mkdir -p $(eprefix)/bin $(eprefix)/sbin +- ${INSTALL} -s $(EXES) $(eprefix)/sbin ++ mkdir -p $(eprefix)/bin ++ ${INSTALL} -s $(EXES) $(eprefix)/bin + ${INSTALL} $(SCRIPTS) $(eprefix)/bin + + install: install-bin diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 07b3708d9..59f594221 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $ +# $Id: PKGBUILD 91248 2013-05-20 14:50:52Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Gerhard Brauer pkgname=collectd pkgver=5.3.0 -pkgrel=1 +pkgrel=2 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64') @@ -40,12 +40,10 @@ depends=('libltdl' 'iptables') source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libperl.patch' - 'service' - 'rc.d') + 'service') sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539' '245c098d121a4a05594553583310953b3a2f6461' - 'b56907f532b9174e1b6995aadb518228d7464d3b' - '0f441718d5519cb043b1130e5a1d0379078adbcc') + '04f676d0b76c34df0bbf94629813e035b1febe04') backup=('etc/collectd.conf') options=('!libtool') @@ -63,7 +61,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static=no \ + --sbindir=/usr/bin \ + --disable-static \ --with-python=/usr/bin/python2 make all } @@ -72,7 +71,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rmdir "${pkgdir}/var/run" # FS#30201 - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl } diff --git a/community/collectd/rc.d b/community/collectd/rc.d deleted file mode 100644 index 442f2324a..000000000 --- a/community/collectd/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=collectd -prog="/usr/sbin/collectdmon" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && $prog \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -reload) - stat_busy "Sending SIGHUP to $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community/collectd/service b/community/collectd/service index 9581ec0c9..30540645a 100644 --- a/community/collectd/service +++ b/community/collectd/service @@ -5,7 +5,7 @@ After=local-fs.target network.target [Service] Type=forking PIDFile=/run/collectdmon.pid -ExecStart=/usr/sbin/collectdmon +ExecStart=/usr/bin/collectdmon ExecReload=/bin/kill -HUP $MAINPID Restart=always diff --git a/community/compiz-bcop/PKGBUILD b/community/compiz-bcop/PKGBUILD deleted file mode 100644 index b8af4d326..000000000 --- a/community/compiz-bcop/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 68296 2012-03-21 10:32:03Z pschmitz $ -# Maintainer: Ronald van Haren -# Maintainer: JJDaNiMoTh -# Contributor: nesl247 - -pkgname=compiz-bcop -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz option code generator" -arch=('i686' 'x86_64') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core>=0.8.8' 'libxslt') -makedepends=('intltool' 'pkgconfig') -conflicts=('compiz-bcop-git') -source=(http://releases.compiz-fusion.org/$pkgver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9210bd2a537480bdb11df0e3cc5f6d4548fd12da') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/compiz-fusion-plugins-extra/PKGBUILD b/community/compiz-fusion-plugins-extra/PKGBUILD deleted file mode 100644 index 459d72d98..000000000 --- a/community/compiz-fusion-plugins-extra/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 68298 2012-03-21 10:33:42Z pschmitz $ -# Maintainer: Ronald van Haren -# Contributor: JJDaNiMoTh -# Contributor: nesl247 - -pkgname=compiz-fusion-plugins-extra -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz Fusion Extra plugins" -arch=('i686' 'x86_64') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'compiz-bcop' 'compiz-fusion-plugins-main' 'libnotify') -makedepends=('intltool' 'pkg-config' 'gettext' 'gconf') -groups=('compiz-fusion' 'compiz-fusion-gtk' 'compiz-fusion-kde') -conflicts=('compiz-fusion-plugins-extra-git') -options=('!libtool') -source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-extra-${pkgver}.tar.bz2) -sha1sums=('ce592993696c0b5d4e0bb13171897b4c25b3844e') - -build() { - cd "${srcdir}/compiz-plugins-extra-${pkgver}" - - sed -i 's/if text "x$use/if test "x$use/' configure - sed -i 's/iconUri, NULL);/iconUri);/' src/notification/notification.c - ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/compiz-plugins-extra-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/compiz-fusion-plugins-main/PKGBUILD b/community/compiz-fusion-plugins-main/PKGBUILD deleted file mode 100644 index b9d61b9ec..000000000 --- a/community/compiz-fusion-plugins-main/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 68300 2012-03-21 10:35:13Z pschmitz $ -# Maintainer: Ronald van Haren -# Contributor: JJDaNiMoTh -# Contributor: nesl247 - -pkgname=compiz-fusion-plugins-main -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz Fusion Main plugins" -arch=('i686' 'x86_64') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libjpeg>=7' 'librsvg' 'compiz-bcop' 'libxdamage' 'libxcomposite' - 'libxinerama' 'startup-notification') -makedepends=('intltool' 'pkgconfig' 'gettext') -groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk') -conflicts=('compiz-fusion-plugins-main-git') -source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-main-${pkgver}.tar.bz2) -options=(!libtool) -sha1sums=('3c99841b744ae6c4a3edf2019626484880607dc6') - -build() { - cd "${srcdir}/compiz-plugins-main-${pkgver}" - - CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \ - -I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc - - make -} - -package() { - cd "${srcdir}/compiz-plugins-main-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/compiz-fusion-plugins-main/magiclamp.patch b/community/compiz-fusion-plugins-main/magiclamp.patch deleted file mode 100644 index 3a9e4a21e..000000000 --- a/community/compiz-fusion-plugins-main/magiclamp.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/animation/animation.c.orig 2007-12-01 02:22:12.008115484 +0100 -+++ src/animation/animation.c 2007-12-01 02:27:41.541651382 +0100 -@@ -1148,7 +1148,7 @@ - { "horizontal_folds_zoom_to_taskbar", "bool", 0, 0, 0 }, - { "magic_lamp_moving_end", "bool", 0, 0, 0 }, - { "magic_lamp_grid_res", "int", "4", 0, 0 }, -- { "magic_lamp_max_waves", "int", "3", 0, 0 }, -+ { "magic_lamp_max_waves", "int", "0", 0, 0 }, - { "magic_lamp_amp_min", "float", "200", 0, 0 }, - { "magic_lamp_amp_max", "float", "200", 0, 0 }, - { "magic_lamp_open_start_width", "int", "0", 0, 0 }, ---- metadata/animation.xml.in.orig 2007-12-01 02:25:24.011432269 +0100 -+++ metadata/animation.xml.in 2007-12-01 02:27:02.724750938 +0100 -@@ -1272,7 +1272,7 @@ - <_short>Magic Lamp Max Waves - <_long>The maximum number of waves for Magic Lamp. - 3 -- 3 -+ 0 - 20 - - -