OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Jul-2006 09:39:12
Branch: HEAD Handle: 2006071108391100
Modified files:
openpkg-src/samba samba.patch samba.spec
Log:
upgrading package: samba 3.0.22 -> 3.0.23
Summary:
Revision Changes Path
1.15 +43 -35 openpkg-src/samba/samba.patch
1.102 +2 -2 openpkg-src/samba/samba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 samba.patch
--- openpkg-src/samba/samba.patch 25 Feb 2006 09:27:13 -0000 1.14
+++ openpkg-src/samba/samba.patch 11 Jul 2006 07:39:11 -0000 1.15
@@ -1,7 +1,7 @@
Index: source/Makefile.in
---- source/Makefile.in.orig 2006-02-20 21:33:23 +0100
-+++ source/Makefile.in 2006-02-25 09:39:49 +0100
-@@ -77,7 +77,7 @@
+--- source/Makefile.in.orig 2006-07-10 18:27:55 +0200
++++ source/Makefile.in 2006-07-11 09:16:33 +0200
+@@ -86,7 +86,7 @@
# or in smb.conf (see smb.conf(5))
LOGFILEBASE = @logfilebase@
CONFIGFILE = $(CONFIGDIR)/smb.conf
@@ -10,16 +10,18 @@
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
-@@ -885,7 +885,7 @@
+@@ -910,46 +910,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 $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(WREPL_OBJ) @BUILD_POPT@ bin/.dummy
- @echo Linking $@
-@@ -894,37 +894,37 @@
bin/[EMAIL PROTECTED]@: $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP)
$(PRINT_LIBS) \
@@ -42,12 +44,12 @@
bin/[EMAIL PROTECTED]@: $(TOOL_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TOOL_OBJ) $(LDFLAGS) $(DYNEXP)
$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -Lbin
-lsmbclient
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TOOL_OBJ) $(LDFLAGS) $(DYNEXP)
$(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -Lbin
-lsmbclient $(LIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TOOL_OBJ) $(LDFLAGS) $(DYNEXP)
$(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) -Lbin
-lsmbclient
bin/[EMAIL PROTECTED]@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS)
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS)
$(TERMLIBS)
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS)
$(LIBS)
bin/[EMAIL PROTECTED]@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -66,7 +68,7 @@
bin/[EMAIL PROTECTED]@: $(MNT_OBJ) bin/.dummy
@echo Linking $@
-@@ -936,47 +936,47 @@
+@@ -969,47 +969,47 @@
bin/[EMAIL PROTECTED]@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -82,22 +84,21 @@
bin/[EMAIL PROTECTED]@: $(SMBCONTROL_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
- @$(CC) -DUSING_SMBCONTROL $(FLAGS) @PIE_LDFLAGS@ -o $@
$(SMBCONTROL_OBJ) $(DYNEXP) \
-- $(LDFLAGS) $(LIBS) \
-- @POPTLIBS@
-+ $(LDFLAGS) \
-+ @POPTLIBS@ $(LIBS)
+ @$(CC) -DUSING_SMBCONTROL $(FLAGS) @PIE_LDFLAGS@ -o $@ \
+ $(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
+- $(LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@
++ @LIBUNWIND_PTRACE@ @POPTLIBS@ $(LIBS)
bin/[EMAIL PROTECTED]@: $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
- bin/[EMAIL PROTECTED]@: $(SMBPASSWD_OBJ) bin/.dummy
+ bin/[EMAIL PROTECTED]@: $(SMBPASSWD_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS)
$(PASSDB_LIBS) \
-- $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+ $(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
+- $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
++ $(DYNEXP) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -121,12 +122,12 @@
bin/[EMAIL PROTECTED]@: $(SMBTORTURE_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS)
$(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS)
$(DYNEXP) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(TALLOCTORT_OBJ) bin/.dummy
@echo Linking $@
-@@ -984,39 +984,39 @@
+@@ -1017,39 +1017,39 @@
bin/[EMAIL PROTECTED]@: $(MASKTEST_OBJ) bin/.dummy
@echo Linking $@
@@ -135,7 +136,7 @@
bin/[EMAIL PROTECTED]@: $(MSGTEST_OBJ) bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP)
$(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
bin/[EMAIL PROTECTED]@: $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
@@ -150,7 +151,7 @@
bin/[EMAIL PROTECTED]@: $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(EVTLOGADM_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(EVTLOGADM_OBJ) $(DYNEXP)
$(LDFLAGS) $(LIBS) @POPTLIBS@
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(EVTLOGADM_OBJ) $(DYNEXP)
$(LDFLAGS) @POPTLIBS@ $(LIBS)
bin/[EMAIL PROTECTED]@: $(LOCKTEST_OBJ) bin/.dummy
@@ -165,8 +166,8 @@
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)
-+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_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@
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(VFSTEST_OBJ) $(LDFLAGS)
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS)
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(LIBS)
bin/[EMAIL PROTECTED]@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -175,7 +176,7 @@
bin/[EMAIL PROTECTED]@: $(LOG2PCAP_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-@@ -1024,11 +1024,11 @@
+@@ -1057,11 +1057,11 @@
bin/[EMAIL PROTECTED]@: $(LOCKTEST2_OBJ) bin/.dummy
@echo Linking $@
@@ -189,7 +190,7 @@
bin/[EMAIL PROTECTED]@: $(DEBUG2HTML_OBJ) bin/.dummy
@echo Linking $@
-@@ -1036,11 +1036,11 @@
+@@ -1069,11 +1069,11 @@
bin/[EMAIL PROTECTED]@: $(SMBFILTER_OBJ) bin/.dummy
@echo Linking $@
@@ -203,7 +204,7 @@
bin/[EMAIL PROTECTED]@: $(SMBSH_OBJ) bin/.dummy
@echo Linking $@
-@@ -1048,14 +1048,14 @@
+@@ -1081,14 +1081,14 @@
bin/[EMAIL PROTECTED]@: $(PICOBJS) bin/.dummy
@echo Linking shared library $@
@@ -222,7 +223,7 @@
@[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR)
bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
-@@ -1064,8 +1064,8 @@
+@@ -1097,8 +1097,8 @@
bin/[EMAIL PROTECTED]@: $(LIBSMBSHAREMODES_PICOBJS)
@echo Linking libsmbsharemodes shared library $@
@@ -233,7 +234,7 @@
@[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
-@@ -1084,8 +1084,8 @@
+@@ -1117,8 +1117,8 @@
# This is probably wrong for anything other than the GNU linker.
bin/[EMAIL PROTECTED]@: $(LIBBIGBALLOFMUD_PICOBJS)
@echo Linking bigballofmud shared library $@
@@ -244,18 +245,25 @@
@[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR)
ln -snf libbigballofmud.so bin/libbigballofmud.so.0
-@@ -1164,8 +1164,8 @@
+@@ -1198,8 +1198,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)
+- @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(NSCD_LIBS)
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS)
$(DYNEXP) \
-+ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS)
++ @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(NSCD_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.
-@@ -1352,12 +1352,12 @@
+@@ -1361,18 +1361,18 @@
+
+ bin/[EMAIL PROTECTED]@: $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy
+ @echo Linking $@
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP)
$(LIBS) @POPTLIBS@
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP)
@POPTLIBS@ $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: $(NTLM_AUTH_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
@BUILD_POPT@ bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP)
$(NTLM_AUTH_OBJ) \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.101 -r1.102 samba.spec
--- openpkg-src/samba/samba.spec 30 Mar 2006 20:38:46 -0000 1.101
+++ openpkg-src/samba/samba.spec 11 Jul 2006 07:39:11 -0000 1.102
@@ -32,8 +32,8 @@
Class: BASE
Group: Filesystem
License: GPL
-Version: 3.0.22
-Release: 20060330
+Version: 3.0.23
+Release: 20060711
# package options
%option with_pam no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
