[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Sat Jul 23 15:21:02 MDT 2011


The branch, master has been updated
       via  7524413 cli_raw: Make name lowercase.
       via  0397b2e charset: Make name lowercase everywhere.
       via  cd7e384 wafsamba: Properly lock object store when retrieving version through Bazaar.
       via  e6dcee9 remove the fedora package, and point at the repository instead
       via  25054a3 README.Coding: Mention that PEP8 is the standard for Python code.
       via  f10f6ef update TODO: net has been renamed to samba-tool.
       via  845d5ad scripting/bin: Some formatting fixes.
      from  824a300 s3:libsmb: cli_set_secdesc() only needs a const struct security_descriptor

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 75244137510a51df2a8602160b02a3acc6e6c472
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jul 22 21:18:32 2011 +0200

    cli_raw: Make name lowercase.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sat Jul 23 23:20:51 CEST 2011 on sn-devel-104

commit 0397b2ef30b535dbcefc1e496ad70fa31ada5f9f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jul 22 18:33:31 2011 +0200

    charset: Make name lowercase everywhere.

commit cd7e384d2c1f94d67ce9eb75827b42eb7e380628
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jul 22 12:44:59 2011 +0200

    wafsamba: Properly lock object store when retrieving version through Bazaar.

commit e6dcee9b82c72d08cf4bba5e8663367b9b85562c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Jul 18 10:37:21 2011 +0200

    remove the fedora package, and point at the repository instead

commit 25054a3071d2cd8a7433ee9aed9f6a2b732bfbbc
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jul 17 13:33:03 2011 +0200

    README.Coding: Mention that PEP8 is the standard for Python code.
    
    Almost all of our existing code is PEP8, and virtually every other free software
    project in Python uses PEP8.

commit f10f6eff396d58c5cb1198a0f3d8c47a9650d329
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jul 17 13:29:32 2011 +0200

    update TODO: net has been renamed to samba-tool.

commit 845d5add3cda7fc2bc0c9119f33f7340fd70833e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jul 17 13:28:21 2011 +0200

    scripting/bin: Some formatting fixes.

-----------------------------------------------------------------------

Summary of changes:
 README.Coding                             |    6 +-
 README.packaging4                         |   13 +
 buildtools/wafsamba/samba_version.py      |    6 +-
 lib/util/charset/wscript_build            |   10 +-
 lib/util/wscript_build                    |    2 +-
 packaging4/Fedora/cplusplus-headers.patch |   32 ---
 packaging4/Fedora/samba4.init             |  113 ---------
 packaging4/Fedora/samba4.log              |    7 -
 packaging4/Fedora/samba4.spec             |  373 -----------------------------
 packaging4/Fedora/samba4.sysconfig        |    2 -
 packaging4/README.Debian                  |    2 -
 source3/wscript_build                     |    6 +-
 source4/TODO                              |    3 +-
 source4/client/wscript_build              |    2 +-
 source4/libcli/rap/wscript_build          |    2 +-
 source4/libcli/smb2/wscript_build         |    2 +-
 source4/libcli/wscript_build              |    6 +-
 source4/librpc/wscript_build              |    2 +-
 source4/ntvfs/wscript_build               |    4 +-
 source4/scripting/bin/mymachinepw         |    4 +-
 source4/scripting/bin/renamedc            |    4 +-
 source4/torture/wscript_build             |    6 +-
 22 files changed, 49 insertions(+), 558 deletions(-)
 create mode 100644 README.packaging4
 delete mode 100644 packaging4/Fedora/cplusplus-headers.patch
 delete mode 100644 packaging4/Fedora/samba4.init
 delete mode 100644 packaging4/Fedora/samba4.log
 delete mode 100644 packaging4/Fedora/samba4.spec
 delete mode 100644 packaging4/Fedora/samba4.sysconfig
 delete mode 100644 packaging4/README.Debian


Changeset truncated at 500 lines:

diff --git a/README.Coding b/README.Coding
index 3ea9c78..12997cc 100644
--- a/README.Coding
+++ b/README.Coding
@@ -16,11 +16,15 @@ style should never outweigh coding itself and so the guidelines
 described here are hopefully easy enough to follow as they are very
 common and supported by tools and editors.
 
-The basic style, also mentioned in prog_guide4.txt, is the Linux kernel
+The basic style for C code, also mentioned in prog_guide4.txt, is the Linux kernel
 coding style (See Documentation/CodingStyle in the kernel source tree). This
 closely matches what most Samba developers use already anyways, with a few
 exceptions as mentioned below.
 
+The coding style for Python code is documented in PEP8, http://www.python.org/pep/pep8.
+If you have ever worked on another free software python project, you are probably
+already familiar with it.
+
 But to save you the trouble of reading the Linux kernel style guide, here
 are the highlights.
 
diff --git a/README.packaging4 b/README.packaging4
new file mode 100644
index 0000000..0a9bb58
--- /dev/null
+++ b/README.packaging4
@@ -0,0 +1,13 @@
+Debian
+======
+
+Packages of Samba 4 are regularly uploaded to the Debian and Ubuntu archives.
+
+http://packages.debian.org/samba4
+
+Please see http://wiki.samba.org/index.php/Samba4/Debian for instructions
+on building the Samba 4 Debian packages.
+
+Fedora
+======
+A package of Samba 4 is maintained in Fedora.
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 0c39ed4..96d5d0d 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -37,7 +37,11 @@ def bzr_version_summary(path):
         ret = "BZR-%d" % revno
     else:
         store = get_object_store(b.repository)
-        full_rev = store._lookup_revision_sha1(revid)
+        store.lock_read()
+        try:
+            full_rev = store._lookup_revision_sha1(revid)
+        finally:
+            store.unlock()
         fields["GIT_COMMIT_ABBREV"] = full_rev[:7]
         fields["GIT_COMMIT_FULLREV"] = full_rev
         ret = "GIT-" + fields["GIT_COMMIT_ABBREV"]
diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build
index 1f2c8df..7a99180 100644
--- a/lib/util/charset/wscript_build
+++ b/lib/util/charset/wscript_build
@@ -4,14 +4,14 @@ bld.SAMBA_SUBSYSTEM('ICONV_WRAPPER',
                     source='iconv.c',
                     public_deps='iconv replace talloc')
 
-bld.SAMBA_SUBSYSTEM('CHARSET',
+bld.SAMBA_SUBSYSTEM('charset',
                     public_headers='charset.h',
                     source='codepoints.c convert_string.c util_str.c util_unistr_w.c charcnv.c pull_push.c util_unistr.c',
                     deps='DYNCONFIG ICONV_WRAPPER',
                     public_deps='talloc')
 
 bld.SAMBA_MODULE('charset_weird',
-                 subsystem='CHARSET',
+                 subsystem='charset',
                  source='weird.c',
                  init_function='',
                  deps='samba-util',
@@ -19,7 +19,7 @@ bld.SAMBA_MODULE('charset_weird',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_weird'))
 
 bld.SAMBA_MODULE('charset_CP850',
-                 subsystem='CHARSET',
+                 subsystem='charset',
                  source='CP850.c',
                  init_function='',
                  deps='samba-util',
@@ -27,7 +27,7 @@ bld.SAMBA_MODULE('charset_CP850',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_CP850'))
 
 bld.SAMBA_MODULE('charset_CP437',
-                 subsystem='CHARSET',
+                 subsystem='charset',
                  source='CP437.c',
                  init_function='',
                  deps='samba-util',
@@ -35,7 +35,7 @@ bld.SAMBA_MODULE('charset_CP437',
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_CP437'))
 
 bld.SAMBA_MODULE('charset_macosxfs',
-                 subsystem='CHARSET',
+                 subsystem='charset',
                  source='charset_macosxfs.c',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('charset_macosxfs'),
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index f8386fa..659cb54 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('samba-util',
                     util_str.c util_str_common.c substitute.c ms_fnmatch.c
                     server_id.c dprintf.c parmlist.c''',
                   deps='DYNCONFIG',
-                  public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO CHARSET',
+                  public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset',
                   public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h',
                   header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
                   local_include=False,
diff --git a/packaging4/Fedora/cplusplus-headers.patch b/packaging4/Fedora/cplusplus-headers.patch
deleted file mode 100644
index ce05f54..0000000
--- a/packaging4/Fedora/cplusplus-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur samba-4.0.0alpha5-orig/source/lib/events/events.h samba-4.0.0alpha5/source/lib/events/events.h
---- samba-4.0.0alpha5-orig/source/lib/events/events.h	2008-06-30 19:34:11.000000000 +1000
-+++ samba-4.0.0alpha5/source/lib/events/events.h	2008-07-25 20:02:56.000000000 +1000
-@@ -53,24 +53,24 @@
- 
- struct fd_event *event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
- 			      int fd, uint16_t flags, event_fd_handler_t handler,
--			      void *private);
-+			      void *private_data);
- 
- struct timed_event *event_add_timed(struct event_context *ev, TALLOC_CTX *mem_ctx,
- 				    struct timeval next_event, 
- 				    event_timed_handler_t handler, 
--				    void *private);
-+				    void *private_data);
- 
- struct signal_event *event_add_signal(struct event_context *ev, TALLOC_CTX *mem_ctx,
- 				      int signum, int sa_flags,
- 				      event_signal_handler_t handler, 
--				      void *private);
-+				      void *private_data);
- 
- struct iocb;
- struct aio_event *event_add_aio(struct event_context *ev,
- 				TALLOC_CTX *mem_ctx,
- 				struct iocb *iocb,
- 				event_aio_handler_t handler,
--				void *private);
-+				void *private_data);
- 
- int event_loop_once(struct event_context *ev);
- int event_loop_wait(struct event_context *ev);
diff --git a/packaging4/Fedora/samba4.init b/packaging4/Fedora/samba4.init
deleted file mode 100644
index a04cce9..0000000
--- a/packaging4/Fedora/samba4.init
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 91 35
-# description: Starts and stops the Samba smbd daemon \
-#	       used to provide SMB network services.
-#
-# pidfile: /var/run/samba4/smbd.pid
-# config:  /etc/samba4/smb.conf
-
-SAMBA_NAME=samba4
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
-  . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-  . /etc/rc.d/init.d/functions
-else
-  exit 1
-fi
-
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-if [ -f /etc/sysconfig/$SAMBA_NAME ]; then
-   . /etc/sysconfig/$SAMBA_NAME
-fi
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 1
-
-# Check that smb.conf exists.
-[ -f /etc/$SAMBA_NAME/smb.conf ] || exit 6
-
-RETVAL=0
-
-
-start() {
-	echo -n $"Starting Samba services: "
-	daemon smbd $SMBDOPTIONS
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SAMBA_NAME || \
-	   RETVAL=1
-	return $RETVAL
-}	
-
-stop() {
-	echo -n $"Shutting down Samba services: "
-	killproc smbd
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SAMBA_NAME
-	return $RETVAL
-}	
-
-restart() {
-	stop
-	start
-}	
-
-reload() {
-        echo -n $"Reloading smb.conf file: "
-	killproc smbd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}	
-
-rhstatus() {
-	status smbd
-	return $?
-}	
-
-
-# Allow status as non-root.
-if [ "$1" = status ]; then
-       rhstatus
-       exit $?
-fi
-
-# Check that we can write to it... so non-root users stop here
-[ -w /etc/$SAMBA_NAME/smb.conf ] || exit 4
-
-
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart)
-  	restart
-	;;
-  reload)
-  	reload
-	;;
-  status)
-  	rhstatus
-	;;
-  condrestart)
-  	[ -f /var/lock/subsys/$SAMBA_NAME ] && restart || :
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 2
-esac
-
-exit $?
diff --git a/packaging4/Fedora/samba4.log b/packaging4/Fedora/samba4.log
deleted file mode 100644
index cd0cf9a..0000000
--- a/packaging4/Fedora/samba4.log
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/samba4/* {
-    notifempty
-    olddir /var/log/samba4/old
-    missingok
-    sharedscripts
-    copytruncate
-}
diff --git a/packaging4/Fedora/samba4.spec b/packaging4/Fedora/samba4.spec
deleted file mode 100644
index dfdd368..0000000
--- a/packaging4/Fedora/samba4.spec
+++ /dev/null
@@ -1,373 +0,0 @@
-
-%define main_release 5
-%define alpha_version 5
-%define samba_version 4.0.0alpha%{alpha_version}
-%define tarball_name samba-4.0.0alpha%{alpha_version}
-
-#Set what versions we require for tdb and talloc
-%define tdb_version 1.1.1
-%define talloc_version 1.2.0
-
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-Summary: The Samba4 CIFS and AD client and server suite
-Name: samba4
-Version: 4.0.0
-Release: 0.%{main_release}.alpha%{alpha_version}%{?dist}
-License: GPLv3+ and LGPLv3+
-Group: System Environment/Daemons
-URL: http://www.samba.org/
-
-Source: http://download.samba.org/samba/ftp/samba4/%{tarball_name}.tar.gz
-
-# To be removed when samba4 alpha6 is released
-# From http://git.samba.org/?p=samba.git;a=commitdiff;h=7ca421eb32bed3c400f863b654712d922c82bfb9
-Patch0: cplusplus-headers.patch
-
-# Red Hat specific replacement-files
-Source1: %{name}.log
-Source4: %{name}.sysconfig
-Source5: %{name}.init
-
-Requires(pre): %{name}-common = %{version}-%{release}
-Requires: pam >= 0:0.64
-Requires: logrotate >= 0:3.4
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires(pre): /usr/sbin/groupadd
-Requires(post): /sbin/chkconfig, /sbin/service
-Requires(preun): /sbin/chkconfig, /sbin/service
-BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, e2fsprogs-devel
-BuildRequires: popt-devel, libattr-devel, libaio-devel, sed
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires: libtalloc-devel >= %{talloc_version}
-BuildRequires: libtdb-devel >= %{tdb_version}
-
-%description
-
-Samba 4 is the ambitious next version of the Samba suite that is being
-developed in parallel to the stable 3.0 series. The main emphasis in
-this branch is support for the Active Directory logon protocols used
-by Windows 2000 and above.
-
-%package client
-Summary: Samba client programs
-Group: Applications/System
-Requires: %{name}-common = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-
-%description client
-The %{name}-client package provides some SMB/CIFS clients to complement
-the built-in SMB/CIFS filesystem in Linux. These clients allow access
-of SMB/CIFS shares and printing to SMB/CIFS printers.
-
-%package libs
-Summary: Samba libraries
-Group: Applications/System
-
-%description libs
-The %{name}-libs package  contains the libraries needed by programs 
-that link against the SMB, RPC and other protocols provided by the Samba suite.
-
-%package python
-Summary: Samba python libraries
-Group: Applications/System
-Requires: %{name}-libs = %{version}-%{release}
-
-%description python
-The %{name}-python package contains the python libraries needed by programs 
-that use SMB, RPC and other Samba provided protocols in python programs/
-
-%package devel
-Summary: Developer tools for Samba libraries
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains the header files for the libraries
-needed to develop programs that link against the SMB, RPC and other
-libraries in the Samba suite.
-
-%package pidl
-Summary: Perl IDL compiler
-Group: Development/Tools
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-%description pidl
-The %{name}-pidl package contains the Perl IDL compiler used by Samba
-and Wireshark to parse IDL and similar protocols
-
-%package common
-Summary: Files used by both Samba servers and clients
-Group: Applications/System
-Requires: %{name}-libs = %{version}-%{release}
-
-%description common
-%{Name}-common provides files necessary for both the server and client
-packages of Samba.
-
-%package winbind
-Summary: Samba winbind
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-
-%description winbind
-The samba-winbind package provides the winbind NSS library, and some
-client tools.  Winbind enables Linux to be a full member in Windows
-domains and to use Windows user and group accounts on Linux.
-
-
-%prep
-# TAG: change for non-pre
-%setup -q -n %{tarball_name}
-#%setup -q
-
-# copy Red Hat specific scripts
-
-# Upstream patches
-%patch0 -p1 -b .
-
-mv source/VERSION source/VERSION.orig
-sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&%{release}/' < source/VERSION.orig > source/VERSION
-cd source
-script/mkversion.sh
-cd ..
-
-%build
-cd source
-
-%configure \
-	--with-fhs \
-	--with-lockdir=/var/lib/%{name} \
-	--with-piddir=/var/run \
-	--with-privatedir=/var/lib/%{name}/private \
-	--with-logfilebase=/var/log/%{name} \
-	--sysconfdir=%{_sysconfdir}/%{name} \
-	--with-winbindd-socket-dir=/var/run/winbind \
-	--with-ntp-signd-socket-dir=/var/run/ntp_signd \
-	--disable-gnutls
-
-#Build PIDL for installation into vendor directories before 'make proto' gets to it
-(cd pidl && %{__perl} Makefile.PL INSTALLDIRS=vendor )
-
-#Builds using PIDL the IDL and many other things 
-make proto
-
-make everything
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-cd source
-
-#Don't call 'make install' as we want to call out to the PIDL install manually 
-make install DESTDIR=%{buildroot}
-
-#Undo the PIDL install, we want to try again with the right options
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/perl5
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/perl5
-
-#Install PIDL
-( cd pidl && make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT )
-
-#Clean out crap left behind by the Pidl install
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-cd ..
-
-mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT/var/run/winbindd
-mkdir -p $RPM_BUILD_ROOT/var/run/ntp_signd
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{name}/winbindd_privileged
-mkdir -p $RPM_BUILD_ROOT/var/log/%{name}/
-mkdir -p $RPM_BUILD_ROOT/var/log/%{name}/old
-
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{name}
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{name}/private
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{name}/sysvol
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-
-# Install other stuff
-install -m755 %{SOURCE5} $RPM_BUILD_ROOT/%{_initrddir}/%{name}
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}
-
-# winbind
-mkdir -p $RPM_BUILD_ROOT/%{_lib}
-ln -sf ../%{_libdir}/libnss_winbind.so  $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2 
-
-# libs {
-mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
-
-# }
-
-install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list