[arch-commits] Commit in samba/repos (8 files)

Tobias Powalowski tpowa at archlinux.org
Thu Aug 25 15:59:32 UTC 2011


    Date: Thursday, August 25, 2011 @ 11:59:32
  Author: tpowa
Revision: 136305

remove wrong directory

Added:
  samba/repos/testing-i686/
  samba/repos/testing-i686/PKGBUILD
    (from rev 136304, samba/trunk/PKGBUILD)
  samba/repos/testing-i686/fix-ipv6-mount.patch
    (from rev 136304, samba/trunk/fix-ipv6-mount.patch)
  samba/repos/testing-i686/samba
    (from rev 136304, samba/trunk/samba)
  samba/repos/testing-i686/samba.conf.d
    (from rev 136304, samba/trunk/samba.conf.d)
  samba/repos/testing-i686/samba.logrotate
    (from rev 136304, samba/trunk/samba.logrotate)
  samba/repos/testing-i686/samba.pam
    (from rev 136304, samba/trunk/samba.pam)
  samba/repos/testing-i686/swat.xinetd
    (from rev 136304, samba/trunk/swat.xinetd)

----------------------+
 PKGBUILD             |  163 +++++++++++++++++++++++++++++++++++++++++++++++++
 fix-ipv6-mount.patch |   11 +++
 samba                |   57 +++++++++++++++++
 samba.conf.d         |    7 ++
 samba.logrotate      |    9 ++
 samba.pam            |    3 
 swat.xinetd          |   10 +++
 7 files changed, 260 insertions(+)

Copied: samba/repos/testing-i686/PKGBUILD (from rev 136304, samba/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2011-08-25 15:59:32 UTC (rev 136305)
@@ -0,0 +1,163 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+pkgbase=samba
+pkgname=('smbclient' 'samba')
+pkgver=3.6.0
+# 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.6.0
+pkgrel=3
+arch=(i686 x86_64)
+url="http://www.samba.org"
+license=('GPL3')
+makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam'
+'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'python2')
+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
+  sed -i "s/env python/env python2/g" ../buildtools/bin/waf 
+  ./autogen-waf.sh
+  # everything needs to be specified :/
+  ../buildtools/bin/waf configure --prefix=/usr \
+              --with-privatedir=/etc/samba/private \
+              --libdir=/usr/lib/ \
+              --with-modulesdir=/usr/lib/samba \
+              --with-swatdir=/usr/share/samba/swat \
+              --localstatedir=/var \
+              --with-configdir=/etc/samba \
+              --with-lockdir=/var/cache/samba \
+              --with-cachedir=/var/cache/samba \
+              --with-statedir=/var/cache/samba \
+              --with-piddir=/var/run/samba \
+              --with-logfilebase=/var/log/samba \
+              --sysconfdir=/etc \
+              --with-pam \
+              --with-pam_smbpass \
+              --with-pammodulesdir=/lib/security \
+              --with-ads \
+              --with-acl-support \
+              --with-syslog \
+              --disable-avahi \
+              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
+              --disable-rpath \
+              --disable-rpath-private-install \
+              --disable-rpath-install
+  #fix the shitty build system!
+   sed -i -e 's#/etc/smb.conf#/etc/samba/smb.conf#g' bin/default/source3/include/config.h
+  ../buildtools/bin/waf build ${MAKEFLAGS} 
+}
+
+package_smbclient () {
+pkgdesc="Tools to access a server's filespace and printers via SMB"
+depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc')
+  cd ${srcdir}/${pkgbase}-${_realver}/source3
+  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
+  install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
+  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so; do
+    install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/$i
+  done
+  for i in libsmbconf libnetapi libwbclient libsmbclient; do
+    install -m644 -D bin/shared/$i.so.0  ${pkgdir}/usr/lib/$i.so.0
+    ln -sf /usr/lib/$i.so.0  ${pkgdir}/usr/lib/$i.so
+  done
+  mkdir ${pkgdir}/usr/lib/libsmb
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
+  ln -sf /usr/lib/libsmb/libsmbclient.so.0  ${pkgdir}/usr/lib/libsmb/libsmbclient.so
+  for i in libndr-krb5pac libndr-standard libndr; do
+    install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
+    ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
+    ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so
+  done
+  install -m644 -D bin/shared/private/libtevent.so.0 ${pkgdir}/usr/lib/libtevent.so.0.9.11
+  ln -sf /usr/lib/samba/libtevent.so.0.9.11  ${pkgdir}/usr/lib/libtevent.so.0
+  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}
+  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' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
+optdepends=('python2: for python bindings')
+  cd ${srcdir}/samba-${_realver}/source3
+  mkdir -p ${pkgdir}/etc/samba/private
+  chmod 700 ${pkgdir}/etc/samba/private
+  ../buildtools/bin/waf install --destdir=${pkgdir}
+  chmod 644 ${pkgdir}/usr/include/*.h
+  rm -rf ${pkgdir}/usr/var
+  install -D -m755 ${startdir}/samba ${pkgdir}/etc/rc.d/samba
+  install -D -m644 ${startdir}/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 ${startdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba
+  install -D -m644 ${startdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat
+  install -D -m644 ${startdir}/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
+  # remove conflict files of smbclient
+  for man in libsmbclient smbspool \
+      mount.cifs net cifs.upcall; do
+      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
+  done
+  for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so libtevent.so.0.9.11 libtevent.so.0; do
+      rm -f ${pkgdir}/usr/lib/samba/$i
+  done
+  mv ${pkgdir}/usr/lib/samba/*.so ${pkgdir}/usr/lib
+  for i in libndr-krb5pac.* libsmbconf.*  libndr-standard.* libndr.* 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 -r ${pkgdir}/usr/lib/libsmb
+  rm -f ${pkgdir}/usr/sbin/cifs.upcall
+  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=(e297e0ea7923c7de8d7c1d8fd0ec0a05
+         a3da19515a234c703876cf850c44e996
+         5697da77590ec092cc8a883bae06093c
+         a4bbfa39fee95bba2e7ad6b535fae7e6
+         96f82c38f3f540b53f3e5144900acf17
+         f2f2e348acd1ccb566e95fa8a561b828
+         c6a38a8c8fa24979e6217aed533358ea)

Copied: samba/repos/testing-i686/fix-ipv6-mount.patch (from rev 136304, samba/trunk/fix-ipv6-mount.patch)
===================================================================
--- testing-i686/fix-ipv6-mount.patch	                        (rev 0)
+++ testing-i686/fix-ipv6-mount.patch	2011-08-25 15:59:32 UTC (rev 136305)
@@ -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; 

Copied: samba/repos/testing-i686/samba (from rev 136304, samba/trunk/samba)
===================================================================
--- testing-i686/samba	                        (rev 0)
+++ testing-i686/samba	2011-08-25 15:59:32 UTC (rev 136305)
@@ -0,0 +1,57 @@
+#!/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
+                if [ ! -x /var/log/samba ] ; then
+                        install -m755 -g 81 -o 81 -d /var/log/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

Copied: samba/repos/testing-i686/samba.conf.d (from rev 136304, samba/trunk/samba.conf.d)
===================================================================
--- testing-i686/samba.conf.d	                        (rev 0)
+++ testing-i686/samba.conf.d	2011-08-25 15:59:32 UTC (rev 136305)
@@ -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)

Copied: samba/repos/testing-i686/samba.logrotate (from rev 136304, samba/trunk/samba.logrotate)
===================================================================
--- testing-i686/samba.logrotate	                        (rev 0)
+++ testing-i686/samba.logrotate	2011-08-25 15:59:32 UTC (rev 136305)
@@ -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
+}

Copied: samba/repos/testing-i686/samba.pam (from rev 136304, samba/trunk/samba.pam)
===================================================================
--- testing-i686/samba.pam	                        (rev 0)
+++ testing-i686/samba.pam	2011-08-25 15:59:32 UTC (rev 136305)
@@ -0,0 +1,3 @@
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so

Copied: samba/repos/testing-i686/swat.xinetd (from rev 136304, samba/trunk/swat.xinetd)
===================================================================
--- testing-i686/swat.xinetd	                        (rev 0)
+++ testing-i686/swat.xinetd	2011-08-25 15:59:32 UTC (rev 136305)
@@ -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
+}




More information about the arch-commits mailing list