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: 02-Jul-2008 20:53:15
Branch: HEAD Handle: 2008070219513682
Modified files:
openpkg-src/samba samba.patch samba.spec
Log:
upgrading package: samba 3.0.30 -> 3.2.0
Summary:
Revision Changes Path
1.20 +6 -370 openpkg-src/samba/samba.patch
1.128 +5 -3 openpkg-src/samba/samba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r1.19 -r1.20 samba.patch
--- openpkg-src/samba/samba.patch 26 May 2007 09:48:28 -0000 1.19
+++ openpkg-src/samba/samba.patch 2 Jul 2008 18:51:36 -0000 1.20
@@ -1,359 +1,7 @@
-Index: source/Makefile.in
---- source/Makefile.in.orig 2007-05-23 17:29:19 +0200
-+++ source/Makefile.in 2007-05-26 11:37:01 +0200
-@@ -92,7 +92,7 @@
- # or in smb.conf (see smb.conf(5))
- LOGFILEBASE = @logfilebase@
- CONFIGFILE = $(CONFIGDIR)/smb.conf
--LMHOSTSFILE = $(CONFIGDIR)/lmhosts
-+LMHOSTSFILE = $(CONFIGDIR)/smb.hosts
-
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
-@@ -965,26 +965,26 @@
- @echo Linking $@
- @$(CC) $(FLAGS) -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]@: proto_exists $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
-- $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS)
$(LDAP_LIBS)
-+ $(AUTH_LIBS) $(PASSDB_LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
$(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(RPCCLIENT_OBJ) @BUILD_POPT@
bin/.dummy
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
-- $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ \
-- $(KRB5LIBS) $(LDAP_LIBS)
-+ $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ \
-+ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS)
$(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS)
$(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(TOOL_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-@@ -992,19 +992,19 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(NET_OBJ) @BUILD_POPT@
@BUILD_INIPARSER@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
@POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS)
$(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@
-+ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
$(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS)
$(NSCD_LIBS) @INIPARSERLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LDAP_LIBS)
@POPTLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(CUPS_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(MOUNT_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(MNT_OBJ) bin/.dummy
- @echo Linking $@
-@@ -1024,52 +1024,52 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LDAP_LIBS)
@POPTLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(STATUS_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(LDAP_LIBS) \
-- @POPTLIBS@
-+ @$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LDAP_LIBS) \
-+ @POPTLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SMBCONTROL_OBJ) @BUILD_POPT@
bin/.dummy
- @echo Linking $@
- @$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
- $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
-- $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@
-+ $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SMBPASSWD_OBJ) @BUILD_POPT@
bin/.dummy
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
-- $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
-+ $(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(PASSDB_LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(PASSDB_LIBS) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(NMBLOOKUP_OBJ) @BUILD_POPT@
bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
@POPTLIBS@ $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) @POPTLIBS@
$(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SMBTORTURE_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(TALLOCTORT_OBJ) bin/.dummy
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
-- $(DYNEXP) $(LIBS) $(LDAP_LIBS)
-+ $(DYNEXP) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: $(REPLACETORT_OBJ) bin/.dummy
- @echo Linking $@
-@@ -1078,49 +1078,49 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(MASKTEST_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(MSGTEST_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
@POPTLIBS@ \
-- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ \
-+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SMBCQUOTAS_OBJ) @BUILD_POPT@
bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
@POPTLIBS@ \
-- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
\
-+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(EVTLOGADM_OBJ) @BUILD_POPT@
bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS)
$(LDAP_LIBS) @POPTLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SHARESEC_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LDAP_LIBS)
@POPTLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(LOCKTEST_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(NSSTEST_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(PDBTEST_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(VFSTEST_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@
$(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS)
-+ @$(CC) $(FLAGS) -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 $@
-- @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS)
$(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(LOG2PCAP_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-@@ -1128,11 +1128,11 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(LOCKTEST2_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: $(RPCTORTURE_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS)
$(KRB5LIBS) $(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(DEBUG2HTML_OBJ) bin/.dummy
- @echo Linking $@
-@@ -1140,13 +1140,13 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(SMBFILTER_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS)
$(LDAP_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(KRB5LIBS)
$(LDAP_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(LIBADDNS_OBJ)
- @echo Linking libaddns shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBADDNS_OBJ) $(LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBADDNS_OBJ) \
- $(KRB5LIBS) $(UUID_LIBS)\
-- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBADDNS_MAJOR)
-+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBADDNS_MAJOR) $(LIBS)
-
- bin/libaddns.a: proto_exists $(LIBADDNS_OBJ)
- @echo Linking libaddns non-shared library $@
-@@ -1154,9 +1154,9 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(LIBSMBCLIENT_OBJ)
- @echo Linking libsmbclient shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) \
- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR)
-+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR) $(LIBS)
-
- bin/libsmbclient.a: proto_exists $(LIBSMBCLIENT_OBJ)
- @echo Linking libsmbclient non-shared library $@
-@@ -1164,9 +1164,9 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(LIBSMBSHAREMODES_OBJ)
- @echo Linking libsmbsharemodes shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_OBJ) $(LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_OBJ) \
- $(KRB5LIBS) $(LDAP_LIBS) \
-- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
-+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
$(LIBS)
-
- bin/libsmbsharemodes.a: proto_exists $(LIBSMBSHAREMODES_OBJ)
- @echo Linking libsmbsharemodes non-shared library $@
-@@ -1174,8 +1174,8 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(CAC_OBJ)
- @echo Linking libmsrpc shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS) \
-- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBMSRPC_MAJOR)
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) \
-+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBMSRPC_MAJOR) $(LIBS)
-
- bin/libmsrpc.a: proto_exists $(CAC_OBJ)
- @echo Linking libmsrpc non-shared library $@
-@@ -1184,9 +1184,9 @@
- # This is probably wrong for anything other than the GNU linker.
- bin/[EMAIL PROTECTED]@: proto_exists $(LIBBIGBALLOFMUD_OBJ)
- @echo Linking bigballofmud shared library $@
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) $(LIBS) \
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \
- $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
-- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR)
-+ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR)
$(LIBS)
- ln -snf libbigballofmud.so bin/libbigballofmud.so.0
-
- # It would be nice to build a static bigballofmud too, but when I try
-@@ -1276,8 +1276,8 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
- @echo "Linking $@"
-- @$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)
-+ @$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) \
-+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS)
-
- @WINBIND_NSS@: $(WINBIND_NSS_OBJ)
- @echo "Linking $@"
-@@ -1287,14 +1287,14 @@
- @WINBIND_WINS_NSS@: proto_exists $(WINBIND_WINS_NSS_OBJ)
- @echo "Linking $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
-- $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) \
-- @[EMAIL PROTECTED] [EMAIL PROTECTED]@NSSSONAMEVERSIONSUFFIX@
-+ $(LDAP_LIBS) $(KRB5LIBS) \
-+ @[EMAIL PROTECTED] [EMAIL PROTECTED]@NSSSONAMEVERSIONSUFFIX@
$(LIBS)
-
- @SMB_KRB5_LOCATOR@: proto_exists $(SMB_KRB5_LOCATOR_OBJ)
- @echo "Linking $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(SMB_KRB5_LOCATOR_OBJ) \
-- $(LDAP_LIBS) $(LIBS) -lcom_err \
-- @[EMAIL PROTECTED] [EMAIL PROTECTED]
-+ $(LDAP_LIBS) -lcom_err \
-+ @[EMAIL PROTECTED] [EMAIL PROTECTED] $(LIBS)
-
- bin/[EMAIL PROTECTED]@: $(PAM_WINBIND_OBJ) bin/.dummy
- @echo "Linking shared library $@"
-@@ -1520,30 +1520,30 @@
-
- bin/[EMAIL PROTECTED]@: proto_exists $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS)
$(LDAP_LIBS) @POPTLIBS@
-+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LDAP_LIBS)
@POPTLIBS@ $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(NTLM_AUTH_OBJ) $(PARAM_OBJ)
$(LIB_NONSMBD_OBJ) \
- @BUILD_POPT@ bin/.dummy
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
-- $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
-- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
-+ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: $(PAM_SMBPASS_OBJ)
- @echo "Linking shared library $@"
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS)
$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP)
$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists $(TDBBACKUP_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ)
-+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(TDBBACKUP_OBJ) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: $(TDBTOOL_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBTOOL_OBJ)
-+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(TDBTOOL_OBJ) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: $(TDBDUMP_OBJ) bin/.dummy
- @echo Linking $@
-- @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS) $(TDBDUMP_OBJ)
-+ @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(TDBDUMP_OBJ) $(LIBS)
-
- bin/[EMAIL PROTECTED]@: proto_exists bin/[EMAIL PROTECTED]@
torture/t_strcmp.o
- $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin
-lbigballofmud
-@@ -1666,7 +1666,7 @@
- fi
- PYTHON_OBJS="$(PYTHON_OBJ)" \
- PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
-- LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS)
$(LDAP_LIBS)" \
-+ LIBS="$(LDFLAGS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)
$(LIBS)" \
- $(PYTHON) python/setup.py build
-
- python_install: $(PYTHON_OBJ)
Index: source/lib/sysquotas_4A.c
---- source/lib/sysquotas_4A.c.orig 2005-09-29 23:52:43 +0200
-+++ source/lib/sysquotas_4A.c 2007-05-26 11:37:01 +0200
-@@ -72,6 +72,10 @@
+--- source/lib/sysquotas_4A.c.orig 2008-07-01 14:33:07 +0200
++++ source/lib/sysquotas_4A.c 2008-07-01 21:00:55 +0200
+@@ -71,6 +71,10 @@
#define dqb_curinodes dqb_curfiles
#endif
@@ -364,22 +12,10 @@
#ifdef INITQFNAMES
#define USERQUOTAFILE_EXTENSION ".user"
#else
-Index: source/nsswitch/winbindd_util.c
---- source/nsswitch/winbindd_util.c.orig 2007-05-11 00:09:34 +0200
-+++ source/nsswitch/winbindd_util.c 2007-05-26 11:37:01 +0200
-@@ -936,7 +936,7 @@
- {
- if (_winbindd_priv_socket == -1) {
- _winbindd_priv_socket = create_pipe_sock(
-- get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME,
0750);
-+ get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME,
0755);
- DEBUG(10, ("open_winbindd_priv_socket: opened socket fd %d\n",
- _winbindd_priv_socket));
- }
Index: source/smbd/uid.c
---- source/smbd/uid.c.orig 2007-05-23 17:29:15 +0200
-+++ source/smbd/uid.c 2007-05-26 11:38:34 +0200
-@@ -158,7 +158,11 @@
+--- source/smbd/uid.c.orig 2008-07-01 14:33:07 +0200
++++ source/smbd/uid.c 2008-07-01 21:00:55 +0200
+@@ -157,7 +157,11 @@
NT_USER_TOKEN *token = NULL;
int num_groups = 0;
gid_t *group_list = NULL;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.127 -r1.128 samba.spec
--- openpkg-src/samba/samba.spec 30 May 2008 10:46:46 -0000 1.127
+++ openpkg-src/samba/samba.spec 2 Jul 2008 18:52:58 -0000 1.128
@@ -31,8 +31,8 @@
Class: BASE
Group: Filesystem
License: GPL
-Version: 3.0.30
-Release: 20080530
+Version: 3.2.0
+Release: 20080702
# package options
%option with_pam no
@@ -99,7 +99,9 @@
%patch -p0
%{l_shtool} subst \
-e
'/WINBINDD_SOCKET_DIR/s;/tmp/\.winbindd;%{l_prefix}/var/samba/tmp/.winbindd;' \
- source/nsswitch/winbindd_nss.h
+ source/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
%build
cd source
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
