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: 15-Jul-2006 18:26:56
Branch: HEAD Handle: 2006071517265500
Modified files:
openpkg-src/samba samba.patch samba.spec
Log:
re-upgrade from 3.0.22 to 3.0.23 from scratch to unbreak the server
parts (which were missing)
Summary:
Revision Changes Path
1.16 +84 -29 openpkg-src/samba/samba.patch
1.103 +2 -2 openpkg-src/samba/samba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 samba.patch
--- openpkg-src/samba/samba.patch 11 Jul 2006 07:39:11 -0000 1.15
+++ openpkg-src/samba/samba.patch 15 Jul 2006 16:26:55 -0000 1.16
@@ -1,6 +1,6 @@
Index: source/Makefile.in
--- source/Makefile.in.orig 2006-07-10 18:27:55 +0200
-+++ source/Makefile.in 2006-07-11 09:16:33 +0200
++++ source/Makefile.in 2006-07-15 18:03:28 +0200
@@ -86,7 +86,7 @@
# or in smb.conf (see smb.conf(5))
LOGFILEBASE = @logfilebase@
@@ -10,12 +10,7 @@
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
-@@ -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)
+@@ -914,42 +914,42 @@
bin/[EMAIL PROTECTED]@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -44,7 +39,7 @@
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) $(LIBS) -Lbin
-lsmbclient
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TOOL_OBJ) $(LDFLAGS) $(DYNEXP)
$(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -Lbin
-lsmbclient $(LIBS)
bin/[EMAIL PROTECTED]@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -162,7 +157,7 @@
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 $@
@@ -204,7 +199,7 @@
bin/[EMAIL PROTECTED]@: $(SMBSH_OBJ) bin/.dummy
@echo Linking $@
-@@ -1081,14 +1081,14 @@
+@@ -1081,15 +1081,15 @@
bin/[EMAIL PROTECTED]@: $(PICOBJS) bin/.dummy
@echo Linking shared library $@
@@ -217,34 +212,48 @@
bin/[EMAIL PROTECTED]@: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient shared library $@
- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
-- $(KRB5LIBS) $(LDAP_LIBS) \
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) \
-+ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) \
- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR)
+ $(KRB5LIBS) $(LDAP_LIBS) \
+- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR)
++ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR) $(LIBS)
bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
-@@ -1097,8 +1097,8 @@
+ @echo Linking libsmbclient non-shared library $@
+@@ -1097,9 +1097,9 @@
bin/[EMAIL PROTECTED]@: $(LIBSMBSHAREMODES_PICOBJS)
@echo Linking libsmbsharemodes shared library $@
- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_PICOBJS) $(LDFLAGS)
$(LIBS) \
-- $(KRB5LIBS) $(LDAP_LIBS) \
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_PICOBJS) $(LDFLAGS) \
-+ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) \
- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
+ $(KRB5LIBS) $(LDAP_LIBS) \
+- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
++ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
$(LIBS)
bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
-@@ -1117,8 +1117,8 @@
+ @echo Linking libsmbsharemodes non-shared library $@
+@@ -1107,8 +1107,8 @@
+
+ bin/[EMAIL PROTECTED]@: $(CAC_PICOBJS)
+ @echo Linking libmsrpc shared library $@
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
+- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBMSRPC_MAJOR)
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) \
++ @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBMSRPC_MAJOR) $(LIBS)
+
+ bin/libmsrpc.a: $(CAC_PICOBJS)
+ @echo Linking libmsrpc non-shared library $@
+@@ -1117,9 +1117,9 @@
# This is probably wrong for anything other than the GNU linker.
bin/[EMAIL PROTECTED]@: $(LIBBIGBALLOFMUD_PICOBJS)
@echo Linking bigballofmud shared library $@
- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \
-- $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) \
-+ $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(LIBS) \
- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR)
+ $(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
@@ -1198,8 +1198,8 @@
bin/[EMAIL PROTECTED]@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
@@ -256,7 +265,7 @@
# Please don't add .o files to libnss_winbind, libnss_wins, or the
pam_winbind
# libraries. Add to the appropriate PICOBJ variable instead.
-@@ -1361,18 +1361,18 @@
+@@ -1361,47 +1361,47 @@
bin/[EMAIL PROTECTED]@: $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -279,9 +288,55 @@
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)
+
+ bin/[EMAIL PROTECTED]@: $(TDBTOOL_OBJ) bin/.dummy
+ @echo Linking $@
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS)
$(TDBTOOL_OBJ) @SOCKWRAP@
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(TDBTOOL_OBJ)
@SOCKWRAP@ $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: $(TDBDUMP_OBJ) bin/.dummy
+ @echo Linking $@
+- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(LIBS)
$(TDBDUMP_OBJ) @SOCKWRAP@
++ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(TDBDUMP_OBJ)
@SOCKWRAP@ $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strcmp.o
+- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o
-L ./bin -lbigballofmud
++ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_strcmp.o -L
./bin -lbigballofmud $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strstr.o
+- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) torture/t_strstr.o
-L ./bin -lbigballofmud
++ $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) torture/t_strstr.o -L
./bin -lbigballofmud $(LIBS)
+
+ bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strappend.o
+- $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS)
torture/t_strappend.o -L ./bin -lbigballofmud
++ $(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
+
+ 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)
+ 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 @@
+ fi
+ PYTHON_OBJS="$(PYTHON_PICOBJS)" \
+ 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_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-02-25 09:39:08 +0100
++++ source/lib/sysquotas_4A.c 2006-07-15 17:37:40 +0200
@@ -72,6 +72,10 @@
#define dqb_curinodes dqb_curfiles
#endif
@@ -294,9 +349,9 @@
#define USERQUOTAFILE_EXTENSION ".user"
#else
Index: source/nsswitch/winbindd_util.c
---- source/nsswitch/winbindd_util.c.orig 2006-01-25 00:46:34 +0100
-+++ source/nsswitch/winbindd_util.c 2006-02-25 09:39:08 +0100
-@@ -913,7 +913,7 @@
+--- 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 @@
{
if (_winbindd_priv_socket == -1) {
_winbindd_priv_socket = create_pipe_sock(
@@ -306,9 +361,9 @@
_winbindd_priv_socket));
}
Index: source/smbd/uid.c
---- source/smbd/uid.c.orig 2006-01-25 00:46:32 +0100
-+++ source/smbd/uid.c 2006-02-25 09:39:08 +0100
-@@ -200,6 +200,10 @@
+--- source/smbd/uid.c.orig 2006-04-20 04:29:19 +0200
++++ source/smbd/uid.c 2006-07-15 17:37:40 +0200
+@@ -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.102 -r1.103 samba.spec
--- openpkg-src/samba/samba.spec 11 Jul 2006 07:39:11 -0000 1.102
+++ openpkg-src/samba/samba.spec 15 Jul 2006 16:26:55 -0000 1.103
@@ -33,7 +33,7 @@
Group: Filesystem
License: GPL
Version: 3.0.23
-Release: 20060711
+Release: 20060715
# package options
%option with_pam no
@@ -180,7 +180,7 @@
%{l_make} %{l_mflags} \
DESTDIR=$RPM_BUILD_ROOT \
LIBDIR=%{l_prefix}/lib/samba \
- installbin installman installscripts installdat installmodules
+ installbin installservers installman installscripts installdat
installmodules
%if "%{with_swat}" == "yes"
%{l_make} %{l_mflags} installswat DESTDIR=$RPM_BUILD_ROOT
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
