[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Tue Sep 12 04:47:02 UTC 2017
The branch, master has been updated
via 54e6f15 packaging: Remove Solaris directory and contents
via ce61ce7 packaging: Remove RHEL directory and contents
via bd67fab packaging: Remove RHEL-CTDB directory and contents
from 7e0b2af s3/smbd: sticky write time offset miscalculation causes broken timestamps
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 54e6f1583a6066dc290ccb76556a60d697ed01aa
Author: Rowland Penny <rpenny at samba.org>
Date: Wed Sep 6 14:38:37 2017 +0100
packaging: Remove Solaris directory and contents
Signed-off-by: Rowland Penny <rpenny at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Tue Sep 12 06:46:35 CEST 2017 on sn-devel-144
commit ce61ce76b546b55398e2cece0cbfdee5026e2270
Author: Rowland Penny <rpenny at samba.org>
Date: Wed Sep 6 14:28:51 2017 +0100
packaging: Remove RHEL directory and contents
Signed-off-by: Rowland Penny <rpenny at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit bd67fab64da4d6cc4cd2feb28251c57871e83061
Author: Rowland Penny <rpenny at samba.org>
Date: Wed Sep 6 14:33:58 2017 +0100
packaging: Remove RHEL-CTDB directory and contents
Signed-off-by: Rowland Penny <rpenny at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL-CTDB/README | 21 -
packaging/RHEL-CTDB/configure.rpm | 68 ---
packaging/RHEL-CTDB/makerpms.sh | 159 ------
packaging/RHEL-CTDB/makespec.sh | 63 ---
packaging/RHEL-CTDB/samba.spec.tmpl | 549 ---------------------
packaging/RHEL-CTDB/setup/filter-requires-samba.sh | 4 -
packaging/RHEL-CTDB/setup/samba.log | 9 -
packaging/RHEL-CTDB/setup/samba.pamd | 4 -
packaging/RHEL-CTDB/setup/samba.sysconfig | 6 -
packaging/RHEL-CTDB/setup/smb.conf | 271 ----------
packaging/RHEL-CTDB/setup/smb.init | 138 ------
packaging/RHEL-CTDB/setup/smbusers | 3 -
packaging/RHEL-CTDB/setup/swat.desktop | 8 -
packaging/RHEL-CTDB/setup/winbind.init | 102 ----
packaging/RHEL/makerpms.git.sh | 149 ------
packaging/RHEL/makerpms.sh.tmpl | 81 ---
packaging/RHEL/samba.spec.tmpl | 462 -----------------
packaging/RHEL/setup/filter-requires-samba.sh | 4 -
packaging/RHEL/setup/samba.log | 9 -
packaging/RHEL/setup/samba.pamd | 4 -
packaging/RHEL/setup/samba.sysconfig | 6 -
packaging/RHEL/setup/smb.conf | 271 ----------
packaging/RHEL/setup/smb.init | 137 -----
packaging/RHEL/setup/smbusers | 3 -
packaging/RHEL/setup/swat.desktop | 8 -
packaging/RHEL/setup/winbind.init | 102 ----
packaging/Solaris/README | 13 -
packaging/Solaris/copyright | 1 -
packaging/Solaris/makepkg.sh | 214 --------
packaging/Solaris/pkginfo.master | 14 -
packaging/Solaris/postinstall | 15 -
packaging/Solaris/preremove | 12 -
packaging/Solaris/prototype.master | 37 --
packaging/Solaris/request | 13 -
packaging/Solaris/samba.init.master | 53 --
packaging/Solaris/smb.conf.default | 271 ----------
36 files changed, 3284 deletions(-)
delete mode 100644 packaging/RHEL-CTDB/README
delete mode 100755 packaging/RHEL-CTDB/configure.rpm
delete mode 100755 packaging/RHEL-CTDB/makerpms.sh
delete mode 100755 packaging/RHEL-CTDB/makespec.sh
delete mode 100644 packaging/RHEL-CTDB/samba.spec.tmpl
delete mode 100755 packaging/RHEL-CTDB/setup/filter-requires-samba.sh
delete mode 100644 packaging/RHEL-CTDB/setup/samba.log
delete mode 100644 packaging/RHEL-CTDB/setup/samba.pamd
delete mode 100644 packaging/RHEL-CTDB/setup/samba.sysconfig
delete mode 100644 packaging/RHEL-CTDB/setup/smb.conf
delete mode 100644 packaging/RHEL-CTDB/setup/smb.init
delete mode 100644 packaging/RHEL-CTDB/setup/smbusers
delete mode 100644 packaging/RHEL-CTDB/setup/swat.desktop
delete mode 100644 packaging/RHEL-CTDB/setup/winbind.init
delete mode 100755 packaging/RHEL/makerpms.git.sh
delete mode 100644 packaging/RHEL/makerpms.sh.tmpl
delete mode 100644 packaging/RHEL/samba.spec.tmpl
delete mode 100755 packaging/RHEL/setup/filter-requires-samba.sh
delete mode 100644 packaging/RHEL/setup/samba.log
delete mode 100644 packaging/RHEL/setup/samba.pamd
delete mode 100644 packaging/RHEL/setup/samba.sysconfig
delete mode 100644 packaging/RHEL/setup/smb.conf
delete mode 100644 packaging/RHEL/setup/smb.init
delete mode 100644 packaging/RHEL/setup/smbusers
delete mode 100644 packaging/RHEL/setup/swat.desktop
delete mode 100644 packaging/RHEL/setup/winbind.init
delete mode 100644 packaging/Solaris/README
delete mode 100644 packaging/Solaris/copyright
delete mode 100644 packaging/Solaris/makepkg.sh
delete mode 100644 packaging/Solaris/pkginfo.master
delete mode 100644 packaging/Solaris/postinstall
delete mode 100644 packaging/Solaris/preremove
delete mode 100644 packaging/Solaris/prototype.master
delete mode 100644 packaging/Solaris/request
delete mode 100755 packaging/Solaris/samba.init.master
delete mode 100644 packaging/Solaris/smb.conf.default
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/README b/packaging/RHEL-CTDB/README
deleted file mode 100644
index f7ce381..0000000
--- a/packaging/RHEL-CTDB/README
+++ /dev/null
@@ -1,21 +0,0 @@
-The rpms should be built not directly from the spec file (although
-it is possible) but more conveniently using the makerpms.sh script:
-It takes care of making a source tarball and building the rpms for
-x86_64 and i386, the latter also producing the winbind-32bit
-compatibility packages for x86_64.
-
-The makerpms.sh script must be invoked from out of a git checkout
-(since git archive is used to produce the tarball for rpmbuild).
-
-To eliminate the need of building the docs from the sources
-(which is time consuming and has vast build dependencies),
-you need a samba release docs tarball called docs.tar.bz2 and point
-the DOCS_TARBALL environment variable to it before calling makerpms.sh.
-Alternatively, if the DOCS_TARBALL variable is not set, but if a
-docs.tar.bz2 exists inside the rpm SOURCES directory
-(/usr/src/redhat/SORUCES/ by default), that will be used.
-
-To produce an appropriate docs tarball, you can for instance pack the
-docs dir from a samba release tarball using the command
-"tar cjf docs.tar.bz2 docs".
-Note: The docs tarball needs the docs/ prefix.
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
deleted file mode 100755
index 0409f50..0000000
--- a/packaging/RHEL-CTDB/configure.rpm
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-case `uname -m` in
- x86_64)
- _libarch="/lib64"
- ;;
- *)
- _libarch="/lib"
- ;;
-esac
-
-_libarchdir=/usr${_libarch}
-
-_prefix=/usr
-_sysconfdir=/etc
-_mandir=/usr/man
-_datadir=/usr/share
-
-# check for ccache
-ccache -h 2>&1 > /dev/null
-if [ $? -eq 0 ]; then
- CC="ccache gcc"
-else
- CC="gcc"
-fi
-
-shared_modules="idmap_rid,idmap_ad,idmap_tdb2,idmap_rfc2307"
-
-if test "x$BUILD_GPFS" != "xno"; then
- shared_modules="${shared_modules},vfs_gpfs,vfs_tsmsm"
-fi
-
-./autogen.sh
-
-CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
- --prefix=${_prefix} \
- --localstatedir=/var \
- --with-configdir=${_sysconfdir}/samba \
- --libdir=${_libarchdir} \
- --with-modulesdir=${_libarchdir}/samba \
- --with-pammodulesdir=${_libarch}/security \
- --with-lockdir=/var/lib/samba \
- --with-logfilebase=/var/log/samba \
- --mandir=${_mandir} \
- --with-piddir=/var/run \
- --with-privatedir=${_sysconfdir}/samba \
- --disable-cups \
- --with-acl-support \
- --with-ads \
- --with-automount \
- --enable-fhs \
- --with-libsmbclient \
- --without-smbwrapper \
- --with-pam \
- --with-quotas \
- --with-shared-modules=${shared_modules} \
- --with-syslog \
- --with-utmp \
- --with-cluster-support \
- --with-ctdb=/usr/include \
- --without-ldb \
- --without-dnsupdate \
- --disable-external-libtalloc \
- --disable-external-libtdb \
- $*
-
-make showlayout
-
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
deleted file mode 100755
index 163b4ae..0000000
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-# Copyright (C) John H Terpstra 1998-2002
-# Copyright (C) Gerald (Jerry) Carter 2003
-# Copyright (C) Michael Adam 2008
-
-# Script to build RPMs for RHEL from inside a git checkout.
-
-# The following allows environment variables to override the target directories
-# the alternative is to have a file in your home directory calles .rpmmacros
-# containing the following:
-# %_topdir /home/mylogin/redhat
-#
-# Note: Under this directory rpm expects to find the same directories
-# that are under the /usr/src/redhat directory.
-
-# extra options passed to rpmbuild
-EXTRA_OPTIONS="$1"
-
-RPMSPECDIR=`rpm --eval %_specdir`
-RPMSRCDIR=`rpm --eval %_sourcedir`
-RPMBUILDDIR=`rpm --eval %_builddir`
-
-# At this point the RPMSPECDIR and RPMSRCDIR variables must have a value!
-
-DIRNAME=$(dirname $0)
-TOPDIR=${DIRNAME}/../..
-
-SPECFILE="samba.spec"
-RPMVER=`rpm --version | awk '{print $3}'`
-test -z "$RPMVER" && {
- RPMVER=`rpm --version | awk '{print $2}'`
-}
-RPM="rpmbuild"
-
-##
-## Check the RPM version (paranoid)
-##
-case $RPMVER in
- 4*)
- echo "Supported RPM version [$RPMVER]"
- ;;
- *)
- echo "Unknown RPM version: `rpm --version`"
- exit 1
- ;;
-esac
-
-mkdir -p `rpm --eval %_specdir`
-mkdir -p `rpm --eval %_sourcedir`
-mkdir -p `rpm --eval %_builddir`
-mkdir -p `rpm --eval %_srcrpmdir`
-mkdir -p `rpm --eval %_rpmdir`/noarch
-mkdir -p `rpm --eval %_rpmdir`/i386
-mkdir -p `rpm --eval %_rpmdir`/x86_64
-
-##
-## Delete the old debuginfo remnants:
-##
-## At least on RHEL 5.5, we observed broken debuginfo packages
-## when either old build directories were still present or old
-## debuginfo packages (of samba) were installed.
-##
-## Remove the debuginfo samba RPMs and old RPM build
-## directories, giving the user a 10 second chance to quit.
-##
-
-if rpm -qa | grep -q samba-debuginfo || test -n "$(echo ${RPMBUILDDIR}/samba* | grep -v \*)" ; then
- echo "Removing debuginfo remnants to fix debuginfo build:"
- if rpm -qa | grep -q samba-debuginfo ; then
- echo "Uninstalling the samba-debuginfo RPM"
- echo -n "Press Control-C if you want to quit (you have 10 seconds)"
- for count in $(seq 1 10) ; do
- echo -n "."
- sleep 1
- done
- echo
- echo "That was your chance... :-)"
- rpm -e samba-debuginfo
- fi
- if test -n "$(echo ${RPMBUILDDIR}/samba* | grep -v \*)" ; then
- echo "Deleting ${RPMBUILDDIR}/samba*"
- echo -n "Press Control-C if you want to quit (you have 10 seconds)"
- for count in $(seq 1 10) ; do
- echo -n "."
- sleep 1
- done
- echo
- echo "That was your chance... :-)"
- rm -rf ${RPMBUILDDIR}/samba*
- fi
-fi
-
-##
-## determine the samba version and create the SPEC file
-##
-${DIRNAME}/makespec.sh
-RC=$?
-if [ $RC -ne 0 ]; then
- exit ${RC}
-fi
-
-RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//')
-VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
-
-##
-## create the tarball
-##
-pushd ${TOPDIR}
-echo -n "Creating samba-${VERSION}.tar.bz2 ... "
-git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${RPMSRCDIR}/samba-${VERSION}.tar.bz2
-RC=$?
-popd
-echo "Done."
-if [ $RC -ne 0 ]; then
- echo "Build failed!"
- exit 1
-fi
-
-
-##
-## copy additional source files
-##
-pushd ${DIRNAME}
-
-chmod 755 setup/filter-requires-samba.sh
-tar --exclude=.svn -jcvf - setup > ${RPMSRCDIR}/setup.tar.bz2
-
-cp -p ${SPECFILE} ${RPMSPECDIR}
-
-popd
-
-##
-## some symlink fixes for building 32bit compat libs
-##
-if [ `arch` = "x86_64" ]; then
- ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so
- ln -sf /lib/libuuid.so.1 /lib/libuuid.so
-fi
-
-##
-## Build
-##
-echo "$(basename $0): Getting Ready to build release package"
-
-case ${EXTRA_OPTIONS} in
- *-b*)
- BUILD_TARGET=""
- ;;
- *)
- BUILD_TARGET="-ba"
- ;;
-esac
-
-pushd ${RPMSPECDIR}
-${RPM} ${BUILD_TARGET} ${EXTRA_OPTIONS} ${SPECFILE}
-popd
-
-echo "$(basename $0): Done."
-
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
deleted file mode 100755
index 7c8a8ee..0000000
--- a/packaging/RHEL-CTDB/makespec.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) Michael Adam 2008
-#
-# Script to determine the samba version and create the SPEC file from template
-
-DIRNAME=$(dirname $0)
-TOPDIR=${DIRNAME}/../..
-SRCDIR=${TOPDIR}/source3
-VERSION_H=${SRCDIR}/include/autoconf/version.h
-SPECFILE=${DIRNAME}/samba.spec
-
-##
-## determine the samba version and create the SPEC file
-##
-pushd ${SRCDIR}
-./script/mkversion.sh
-popd
-if [ ! -f ${VERSION_H} ] ; then
- echo "Error creating version.h"
- exit 1
-fi
-
-VERSION=`grep "^#define SAMBA_VERSION_OFFICIAL_STRING " ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep "^#define SAMBA_VERSION_VENDOR_SUFFIX " ${VERSION_H} | awk '{print $3}'`
-if test "x${vendor_version}" != "x" ; then
- VERSION="${VERSION}-${vendor_version}"
-fi
-vendor_patch=`grep "^#define SAMBA_VERSION_VENDOR_PATCH " ${VERSION_H} | awk '{print $3}'`
-if test "x${vendor_patch}" != "x" ; then
- VERSION="${VERSION}-${vendor_patch}"
-fi
-VERSION=`echo ${VERSION} | sed 's/-/_/g'`
-VERSION=`echo ${VERSION} | sed 's/\"//g'`
-echo "VERSION: ${VERSION}"
-
-# to build a release-rpm, set USE_GITHASH="no"
-# in the environmet
-#
-if test "x$USE_GITHASH" = "xno" ; then
- GITHASH=""
- echo "GITHASH: not used"
-else
- GITHASH=".$(git log --pretty=format:%h -1)"
- echo "GITHASH: ${GITHASH}"
-fi
-
-if test "x$BUILD_GPFS" = "xno"; then
- echo "GPFS: not build by default"
- PGPFS_DEFAULT="%{?_with_gpfs: 1} %{?!_with_gpfs: 0}"
-else
- echo "GPFS: build by default"
- PGPFS_DEFAULT="%{?_with_no_gpfs: 0} %{?!_with_no_gpfs: 1}"
-fi
-
-sed \
- -e "s/PVERSION/${VERSION}/g" \
- -e "s/GITHASH/${GITHASH}/g" \
- -e "s/PGPFS_NO_DEFAULT/${PGPFS_NO_DEFAULT}/g" \
- -e "s/PGPFS_DEFAULT/${PGPFS_DEFAULT}/g" \
- < ${SPECFILE}.tmpl \
- > ${SPECFILE}
-
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
deleted file mode 100644
index fe214d2..0000000
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ /dev/null
@@ -1,549 +0,0 @@
-%define initdir %{_sysconfdir}/rc.d/init.d
-%define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
-
-Summary: Samba SMB client and server
-Vendor: Samba Team
-Packager: Samba Team <samba at lists.samba.org>
-Name: samba
-Version: PVERSION
-Release: 1GITHASH
-Epoch: 0
-License: GNU GPL version 3
-Group: System Environment/Daemons
-URL: http://www.samba.org/
-
-Source: samba-%{version}.tar.bz2
-
-# Don't depend on Net::LDAP
-Source998: filter-requires-samba.sh
-Source999: setup.tar.bz2
-
-Requires: /sbin/chkconfig /bin/mktemp /usr/bin/killall
-Requires: fileutils sed /etc/init.d
-
-Requires: pam >= 0.64 %{auth}
-Requires: samba-common = %{version}-%{release}
-Provides: samba = %{version}
-
-Prefix: /usr
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, e2fsprogs-devel, gettext
-# requirements for building the man pages:
-BuildRequires: libxslt, docbook-utils, docbook-style-xsl, rsync
-BuildRequires: ctdb-devel >= 1.2.25
-
-# Working around perl dependency problem from docs
-%define __perl_requires %{SOURCE998}
-
-# rpm screws up the arch lib dir when using --target on RHEL5
-%ifarch i386 i486 i586 i686 ppc s390
-%define _libarch lib
-%else
-%define _libarch %_lib
-%endif
-
-%define _libarchdir /usr/%{_libarch}
-
-%define numcpu %(grep "^processor" /proc/cpuinfo |wc -l | sed -e 's/^0$/1/')
-
-%define with_vfs_gpfs PGPFS_DEFAULT
-%define with_vfs_tsmsm PGPFS_DEFAULT
-
-%if %{with_vfs_tsmsm}
-%define vfs_tsmsm ,vfs_tsmsm
-%endif
-
-%if %{with_vfs_gpfs}
-%define vfs_gpfs ,vfs_gpfs
-%endif
-
-%define vfs_modules %{?vfs_gpfs}%{?vfs_tsmsm}
-
-%define shared_modules idmap_rid,idmap_ad,idmap_tdb2%{vfs_modules}
-
-%description
-Samba is the protocol by which a lot of PC-related machines share
-files, printers, and other information (such as lists of available
-files and printers). The Windows NT, OS/2, and Linux operating systems
-support this natively, and add-on packages can enable the same thing
-for DOS, Windows, VMS, UNIX of all kinds, MVS, and more. This package
-provides an SMB server that can be used to provide network services to
-SMB (sometimes called "Lan Manager") clients. Samba uses NetBIOS over
-TCP/IP (NetBT) protocols and does NOT need the NetBEUI (Microsoft Raw
-NetBIOS frame) protocol.
-
-
-######################################################################
-%package client
-Summary: Samba (SMB) client programs.
-Group: Applications/System
-Requires: samba-common = %{version}-%{release}
-Obsoletes: smbfs
-Provides: samba-client = %{version}-%{release}
-
-%description client
-The samba-client package provides some SMB clients to compliment the
-built-in SMB filesystem in Linux. These clients allow access of SMB
-shares and printing to SMB printers.
-
-
-#######################################################################
-%package common
-Summary: Files used by both Samba servers and clients.
-Group: Applications/System
-Provides: samba-common = %{version}-%{release}
-
-%description common
-Samba-common provides files necessary for both the server and client
-packages of Samba.
-
-
-
-#######################################################################
-%package doc
-Summary: Samba Documentation
-Group: Documentation/Other
-Provides: samba-doc = %{version}-%{release}
-Requires: /usr/bin/find /bin/rm /usr/bin/xargs
-
-%description doc
-The samba-doc package includes the HTML versions of the Samba manpages as well
-as the HTML and PDF version of "Using Samba", "Samba By Example", and "The
-Official Samba HOWTO and Reference Guide".
-
-
-#######################################################################
-
-%prep
-%setup -q
-
-# setup the vendor files (init scripts, etc...)
-%setup -T -D -a 999 -n samba-%{version} -q
-
-%build
-
-/bin/cp setup/filter-requires-samba.sh %{SOURCE998}
-
-cd source3
-# RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
-
-## check for ccache
-if ccache -h >/dev/null 2>&1 ; then
- CC="ccache gcc"
-else
- CC="gcc"
-fi
-
-export CC
-
-## always run autogen.sh
-./autogen.sh
-
-CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
- --prefix=%{_prefix} \
- --localstatedir=/var \
- --with-configdir=%{_sysconfdir}/samba \
- --libdir=%{_libarchdir} \
- --with-modulesdir=%{_libarchdir}/samba \
- --with-pammodulesdir=/%{_libarch}/security \
- --with-lockdir=/var/lib/samba \
- --with-logfilebase=/var/log/samba \
- --mandir=%{_mandir} \
- --with-piddir=/var/run \
- --with-privatedir=%{_sysconfdir}/samba \
- --disable-cups \
- --with-acl-support \
- --with-ads \
- --with-automount \
- --enable-fhs \
- --with-libsmbclient \
--
Samba Shared Repository
More information about the samba-cvs
mailing list