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:   30-Dec-2005 10:01:17
  Branch: HEAD                             Handle: 2005123009011600

  Modified files:
    openpkg-src/samba       samba.patch samba.spec

  Log:
    upgrading package: samba 3.0.20b -> 3.0.21a

  Summary:
    Revision    Changes     Path
    1.11        +58 -22     openpkg-src/samba/samba.patch
    1.95        +2  -2      openpkg-src/samba/samba.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/samba/samba.patch
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 samba.patch
  --- openpkg-src/samba/samba.patch     26 Nov 2005 16:09:49 -0000      1.10
  +++ openpkg-src/samba/samba.patch     30 Dec 2005 09:01:16 -0000      1.11
  @@ -1,7 +1,7 @@
   Index: source/Makefile.in
  ---- source/Makefile.in.orig  2005-10-12 19:03:23 +0200
  -+++ source/Makefile.in       2005-11-26 16:11:16 +0100
  -@@ -833,7 +833,7 @@
  +--- source/Makefile.in.orig  2005-12-14 13:45:49 +0100
  ++++ source/Makefile.in       2005-12-30 09:34:52 +0100
  +@@ -884,7 +884,7 @@
    
    bin/[EMAIL PROTECTED]@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
        @echo Linking $@
  @@ -10,7 +10,7 @@
    
    bin/[EMAIL PROTECTED]@: $(WREPL_OBJ) @BUILD_POPT@ bin/.dummy
        @echo Linking $@
  -@@ -842,21 +842,21 @@
  +@@ -893,37 +893,37 @@
    bin/[EMAIL PROTECTED]@: $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
        @echo Linking $@
        @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) 
$(PRINT_LIBS) \
  @@ -30,6 +30,11 @@
   -    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) 
$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
   +    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) 
$(TERMLDFLAGS) $(TERMLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(LIBS)
    
  + 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)
  + 
    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)
  @@ -37,7 +42,8 @@
    
    bin/[EMAIL PROTECTED]@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
        @echo Linking $@
  -@@ -864,11 +864,11 @@
  +-    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PROFILES_OBJ) $(DYNEXP) 
$(LDFLAGS) $(LIBS) @POPTLIBS@
  ++    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(PROFILES_OBJ) $(DYNEXP) 
$(LDFLAGS) @POPTLIBS@ $(LIBS)
    
    bin/[EMAIL PROTECTED]@: $(CUPS_OBJ) bin/.dummy
        @echo Linking $@
  @@ -51,7 +57,27 @@
    
    bin/[EMAIL PROTECTED]@: $(MNT_OBJ) bin/.dummy
        @echo Linking $@
  -@@ -895,32 +895,32 @@
  +@@ -935,47 +935,47 @@
  + 
  + bin/[EMAIL PROTECTED]@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
  +     @echo Linking $@
  +-    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TESTPARM_OBJ) $(LDFLAGS) 
$(DYNEXP) $(LIBS) @POPTLIBS@
  ++    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(TESTPARM_OBJ) $(LDFLAGS) 
$(DYNEXP) @POPTLIBS@ $(LIBS)
  + 
  + bin/[EMAIL PROTECTED]@: $(STATUS_OBJ) @BUILD_POPT@ bin/.dummy
  +     @echo Linking $@
  +-    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) 
$(LIBS) \
  +-    @POPTLIBS@
  ++    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) \
  ++    @POPTLIBS@ $(LIBS)
  + 
  + 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)
    
    bin/[EMAIL PROTECTED]@: $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy
        @echo Linking $@
  @@ -91,7 +117,7 @@
    
    bin/[EMAIL PROTECTED]@: $(TALLOCTORT_OBJ) bin/.dummy
        @echo Linking $@
  -@@ -928,31 +928,31 @@
  +@@ -983,39 +983,39 @@
    
    bin/[EMAIL PROTECTED]@: $(MASKTEST_OBJ) bin/.dummy
        @echo Linking $@
  @@ -113,6 +139,11 @@
   -    @$(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)
    
  + 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) @POPTLIBS@ $(LIBS)
  + 
    bin/[EMAIL PROTECTED]@: $(LOCKTEST_OBJ) bin/.dummy
        @echo Linking $@
   -    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) 
$(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
  @@ -121,7 +152,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 $@
  @@ -130,7 +161,12 @@
    
    bin/[EMAIL PROTECTED]@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy
        @echo Linking $@
  -@@ -964,11 +964,11 @@
  +-    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBICONV_OBJ) $(LDFLAGS) 
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@
  ++    @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBICONV_OBJ) $(LDFLAGS) 
$(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) @POPTLIBS@ $(LIBS)
  + 
  + bin/[EMAIL PROTECTED]@: $(LOG2PCAP_OBJ) @BUILD_POPT@ bin/.dummy
  +     @echo Linking $@
  +@@ -1023,11 +1023,11 @@
    
    bin/[EMAIL PROTECTED]@: $(LOCKTEST2_OBJ) bin/.dummy
        @echo Linking $@
  @@ -144,7 +180,7 @@
    
    bin/[EMAIL PROTECTED]@: $(DEBUG2HTML_OBJ) bin/.dummy
        @echo Linking $@
  -@@ -976,11 +976,11 @@
  +@@ -1035,11 +1035,11 @@
    
    bin/[EMAIL PROTECTED]@: $(SMBFILTER_OBJ) bin/.dummy
        @echo Linking $@
  @@ -158,7 +194,7 @@
    
    bin/[EMAIL PROTECTED]@: $(SMBSH_OBJ) bin/.dummy
        @echo Linking $@
  -@@ -988,14 +988,14 @@
  +@@ -1047,14 +1047,14 @@
    
    bin/[EMAIL PROTECTED]@: $(PICOBJS) bin/.dummy
        @echo Linking shared library $@
  @@ -177,7 +213,7 @@
                @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR)
    
    bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
  -@@ -1004,8 +1004,8 @@
  +@@ -1063,8 +1063,8 @@
    
    bin/[EMAIL PROTECTED]@: $(LIBSMBSHAREMODES_PICOBJS)
        @echo Linking libsmbsharemodes shared library $@
  @@ -188,7 +224,7 @@
                @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBSHAREMODES_MAJOR)
    
    bin/libsmbsharemodes.a: $(LIBSMBSHAREMODES_PICOBJS)
  -@@ -1015,8 +1015,8 @@
  +@@ -1083,8 +1083,8 @@
    # This is probably wrong for anything other than the GNU linker. 
    bin/[EMAIL PROTECTED]@: $(LIBBIGBALLOFMUD_PICOBJS)
        @echo Linking bigballofmud shared library $@
  @@ -199,7 +235,7 @@
                @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBBIGBALLOFMUD_MAJOR)
        ln -snf libbigballofmud.so bin/libbigballofmud.so.0
    
  -@@ -1090,8 +1090,8 @@
  +@@ -1163,8 +1163,8 @@
    
    bin/[EMAIL PROTECTED]@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
        @echo "Linking $@"
  @@ -210,7 +246,7 @@
    
    # Please don't add .o files to libnss_winbind, libnss_wins, or the 
pam_winbind
    # libraries.  Add to the appropriate PICOBJ variable instead.
  -@@ -1274,12 +1274,12 @@
  +@@ -1351,12 +1351,12 @@
                @BUILD_POPT@ bin/.dummy
        @echo Linking $@
        @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) 
$(NTLM_AUTH_OBJ) \
  @@ -224,11 +260,11 @@
   -    @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) 
$(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS)
   +    @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) -lc 
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS)
    
  - bin/libmsrpc.a: $(LIBMSRPC_PICOBJ)
  -     @-$(AR) -rc $@ $(LIBMSRPC_PICOBJ) 
  + bin/[EMAIL PROTECTED]@: $(TDBBACKUP_OBJ) bin/.dummy
  +     @echo Linking $@
   Index: source/lib/sysquotas_4A.c
  ---- source/lib/sysquotas_4A.c.orig   2005-10-12 19:03:31 +0200
  -+++ source/lib/sysquotas_4A.c        2005-11-26 16:00:22 +0100
  +--- source/lib/sysquotas_4A.c.orig   2005-09-29 23:52:43 +0200
  ++++ source/lib/sysquotas_4A.c        2005-12-30 09:31:16 +0100
   @@ -72,6 +72,10 @@
    #define dqb_curinodes       dqb_curfiles
    #endif
  @@ -241,9 +277,9 @@
    #define USERQUOTAFILE_EXTENSION ".user"
    #else
   Index: source/nsswitch/winbindd_util.c
  ---- source/nsswitch/winbindd_util.c.orig     2005-10-12 19:03:28 +0200
  -+++ source/nsswitch/winbindd_util.c  2005-11-26 16:00:22 +0100
  -@@ -900,7 +900,7 @@
  +--- source/nsswitch/winbindd_util.c.orig     2005-12-14 13:45:50 +0100
  ++++ source/nsswitch/winbindd_util.c  2005-12-30 09:31:16 +0100
  +@@ -914,7 +914,7 @@
    {
        if (_winbindd_priv_socket == -1) {
                _winbindd_priv_socket = create_pipe_sock(
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/samba/samba.spec
  ============================================================================
  $ cvs diff -u -r1.94 -r1.95 samba.spec
  --- openpkg-src/samba/samba.spec      26 Nov 2005 16:09:49 -0000      1.94
  +++ openpkg-src/samba/samba.spec      30 Dec 2005 09:01:16 -0000      1.95
  @@ -32,8 +32,8 @@
   Class:        BASE
   Group:        Filesystem
   License:      GPL
  -Version:      3.0.20b
  -Release:      20051126
  +Version:      3.0.21a
  +Release:      20051230
   
   #   package options
   %option       with_pam   no
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to