diff options
Diffstat (limited to 'abs')
-rw-r--r-- | abs/core/apache/PKGBUILD | 11 | ||||
-rw-r--r-- | abs/core/apache/__changelog | 1 | ||||
-rw-r--r-- | abs/core/lighttpd/PKGBUILD | 46 | ||||
-rw-r--r-- | abs/core/lighttpd/__changelog | 2 | ||||
-rw-r--r-- | abs/core/mysql/PKGBUILD | 6 | ||||
-rw-r--r-- | abs/core/mysql/__changelog | 1 | ||||
-rw-r--r-- | abs/core/tdb/PKGBUILD | 23 | ||||
-rw-r--r-- | abs/extra/docbook-xsl/PKGBUILD | 4 | ||||
-rw-r--r-- | abs/extra/docbook-xsl/__changelog | 1 | ||||
-rw-r--r-- | abs/extra/samba/PKGBUILD | 144 | ||||
-rw-r--r-- | abs/extra/samba/__changelog | 2 | ||||
-rw-r--r-- | abs/extra/samba/fix-ipv6-mount.patch | 11 | ||||
-rwxr-xr-x | abs/extra/samba/samba | 54 | ||||
-rw-r--r-- | abs/extra/samba/samba.conf.d | 7 | ||||
-rw-r--r-- | abs/extra/samba/samba.logrotate | 9 | ||||
-rw-r--r-- | abs/extra/samba/samba.pam | 3 | ||||
-rw-r--r-- | abs/extra/samba/swat.xinetd | 10 | ||||
-rw-r--r-- | abs/extra/subversion/PKGBUILD | 96 | ||||
-rw-r--r-- | abs/extra/subversion/svnmerge.py | 2 |
19 files changed, 342 insertions, 91 deletions
diff --git a/abs/core/apache/PKGBUILD b/abs/core/apache/PKGBUILD index 6e570f1..4ba626c 100644 --- a/abs/core/apache/PKGBUILD +++ b/abs/core/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87621 2010-08-17 13:13:14Z jgc $ +# $Id: PKGBUILD 96448 2010-10-21 09:16:04Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache -pkgver=2.2.16 -pkgrel=2 +pkgver=2.2.17 +pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') options=('!libtool') @@ -34,7 +34,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 httpd.logrotate httpd arch.layout) -md5sums=('c8ff2a07c884300bc7766a2e7f662d33' +md5sums=('16eadc59ea6b38af33874d300973202e' 'db42cfcc18ae1c32aaaff2347e35b79d' '131408ad4dc7b18547b4e062e7e495ab' 'ee488f391054d528547c3a372faa2aa7' @@ -103,7 +103,8 @@ build() { --with-apr-util=/usr/bin/apu-1-config \ --with-pcre=/usr \ --with-mpm=${mpm} - make + make || return 1 + if [ "${mpm}" = "prefork" ]; then make DESTDIR="${pkgdir}" install else diff --git a/abs/core/apache/__changelog b/abs/core/apache/__changelog new file mode 100644 index 0000000..bbcbdac --- /dev/null +++ b/abs/core/apache/__changelog @@ -0,0 +1 @@ +update to 2.2.17 diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD index ed6d01e..e85681b 100644 --- a/abs/core/lighttpd/PKGBUILD +++ b/abs/core/lighttpd/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd -pkgver=1.4.26 -pkgrel=16 +pkgver=1.4.28 +pkgrel=1 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -14,19 +14,14 @@ optdepends=('libxml2: mod_webdav' \ 'e2fsprogs: mod_webdav' \ 'libmysqlclient: mod_mysql_vhost' \ 'sqlite3: mod_webdav' \ - 'gdbm: mod_trigger_b4_dl' \ - ) + 'gdbm: mod_trigger_b4_dl') backup=(etc/lighttpd/lighttpd.conf etc/logrotate.d/lighttpd etc/lighttpd/auth-inc.conf etc/lighttpd/conf.include etc/lighttpd/html.include) options=('!libtool' 'emptydirs') source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" \ - 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf' \ - 'openssl-0.9.8m.patch') + 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf') #install='lighttpd.install' build() { - cd $srcdir/$pkgname-$pkgver - - # fixed in 1.4.27 - patch -p2 -i ${srcdir}/openssl-0.9.8m.patch || return 1 + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ --libexecdir=/usr/lib/lighttpd/modules \ @@ -47,15 +42,19 @@ build() { --with-memcache \ --with-lua || return 1 make || return 1 - make DESTDIR=$pkgdir install || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install || return 1 - install -D -m755 ../lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd - install -D -m644 ../lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd - install -d -m755 -o http -g http $pkgdir/var/run/lighttpd/ - install -d -m755 -o http -g http $pkgdir/var/log/lighttpd/ + install -D -m755 ../lighttpd.rc.d ${pkgdir}/etc/rc.d/lighttpd + install -D -m644 ../lighttpd.logrotate.d ${pkgdir}/etc/logrotate.d/lighttpd + install -d -m755 -o http -g http ${pkgdir}/var/run/lighttpd/ + install -d -m755 -o http -g http ${pkgdir}/var/log/lighttpd/ - install -D -m644 ../lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf - install -D -m644 ../auth-inc.conf $pkgdir/etc/lighttpd/auth-inc.conf + install -D -m644 ../lighttpd.conf ${pkgdir}/etc/lighttpd/lighttpd.conf + install -D -m644 ../auth-inc.conf ${pkgdir}/etc/lighttpd/auth-inc.conf # set sane defaults sed -e 's|/srv/www/htdocs/|/srv/http/|' \ @@ -70,15 +69,14 @@ build() { -e 's|#ssi.extension = ( ".shtml" )|ssi.extension = ( ".shtml" )|' \ -i ${pkgdir}/etc/lighttpd/lighttpd.conf || return 1 - /bin/touch $pkgdir/etc/lighttpd/{conf,html}.include || return 1 - /bin/echo 'include "/etc/lighttpd/conf.include"' >> $pkgdir/etc/lighttpd/lighttpd.conf || return 1 - /bin/echo 'include "/etc/lighttpd/html.include"' >> $pkgdir/etc/lighttpd/lighttpd.conf || return 1 + /bin/touch ${pkgdir}/etc/lighttpd/{conf,html}.include || return 1 + /bin/echo 'include "/etc/lighttpd/conf.include"' >> ${pkgdir}/etc/lighttpd/lighttpd.conf || return 1 + /bin/echo 'include "/etc/lighttpd/html.include"' >> ${pkgdir}/etc/lighttpd/lighttpd.conf || return 1 - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } -md5sums=('a682c8efce47a2f4263a247ba0813c9b' +md5sums=('586eb535d31ac299652495b058dd87c4' 'bd690eee0d9e51857448770a151023b0' '857e174643fd7761a2f0d8431a679f6c' '11fbec7ff7ca1b0d5575445681e8f60e' - 'c6e361131000ceec085f40b310ef4a2c' - '84c884b8dadd724afe2bc6529e9d4485') + 'c6e361131000ceec085f40b310ef4a2c') diff --git a/abs/core/lighttpd/__changelog b/abs/core/lighttpd/__changelog index 0fe6415..71151d9 100644 --- a/abs/core/lighttpd/__changelog +++ b/abs/core/lighttpd/__changelog @@ -12,3 +12,5 @@ bummped to version 13 to test redmine #690 # by mihanson Added etc/lighttpd/conf.include and etc/lighttpd/html.include to backup array + +upgrade to 1.4.28 diff --git a/abs/core/mysql/PKGBUILD b/abs/core/mysql/PKGBUILD index ed65173..9602157 100644 --- a/abs/core/mysql/PKGBUILD +++ b/abs/core/mysql/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.1.50 +pkgver=5.1.52 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -38,7 +38,7 @@ build() { --with-unix-socket-path=/var/run/mysqld/mysqld.sock \ --enable-local-infile \ --with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster - make + make || return 1 } package_libmysqlclient(){ @@ -103,7 +103,7 @@ package_mysql(){ rm -rf ${pkgdir}/usr/{mysql-test,sql-bench} rm -f ${pkgdir}/usr/lib/mysql/plugin/*.a } -md5sums=('23bac4a0aafd683b077dac146ce2701f' +md5sums=('43c11ad3dded693393c4815d24e2b0a5' '2234207625baa29b2ff7d7b4f088abce' '175b269b665019689d786f5af0968046' 'a97e574945e19de3908575b956241026') diff --git a/abs/core/mysql/__changelog b/abs/core/mysql/__changelog index 3362584..96a3b29 100644 --- a/abs/core/mysql/__changelog +++ b/abs/core/mysql/__changelog @@ -1,2 +1,3 @@ using default arch pkgbuild my.cnf has data dir modified to use /data/srv +upgrade to 5.1.52 diff --git a/abs/core/tdb/PKGBUILD b/abs/core/tdb/PKGBUILD index 4bf2af6..7739dc1 100644 --- a/abs/core/tdb/PKGBUILD +++ b/abs/core/tdb/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 63109 2010-01-14 18:55:16Z tpowa $ +# $Id: PKGBUILD 89866 2010-09-04 14:37:32Z remy $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributorr: eric <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=tdb -pkgver=1.2.0 -pkgrel=1 +pkgver=1.2.1 +pkgrel=2 pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits" arch=(i686 x86_64) license=('GPL3') url="http://tdb.samba.org/" source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz) -makedepends=('python') -optdepends=('python: for python bindings') +makedepends=('python2' 'libxslt' 'docbook-xsl') +optdepends=('python2: for python bindings') options=(force) build() { cd ${srcdir}/${pkgname}-${pkgver} + sed -i 's#python2\.6\([^ ]*\)#python2.7\1 python2.6\1#' configure + # Use system docbook.xsl + _manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.0/manpages/docbook.xsl" + sed -i "s#http.*xsl#$_manstyle#" tdb.mk + ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc/samba make || return 1 - make DESTDIR=$pkgdir/ install } -md5sums=('4115849d2ef431a10bc1f1933eafb9b6') +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} +md5sums=('73ea81282a82e5c959d9c082af2d0215') + diff --git a/abs/extra/docbook-xsl/PKGBUILD b/abs/extra/docbook-xsl/PKGBUILD index cedcfa8..1f0f684 100644 --- a/abs/extra/docbook-xsl/PKGBUILD +++ b/abs/extra/docbook-xsl/PKGBUILD @@ -3,7 +3,7 @@ # Contributer: Sean Middleditch <elanthis@awesomeplay.com> pkgname=docbook-xsl -pkgver=1.74.0 +pkgver=1.76.0 pkgrel=1 pkgdesc="XML stylesheets for Docbook-xml transformations." arch=(i686 x86_64) @@ -12,7 +12,6 @@ url="http://scrollkeeper.sourceforge.net/docbook.shtml" depends=('libxml2' 'libxslt' 'docbook-xml') source=(http://downloads.sourceforge.net/sourceforge/docbook/docbook-xsl-${pkgver}.tar.bz2) install=docbook-xsl.install -md5sums=('a56b598decd006d5d39e4544c0bfbc6a') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -35,3 +34,4 @@ build() { install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } +md5sums=('6413843525fcaa7f58e4bd30d5192270') diff --git a/abs/extra/docbook-xsl/__changelog b/abs/extra/docbook-xsl/__changelog new file mode 100644 index 0000000..a8b9cb0 --- /dev/null +++ b/abs/extra/docbook-xsl/__changelog @@ -0,0 +1 @@ +update to 1.76.0 diff --git a/abs/extra/samba/PKGBUILD b/abs/extra/samba/PKGBUILD new file mode 100644 index 0000000..dba70bf --- /dev/null +++ b/abs/extra/samba/PKGBUILD @@ -0,0 +1,144 @@ +# $Id: PKGBUILD 94658 2010-10-09 09:44:15Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org +# Contributor: judd <jvinet@zeroflux.org> +pkgbase=samba +pkgname=('smbclient' 'samba') +pkgver=3.5.6 +# We use the 'A' to fake out pacman's version comparators. Samba chooses +# to append 'a','b',etc to their subsequent releases, which pamcan +# misconstrues as alpha, beta, etc. Bad samba! +_realver=3.5.6 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.samba.org" +license=('GPL3') +makedepends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'gnutls>=2.4.1' 'talloc' 'tdb') +options=(!makeflags) +source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz + samba samba.logrotate + swat.xinetd + samba.pam + samba.conf.d + fix-ipv6-mount.patch) +### UNINSTALL dmapi package before building!!! + +build() { + cd ${srcdir}/${pkgbase}-${_realver}/source3 + ./configure --prefix=/usr \ + --libdir=/usr/lib/ \ + --localstatedir=/var \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/cache/samba \ + --with-piddir=/var/run/samba \ + --with-fhs \ + --with-pam \ + --with-pam_smbpass \ + --with-pammodulesdir=/lib/security \ + --with-ads \ + --with-acl-support \ + --with-cifsmount \ + --with-libsmbclient \ + --with-syslog \ + --enable-external-libtalloc \ + --disable-dnssd \ + --disable-avahi \ + --with-cifsumount \ + --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash \ + --enable-external-libtdb + make || return 1 +} + +package_smbclient () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +depends=('readline>=6.0.00' 'popt' 'libldap>=2.4.18-1' 'libcap>=2.16' 'heimdal>=1.2-1' 'db>=4.7' 'e2fsprogs' 'tdb' 'talloc') + cd ${srcdir}/${pkgbase}-${_realver}/source3 + mkdir -p ${pkgdir}/usr/bin ${pkgdir}/sbin ${pkgdir}/usr/lib + install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ + install -m755 bin/{mount.cifs,umount.cifs} ${pkgdir}/sbin/ + for i in libnetapi* libwbclient* libsmbclient*;do + cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ + done + install -m755 script/smbtar ${pkgdir}/usr/bin/ + mkdir -p ${pkgdir}/usr/lib/cups/backend + ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb + mkdir -p ${pkgdir}/usr/include + install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ + install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ + mkdir -p ${pkgdir}/usr/share/man/man{1,7,8} + for man in smbspool \ + umount.cifs mount.cifs net; do + install -m644 ../docs/manpages/${man}.8 ${pkgdir}/usr/share/man/man8/ + done + for man in rpcclient smbcacls smbclient smbcquotas smbget \ + smbtree smbtar nmblookup; do + install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ + done + install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ +} + +package_samba () { +pkgdesc="Tools to access a server's filespace and printers via SMB" +backup=(etc/logrotate.d/samba + etc/pam.d/samba + etc/samba/smb.conf + etc/xinetd.d/swat + etc/conf.d/samba) +depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'gnutls>=2.4.1' 'e2fsprogs' 'tdb' 'talloc') + cd ${srcdir}/samba-${_realver}/source3 + mkdir -p ${pkgdir}/var/log/samba + mkdir -p ${pkgdir}/etc/samba/private + chmod 700 ${pkgdir}/etc/samba/private + make DESTDIR=${pkgdir} install || return 1 + chmod 644 ${pkgdir}/usr/include/*.h + rm -rf ${pkgdir}/usr/var + (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) + install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba + install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba + mkdir -p ${pkgdir}/etc/samba + cat ../examples/smb.conf.default | \ + sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default + install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba + install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat + install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba + # spool directory + install -d -m1777 ${pkgdir}/var/spool/samba + sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default + # fix logrotate + sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default + # nsswitch libraries + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so + ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2 + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so + # remove conflict files of smbclient + for man in libsmbclient smbspool \ + umount.cifs mount.cifs net; do + rm -f ${pkgdir}/usr/share/man/man8/${man}.8 + done + for i in libnetapi* libwbclient* libsmbclient*;do + rm -f ${pkgdir}/usr/lib/$i + done + for bin in net \ + nmblookup rpcclient smbcacls smbclient \ + smbcquotas smbget smbspool smbtar smbtree; do + rm -f ${pkgdir}/usr/bin/$bin + done + rm -f ${pkgdir}/usr/include/netapi.h + for man in rpcclient smbcacls smbclient smbcquotas \ + smbtree smbtar nmblookup smbget; do + rm -f ${pkgdir}/usr/share/man/man1/${man}.1 + done + for man in tdbbackup tdbdump tdbtool; do + rm -f ${pkgdir}/usr/share/man/man8/${man}.8 + done + rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 + rm -f ${pkgdir}/usr/include/libsmbclient.h + # copy ldap example + install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema +} +md5sums=('bf6c09ea497a166df8bd672db1d8da8f' + '891b9be03e7adf65c9a00319c76d33e5' + '5697da77590ec092cc8a883bae06093c' + 'a4bbfa39fee95bba2e7ad6b535fae7e6' + '96f82c38f3f540b53f3e5144900acf17' + 'f2f2e348acd1ccb566e95fa8a561b828' + 'c6a38a8c8fa24979e6217aed533358ea') diff --git a/abs/extra/samba/__changelog b/abs/extra/samba/__changelog new file mode 100644 index 0000000..24743b6 --- /dev/null +++ b/abs/extra/samba/__changelog @@ -0,0 +1,2 @@ +remove fam support +update to 3.5.6 diff --git a/abs/extra/samba/fix-ipv6-mount.patch b/abs/extra/samba/fix-ipv6-mount.patch new file mode 100644 index 0000000..89bef65 --- /dev/null +++ b/abs/extra/samba/fix-ipv6-mount.patch @@ -0,0 +1,11 @@ +--- client/mount.cifs.c.orig 2010-03-03 13:42:02.143936727 +1000 ++++ client/mount.cifs.c 2010-03-04 01:53:22.752879004 +1000 +@@ -1563,7 +1563,7 @@ + } + } + +- if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { ++ if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { + strlcat(options, "%", options_size); + current_len = strnlen(options, options_size); + optionstail = options + current_len; diff --git a/abs/extra/samba/samba b/abs/extra/samba/samba new file mode 100755 index 0000000..1b222d6 --- /dev/null +++ b/abs/extra/samba/samba @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba + +[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) + +case "$1" in + start) + rc=0 + stat_busy "Starting Samba Server" + if [ ! -x /var/run/samba ] ; then + install -m755 -g 81 -o 81 -d /var/run/samba + fi + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] && /usr/sbin/$d -D + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + add_daemon samba + stat_done + fi + ;; + stop) + rc=0 + stat_busy "Stopping Samba Server" + for d in ${SAMBA_DAEMONS[@]}; do + PID=`pidof -o %PPID /usr/sbin/$d` + [ -z "$PID" ] || kill $PID &> /dev/null + rc=$(($rc+$?)) + done + if [ $rc -gt 0 ]; then + stat_fail + else + rm /var/run/samba/smbd.pid &>/dev/null + rm /var/run/samba/nmbd.pid &>/dev/null + rm /var/run/samba/winbindd.pid &>/dev/null + rm_daemon samba + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/abs/extra/samba/samba.conf.d b/abs/extra/samba/samba.conf.d new file mode 100644 index 0000000..8721f95 --- /dev/null +++ b/abs/extra/samba/samba.conf.d @@ -0,0 +1,7 @@ +# +# Configuration for the samba init script +# + +# space separated list of daemons to launch +SAMBA_DAEMONS=(smbd nmbd) +#SAMBA_DAEMONS=(smbd nmbd winbindd) diff --git a/abs/extra/samba/samba.logrotate b/abs/extra/samba/samba.logrotate new file mode 100644 index 0000000..581f4c3 --- /dev/null +++ b/abs/extra/samba/samba.logrotate @@ -0,0 +1,9 @@ +/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { + notifempty + missingok + sharedscripts + copytruncate + postrotate + /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/abs/extra/samba/samba.pam b/abs/extra/samba/samba.pam new file mode 100644 index 0000000..53724d1 --- /dev/null +++ b/abs/extra/samba/samba.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/abs/extra/samba/swat.xinetd b/abs/extra/samba/swat.xinetd new file mode 100644 index 0000000..2e62a82 --- /dev/null +++ b/abs/extra/samba/swat.xinetd @@ -0,0 +1,10 @@ +service swat +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/swat + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} diff --git a/abs/extra/subversion/PKGBUILD b/abs/extra/subversion/PKGBUILD index dd24fd5..48d559e 100644 --- a/abs/extra/subversion/PKGBUILD +++ b/abs/extra/subversion/PKGBUILD @@ -1,94 +1,92 @@ -# $Id: PKGBUILD 77223 2010-04-11 14:13:33Z pierre $ +# $Id: PKGBUILD 98016 2010-11-03 03:22:18Z paul $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.6.9 -pkgrel=5 -pkgdesc="Replacement for CVS, another versioning system (svn)" +pkgver=1.6.13 +pkgrel=1 +pkgdesc="Replacement for CVS, another versioning system (SVN)" arch=('i686' 'x86_64') license=('apache' 'bsd') depends=('neon' 'apr-util') -makedepends=('heimdal' 'apache' 'python' 'perl' 'swig' 'ruby' 'java-runtime' - 'autoconf' 'sqlite3' 'db' 'e2fsprogs' ) +makedepends=('heimdal' 'apache' 'python' 'perl' 'swig' 'ruby' 'jdk' + 'autoconf' 'sqlite3' 'db' 'e2fsprogs') source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 svnserve svn svnserve.conf svnmerge.py subversion.rpath.fix.patch subversion.suppress.deprecation.warnings.patch) backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -url="http://subversion.tigris.org/" +url="http://subversion.apache.org/" provides=('svn') options=('!makeflags' '!libtool') -optdepends=( 'bash-completion: for svn bash completion') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion') build() { - cd ${srcdir}/${pkgname}-${pkgver} || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + + export PYTHON=/usr/bin/python2 # apply patches - patch -p0 < $srcdir/subversion.rpath.fix.patch || return 1 - patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch \ - || return 1 + patch -p0 < $srcdir/subversion.rpath.fix.patch + patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch # configure - autoreconf || return 1 + autoreconf ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ - --with-sqlite=/usr \ - --enable-javahl || return 1 + --with-zlib=/usr --with-neon=/usr --with-sqlite=/usr \ + --enable-javahl --with-gnome-keyring --with-apxs \ + --with-sqlite=/usr --with-jdk # build - (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) \ - || return 1 + (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} # install export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install - make DESTDIR=${pkgdir} swig-py || return 1 - make install-swig-py DESTDIR=${pkgdir} || return 1 + make DESTDIR=${pkgdir} swig-py + make install-swig-py DESTDIR=${pkgdir} - mkdir -p ${pkgdir}/usr/lib/python2.6 || return 1 - mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.6/site-packages \ - || return 1 + install -d ${pkgdir}/usr/lib/python2.7 + mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages - mkdir -p ${pkgdir}/usr/share/subversion || return 1 - install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ \ - || return 1 - rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in || return 1 + install -d ${pkgdir}/usr/share/subversion + install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ + rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in - make DESTDIR=${pkgdir} swig-pl || return 1 - make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor || return 1 - rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist \ - || return 1 - rm -rf ${pkgdir}/usr/lib/perl5/core_perl || return 1 + make DESTDIR=${pkgdir} swig-pl + make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor + rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -rf ${pkgdir}/usr/lib/perl5/core_perl - make DESTDIR=${pkgdir} swig-rb || return 1 - make install-swig-rb DESTDIR=${pkgdir} || return 1 + make DESTDIR=${pkgdir} swig-rb + make install-swig-rb DESTDIR=${pkgdir} - make DESTDIR=${pkgdir} javahl || return 1 - make DESTDIR=${pkgdir} install-javahl || return 1 + make DESTDIR=${pkgdir} javahl + make DESTDIR=${pkgdir} install-javahl - mkdir -p ${pkgdir}/etc/rc.d || return 1 - mkdir -p ${pkgdir}/etc/xinetd.d || return 1 - mkdir -p ${pkgdir}/etc/conf.d || return 1 + install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d} - install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d || return 1 - install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d || return 1 - install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve \ - || return 1 - install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge || return 1 + install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d + install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d + install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve + install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1 + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE # bash completion install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \ - ${pkgdir}/etc/bash_completion.d/subversion || return 1 + ${pkgdir}/etc/bash_completion.d/subversion } -md5sums=('9c30a47b1d48664e7afef68bb4834c53' +md5sums=('7ae1c827689f21cf975804005be30aeb' 'a2b029e8385007ffb99b437b30521c90' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' - '21bf3aa5b797ce98eba8307f30e9c070' + 'a6371baeda7e224504629ecdda2749b4' '6b4340ba9d8845cd8497e013ae01be3f' '1166f3b7413d7e7450299b3525680bbe') diff --git a/abs/extra/subversion/svnmerge.py b/abs/extra/subversion/svnmerge.py index da05949..d893164 100644 --- a/abs/extra/subversion/svnmerge.py +++ b/abs/extra/subversion/svnmerge.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # -*- coding: utf-8 -*- # Copyright (c) 2005, Giovanni Bajo # Copyright (c) 2004-2005, Awarix, Inc. |