From c512f9eb344575ac6bce0b13729c05e1760cd094 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 19 Aug 2012 00:04:07 +0000 Subject: Sun Aug 19 00:04:07 UTC 2012 --- extra/nmap/PKGBUILD | 12 +++-- extra/nmap/kdesu.patch | 14 ++++++ extra/rsync/PKGBUILD | 13 +++-- extra/rsync/rsyncd.socket | 11 +++++ extra/rsync/rsyncd@.service | 11 +++++ extra/subversion/PKGBUILD | 20 ++++---- .../subversion-1.7.6-kwallet-gcc47.patch | 56 ++++++++++++++++++++++ 7 files changed, 119 insertions(+), 18 deletions(-) create mode 100644 extra/nmap/kdesu.patch create mode 100644 extra/rsync/rsyncd.socket create mode 100644 extra/rsync/rsyncd@.service create mode 100644 extra/subversion/subversion-1.7.6-kwallet-gcc47.patch (limited to 'extra') diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index b519d8c37..1609326b3 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161987 2012-06-17 23:52:34Z bisson $ +# $Id: PKGBUILD 165381 2012-08-17 08:46:12Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Angel Velasquez # Contributor: Hugo Doria pkgname=nmap pkgver=6.01 -pkgrel=1 +pkgrel=2 pkgdesc='Utility for network discovery and security auditing' url='http://nmap.org/' arch=('i686' 'x86_64') @@ -13,8 +13,10 @@ license=('GPL') makedepends=('pygtk') optdepends=('pygtk: zenmap') depends=('pcre' 'openssl' 'libpcap' 'lua') -source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a') +source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'kdesu.patch') +sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a' + '159bc1243564d3a9dee820291bf07168870cbaf6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,6 +25,8 @@ build() { echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap.desktop echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap-root.desktop + patch -p1 -i ../kdesu.patch # FS#31158 + ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ diff --git a/extra/nmap/kdesu.patch b/extra/nmap/kdesu.patch new file mode 100644 index 000000000..daed631d6 --- /dev/null +++ b/extra/nmap/kdesu.patch @@ -0,0 +1,14 @@ +diff -Naur old/zenmap/install_scripts/unix/su-to-zenmap.sh new/zenmap/install_scripts/unix/su-to-zenmap.sh +--- old/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:34:05.863827354 +1000 ++++ new/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:35:53.872952226 +1000 +@@ -40,8 +40,8 @@ + fi + case $SU_TO_ROOT_X in + gksu) gksu -u "$PRIV" "$COMMAND";; +- kdesu) kdesu -u "$PRIV" "$COMMAND";; +- kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";; ++ kdesu) kdesu -u "$PRIV" -c "$COMMAND";; ++ kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" -c "$COMMAND";; + ktsuss) ktsuss -u "$PRIV" "$COMMAND";; + # As a last resort, open a new xterm use sudo/su + sdterm) xterm -e "sudo -u $PRIV $COMMAND";; diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index 122453775..756d5bb35 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160933 2012-06-07 05:56:33Z pierre $ +# $Id: PKGBUILD 165402 2012-08-18 01:22:52Z heftig $ pkgname=rsync pkgver=3.0.9 -pkgrel=3 +pkgrel=4 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64') url="http://samba.anu.edu.au/rsync/" @@ -10,12 +10,15 @@ license=('GPL3') depends=('perl') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz" - 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service') + 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service' + 'rsyncd.socket' 'rsyncd@.service') md5sums=('5ee72266fe2c1822333c407e1761b92b' 'bce64d122a8e0f86872a4a21a03bc7f3' 'ba413da4ebca05c57860151fda21efbc' 'ea3e9277dc908bc51f9eddc0f6b935c1' - 'ec96f9089d71109557cdcaa3f0633ed6') + 'ec96f9089d71109557cdcaa3f0633ed6' + 'af4eabd94380050191b20ab03e6f6076' + '53f94e613e0bc502d38dd61bd2cd7636') build() { cd "$srcdir/$pkgname-$pkgver" @@ -35,5 +38,7 @@ package() { install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf" install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync" install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service" + install -m644 ../rsyncd.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket" + install -m644 ../rsyncd@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service" install -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync" } diff --git a/extra/rsync/rsyncd.socket b/extra/rsync/rsyncd.socket new file mode 100644 index 000000000..83724159f --- /dev/null +++ b/extra/rsync/rsyncd.socket @@ -0,0 +1,11 @@ +[Unit] +Description=Rsync Socket +After=network.target +Conflicts=rsyncd.service + +[Socket] +ListenStream=873 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/extra/rsync/rsyncd@.service b/extra/rsync/rsyncd@.service new file mode 100644 index 000000000..33db95c4c --- /dev/null +++ b/extra/rsync/rsyncd@.service @@ -0,0 +1,11 @@ +[Unit] +Description=A file transfer program to keep remote files in sync +After=network.target + +[Service] +ExecStart=-/usr/bin/rsync --daemon +StandardInput=socket +StandardOutput=inherit +StandardError=journal +User=nobody +Group=nobody diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index c38ea4a3a..8dee5bf18 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 165293 2012-08-15 00:13:54Z stephane $ +# $Id: PKGBUILD 165382 2012-08-17 10:46:53Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: Paul Mattal # Contributor: Jason Chu pkgname=subversion -pkgver=1.7.5 -pkgrel=3 +pkgver=1.7.6 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') depends=('neon' 'apr-util' 'sqlite' 'file') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts') # 'ruby: for some hook scripts' 'java-environment') + 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') @@ -24,10 +24,10 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve.conf svnserve.tmpfiles svnserve.service - subversion-1.7.5-kwallet-gcc47.patch + subversion-1.7.6-kwallet-gcc47.patch subversion.rpath.fix.patch) -sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1' - 'b267cba19b4f56360657a5bf5b231950e027a45a' +sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068' + 'd8d99c01c49b189047389816b720923f1d9dbf2a' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' @@ -43,7 +43,7 @@ build() { patch -p0 -i ../subversion.rpath.fix.patch sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - patch -Np1 -i ../subversion-1.7.5-kwallet-gcc47.patch + patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ --with-zlib=/usr --with-neon=/usr --with-apxs \ @@ -53,7 +53,7 @@ build() { make external-all make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl #swig-rb } #check() { @@ -69,7 +69,7 @@ package() { make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl install-javahl # install-swig-rb + install install-swig-py install-swig-pl install-javahl #install-swig-rb install -dm755 "${pkgdir}"/usr/share/subversion cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ diff --git a/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch new file mode 100644 index 000000000..a571c3c3c --- /dev/null +++ b/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch @@ -0,0 +1,56 @@ +diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp +--- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500 ++++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400 +@@ -60,6 +60,9 @@ + /* KWallet simple provider, puts passwords in KWallet */ + /*-----------------------------------------------------------------------*/ + ++static int q_argc = 1; ++static char q_argv0[] = "svn"; // Build non-const char * from string constant ++static char *q_argv[] = { q_argv0 }; + + static const char * + get_application_name(apr_hash_t *parameters, +@@ -175,6 +178,10 @@ + "kwallet-initialized", + APR_HASH_KEY_STRING, + NULL); ++ apr_hash_set(parameters, ++ "kwallet-wallet", ++ APR_HASH_KEY_STRING, ++ NULL); + } + return APR_SUCCESS; + } +@@ -203,12 +210,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), +@@ -273,12 +279,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), -- cgit v1.2.3-54-g00ecf