OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Dec-2006 09:49:58
Branch: HEAD Handle: 2006121108495601
Modified files:
openpkg-src/samba samba.patch samba.spec
Log:
upgrading package: samba 3.0.23c -> 3.0.23d
Summary:
Revision Changes Path
1.17 +59 -40 openpkg-src/samba/samba.patch
1.109 +2 -2 openpkg-src/samba/samba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 samba.patch
--- openpkg-src/samba/samba.patch 15 Jul 2006 16:26:55 -0000 1.16
+++ openpkg-src/samba/samba.patch 11 Dec 2006 08:49:56 -0000 1.17
@@ -1,6 +1,6 @@
Index: source/Makefile.in
---- source/Makefile.in.orig 2006-07-10 18:27:55 +0200
-+++ source/Makefile.in 2006-07-15 18:03:28 +0200
+--- source/Makefile.in.orig 2006-11-14 15:42:15 +0100
++++ source/Makefile.in 2006-12-10 17:12:55 +0100
@@ -86,7 +86,7 @@
# or in smb.conf (see smb.conf(5))
LOGFILEBASE = @logfilebase@
@@ -10,7 +10,12 @@
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
-@@ -914,42 +914,42 @@
+@@ -922,46 +922,46 @@
+ @echo Linking $@
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS)
\
+ $(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
+- $(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @SMBD_LIBS@
++ $(ACL_LIBS) $(PASSDB_LIBS) @POPTLIBS@ @SMBD_LIBS@ $(LIBS)
bin/[EMAIL PROTECTED]@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -63,7 +68,7 @@
bin/[EMAIL PROTECTED]@: $(MNT_OBJ) bin/.dummy
@echo Linking $@
-@@ -969,47 +969,47 @@
+@@ -981,47 +981,47 @@
bin/[EMAIL PROTECTED]@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -98,12 +103,12 @@
bin/[EMAIL PROTECTED]@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -122,7 +127,7 @@
bin/[EMAIL PROTECTED]@: $(TALLOCTORT_OBJ) bin/.dummy
@echo Linking $@
-@@ -1017,39 +1017,39 @@
+@@ -1029,41 +1029,41 @@
bin/[EMAIL PROTECTED]@: $(MASKTEST_OBJ) bin/.dummy
@echo Linking $@
@@ -136,13 +141,17 @@
bin/[EMAIL PROTECTED]@: $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@ \
+- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCACLS_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ \
++ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(SMBCQUOTAS_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@ \
+- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ \
++ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -157,12 +166,12 @@
bin/[EMAIL PROTECTED]@: $(NSSTEST_OBJ) bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(VFSTEST_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(LIBS)
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -171,7 +180,7 @@
bin/[EMAIL PROTECTED]@: $(LOG2PCAP_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-@@ -1057,11 +1057,11 @@
+@@ -1071,11 +1071,11 @@
bin/[EMAIL PROTECTED]@: $(LOCKTEST2_OBJ) bin/.dummy
@echo Linking $@
@@ -185,7 +194,7 @@
bin/[EMAIL PROTECTED]@: $(DEBUG2HTML_OBJ) bin/.dummy
@echo Linking $@
-@@ -1069,11 +1069,11 @@
+@@ -1083,11 +1083,11 @@
bin/[EMAIL PROTECTED]@: $(SMBFILTER_OBJ) bin/.dummy
@echo Linking $@
@@ -199,15 +208,15 @@
bin/[EMAIL PROTECTED]@: $(SMBSH_OBJ) bin/.dummy
@echo Linking $@
-@@ -1081,15 +1081,15 @@
+@@ -1095,15 +1095,15 @@
bin/[EMAIL PROTECTED]@: $(PICOBJS) bin/.dummy
@echo Linking shared library $@
- @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \
-- $(KRB5LIBS) $(LDAP_LIBS) \
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) \
-+ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) \
- @[EMAIL PROTECTED] [EMAIL PROTECTED]
+ $(KRB5LIBS) $(LDAP_LIBS) \
+- @[EMAIL PROTECTED] [EMAIL PROTECTED]
++ @[EMAIL PROTECTED] [EMAIL PROTECTED] $(LIBS)
bin/[EMAIL PROTECTED]@: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient shared library $@
@@ -219,7 +228,7 @@
bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient non-shared library $@
-@@ -1097,9 +1097,9 @@
+@@ -1111,9 +1111,9 @@
bin/[EMAIL PROTECTED]@: $(LIBSMBSHAREMODES_PICOBJS)
@echo Linking libsmbsharemodes shared library $@
@@ -231,7 +240,7 @@
bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
@echo Linking libsmbsharemodes non-shared library $@
-@@ -1107,8 +1107,8 @@
+@@ -1121,8 +1121,8 @@
bin/[EMAIL PROTECTED]@: $(CAC_PICOBJS)
@echo Linking libmsrpc shared library $@
@@ -242,7 +251,7 @@
bin/libmsrpc.a: $(CAC_PICOBJS)
@echo Linking libmsrpc non-shared library $@
-@@ -1117,9 +1117,9 @@
+@@ -1131,9 +1131,9 @@
# This is probably wrong for anything other than the GNU linker.
bin/[EMAIL PROTECTED]@: $(LIBBIGBALLOFMUD_PICOBJS)
@echo Linking bigballofmud shared library $@
@@ -254,18 +263,18 @@
ln -snf libbigballofmud.so bin/libbigballofmud.so.0
# It would be nice to build a static bigballofmud too, but when I try
-@@ -1198,8 +1198,8 @@
+@@ -1212,8 +1212,8 @@
bin/[EMAIL PROTECTED]@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
@echo "Linking $@"
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) \
-- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(NSCD_LIBS)
+- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS)
$(DYNEXP) \
-+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(NSCD_LIBS)
$(LIBS)
++ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS)
# Please don't add .o files to libnss_winbind, libnss_wins, or the
pam_winbind
# libraries. Add to the appropriate PICOBJ variable instead.
-@@ -1361,47 +1361,47 @@
+@@ -1375,54 +1375,54 @@
bin/[EMAIL PROTECTED]@: $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -277,9 +286,9 @@
@echo Linking $@
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP)
$(NTLM_AUTH_OBJ) \
- $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
-- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
+- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
+ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
++ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(PAM_SMBPASS_PICOOBJ)
@echo "Linking shared library $@"
@@ -289,7 +298,7 @@
bin/[EMAIL PROTECTED]@: $(TDBBACKUP_OBJ) bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS)
$(TDBBACKUP_OBJ) @SOCKWRAP@
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP)
$(TDBBACKUP_OBJ) @SOCKWRAP@ $(LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP)
$(TDBBACKUP_OBJ) @SOCKWRAP@ $(LIBS)
bin/[EMAIL PROTECTED]@: $(TDBTOOL_OBJ) bin/.dummy
@echo Linking $@
@@ -314,18 +323,28 @@
+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_strappend.o -L
./bin -lbigballofmud $(LIBS)
bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_stringoverflow.o
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_stringoverflow.o
-L./bin -lbigballofmud
+- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_stringoverflow.o
-L./bin -lbigballofmud
++ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_stringoverflow.o
-L./bin -lbigballofmud $(LIBS)
bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_doschar.o
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS)
torture/t_doschar.o -L ./bin -lbigballofmud
-+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_doschar.o -L
./bin -lbigballofmud $(LIBS)
++ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP)torture/t_doschar.o -L
./bin -lbigballofmud $(LIBS)
bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_push_ucs2.o
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS)
torture/t_push_ucs2.o -L ./bin -lbigballofmud
+ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_push_ucs2.o -L
./bin -lbigballofmud $(LIBS)
bin/[EMAIL PROTECTED]@: lib/snprintf.c
- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF
lib/snprintf.c -lm
-@@ -1499,7 +1499,7 @@
+- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF
lib/snprintf.c -lm
++ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF
lib/snprintf.c -lm $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: script/tests/timelimit.o
+ @echo Linking $@
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o
$(LIBS)
+
+ install: installservers installbin @INSTALL_CIFSMOUNT@ installman
installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@
@INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@
+
+@@ -1513,7 +1513,7 @@
fi
PYTHON_OBJS="$(PYTHON_PICOBJS)" \
PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
@@ -336,7 +355,7 @@
python_install: $(PYTHON_PICOBJS)
Index: source/lib/sysquotas_4A.c
--- source/lib/sysquotas_4A.c.orig 2005-09-29 23:52:43 +0200
-+++ source/lib/sysquotas_4A.c 2006-07-15 17:37:40 +0200
++++ source/lib/sysquotas_4A.c 2006-12-10 17:08:04 +0100
@@ -72,6 +72,10 @@
#define dqb_curinodes dqb_curfiles
#endif
@@ -349,9 +368,9 @@
#define USERQUOTAFILE_EXTENSION ".user"
#else
Index: source/nsswitch/winbindd_util.c
---- source/nsswitch/winbindd_util.c.orig 2006-06-23 15:16:50 +0200
-+++ source/nsswitch/winbindd_util.c 2006-07-15 17:37:40 +0200
-@@ -920,7 +920,7 @@
+--- source/nsswitch/winbindd_util.c.orig 2006-11-14 15:42:13 +0100
++++ source/nsswitch/winbindd_util.c 2006-12-10 17:08:04 +0100
+@@ -935,7 +935,7 @@
{
if (_winbindd_priv_socket == -1) {
_winbindd_priv_socket = create_pipe_sock(
@@ -362,7 +381,7 @@
}
Index: source/smbd/uid.c
--- source/smbd/uid.c.orig 2006-04-20 04:29:19 +0200
-+++ source/smbd/uid.c 2006-07-15 17:37:40 +0200
++++ source/smbd/uid.c 2006-12-10 17:08:04 +0100
@@ -152,6 +152,10 @@
BOOL must_free_token = False;
NT_USER_TOKEN *token = NULL;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.108 -r1.109 samba.spec
--- openpkg-src/samba/samba.spec 13 Oct 2006 17:33:59 -0000 1.108
+++ openpkg-src/samba/samba.spec 11 Dec 2006 08:49:57 -0000 1.109
@@ -32,8 +32,8 @@
Class: BASE
Group: Filesystem
License: GPL
-Version: 3.0.23c
-Release: 20061013
+Version: 3.0.23d
+Release: 20061211
# package options
%option with_pam no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
