OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 19-Jul-2009 14:06:32
Branch: HEAD Handle: 2009071913063200
Modified files:
openpkg-src/samba samba.patch samba.spec smb.conf
Log:
adjust packaging for new Samba 3.4 world order
Summary:
Revision Changes Path
1.25 +11 -19 openpkg-src/samba/samba.patch
1.145 +6 -4 openpkg-src/samba/samba.spec
1.13 +0 -1 openpkg-src/samba/smb.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r1.24 -r1.25 samba.patch
--- openpkg-src/samba/samba.patch 17 Jul 2009 22:42:16 -0000 1.24
+++ openpkg-src/samba/samba.patch 19 Jul 2009 12:06:32 -0000 1.25
@@ -1,26 +1,18 @@
Index: source3/configure
--- source3/configure.orig 2009-07-03 13:46:28 +0200
-+++ source3/configure 2009-07-18 00:15:39 +0200
-@@ -12692,6 +12692,7 @@
- SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
- SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
- SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/iniparser/src"
- SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
-
- SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
-@@ -75436,6 +75437,8 @@
-
-
- fi
-+LIBWBCLIENT_STATIC=$LIBWBCLIENT_STATIC_TARGET
-+LIBWBCLIENT_SHARED=$LIBWBCLIENT_STATIC_TARGET
-
-
- { $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp" >&5
++++ source3/configure 2009-07-19 13:39:21 +0200
+@@ -78688,7 +78689,7 @@
+ LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
+ LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
+ LIBWBCLIENT_SOVER=0
+- if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a
x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
++ if false; then
+ NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
+ ## Only worry about libwbclient if we have shared
+ # library support
Index: source3/lib/sysquotas_4A.c
--- source3/lib/sysquotas_4A.c.orig 2009-07-03 13:21:14 +0200
-+++ source3/lib/sysquotas_4A.c 2009-07-18 00:14:46 +0200
++++ source3/lib/sysquotas_4A.c 2009-07-19 13:37:58 +0200
@@ -71,6 +71,10 @@
#define dqb_curinodes dqb_curfiles
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.144 -r1.145 samba.spec
--- openpkg-src/samba/samba.spec 17 Jul 2009 22:42:16 -0000 1.144
+++ openpkg-src/samba/samba.spec 19 Jul 2009 12:06:32 -0000 1.145
@@ -32,7 +32,7 @@
Group: Filesystem
License: GPL
Version: 3.4.0
-Release: 20090718
+Release: 20090719
# package options
%option with_pam no
@@ -99,7 +99,7 @@
%patch -p0
%{l_shtool} subst \
-e
'/WINBINDD_SOCKET_DIR/s;/tmp/\.winbindd;%{l_prefix}/var/samba/tmp/.winbindd;' \
- source3/nsswitch/winbind_struct_protocol.h
+ nsswitch/winbind_struct_protocol.h
perl -e '$txt = join("", <STDIN>); $txt =~
s/(\$\(LIBS\))((?:[^\n]*\\\n)*[^\n]*)(\n)/$2 $1$3/sg; print STDOUT $txt;' \
<source3/Makefile.in >source3/Makefile.in.new && mv
source3/Makefile.in.new source3/Makefile.in
@@ -133,7 +133,7 @@
--libexecdir=%{l_prefix}/libexec/samba \
--localstatedir=%{l_prefix}/var/samba/run \
--sysconfdir=%{l_prefix}/etc/samba \
- --with-libdir=%{l_prefix}/lib/samba \
+ --libdir=%{l_prefix}/lib/samba \
--with-privatedir=%{l_prefix}/etc/samba \
--with-configdir=%{l_prefix}/etc/samba \
--with-lockdir=%{l_prefix}/var/samba/run/locks \
@@ -171,8 +171,10 @@
%else
--without-ads \
%endif
- --with-vfs \
+ --without-wbclient \
--disable-dnssd \
+ --disable-fam \
+ --disable-avahi \
--disable-pie \
--disable-cups \
$options
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/smb.conf
============================================================================
$ cvs diff -u -r1.12 -r1.13 smb.conf
--- openpkg-src/samba/smb.conf 24 Jan 2006 16:28:16 -0000 1.12
+++ openpkg-src/samba/smb.conf 19 Jul 2009 12:06:32 -0000 1.13
@@ -15,7 +15,6 @@
lock directory = @l_prefix@/var/samba/run/locks
security = user
encrypt passwords = yes
- share modes = no
printing = bsd
printcap name = /etc/printcap
load printers = yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
