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: 18-Jul-2009 00:42:16
Branch: HEAD Handle: 2009071723421600
Modified files:
openpkg-src/samba samba.patch samba.spec
Log:
upgrading package: samba 3.3.5 -> 3.4.0
Summary:
Revision Changes Path
1.24 +13 -13 openpkg-src/samba/samba.patch
1.144 +6 -6 openpkg-src/samba/samba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r1.23 -r1.24 samba.patch
--- openpkg-src/samba/samba.patch 28 Feb 2009 10:23:17 -0000 1.23
+++ openpkg-src/samba/samba.patch 17 Jul 2009 22:42:16 -0000 1.24
@@ -1,26 +1,26 @@
-Index: source/configure
---- source/configure.orig 2009-01-27 08:53:11 +0100
-+++ source/configure 2009-01-27 19:03:11 +0100
-@@ -11902,6 +11902,7 @@
+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 @@
- SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/popt"
-@@ -75472,6 +75473,8 @@
- else
- LIBWBCLIENT_STATIC=$LIBWBCLIENT_STATIC_TARGET
fi
+LIBWBCLIENT_STATIC=$LIBWBCLIENT_STATIC_TARGET
+LIBWBCLIENT_SHARED=$LIBWBCLIENT_STATIC_TARGET
- if test x"$HAVE_WINBIND" = x"yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-Index: source/lib/sysquotas_4A.c
---- source/lib/sysquotas_4A.c.orig 2009-01-26 14:56:34 +0100
-+++ source/lib/sysquotas_4A.c 2009-01-27 19:03:11 +0100
+
+ { $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp" >&5
+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
@@ -71,6 +71,10 @@
#define dqb_curinodes dqb_curfiles
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.143 -r1.144 samba.spec
--- openpkg-src/samba/samba.spec 16 Jun 2009 19:27:06 -0000 1.143
+++ openpkg-src/samba/samba.spec 17 Jul 2009 22:42:16 -0000 1.144
@@ -31,8 +31,8 @@
Class: BASE
Group: Filesystem
License: GPL
-Version: 3.3.5
-Release: 20090616
+Version: 3.4.0
+Release: 20090718
# package options
%option with_pam no
@@ -99,12 +99,12 @@
%patch -p0
%{l_shtool} subst \
-e
'/WINBINDD_SOCKET_DIR/s;/tmp/\.winbindd;%{l_prefix}/var/samba/tmp/.winbindd;' \
- source/nsswitch/winbind_struct_protocol.h
+ source3/nsswitch/winbind_struct_protocol.h
perl -e '$txt = join("", <STDIN>); $txt =~
s/(\$\(LIBS\))((?:[^\n]*\\\n)*[^\n]*)(\n)/$2 $1$3/sg; print STDOUT $txt;' \
- <source/Makefile.in >source/Makefile.in.new && mv
source/Makefile.in.new source/Makefile.in
+ <source3/Makefile.in >source3/Makefile.in.new && mv
source3/Makefile.in.new source3/Makefile.in
%build
- cd source
+ cd source3
CC="%{l_cc}"
CFLAGS="%{l_cflags -O}"
CPPFLAGS="%{l_cppflags openssl} -DOPENSSL_DISABLE_OLD_DES_SUPPORT"
@@ -188,7 +188,7 @@
$RPM_BUILD_ROOT%{l_prefix}/var/samba/netlogon \
$RPM_BUILD_ROOT%{l_prefix}/var/samba/tmp \
$RPM_BUILD_ROOT%{l_prefix}/var/samba/profiles
- ( cd source
+ ( cd source3
%{l_make} %{l_mflags} \
DESTDIR=$RPM_BUILD_ROOT \
LIBDIR=%{l_prefix}/lib/samba \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
