From 75a4a592e5ccda30715f93563d741b83e0dcf39e Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 25 Apr 2011 13:37:00 +0000 Subject: Slackware 13.37 Mon Apr 25 13:37:00 UTC 2011 Slackware 13.37 x86_64 stable is released! Thanks to everyone who pitched in on this release: the Slackware team, the folks producing upstream code, and linuxquestions.org for providing a great forum for collaboration and testing. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. As always, thanks to the Slackware community for testing, suggestions, and feedback. :-) Have fun! --- source/n/samba/prune-samba.sh | 33 +++++++++++++++++++++++++++++++++ source/n/samba/samba.SlackBuild | 14 ++++++++++++-- source/n/samba/slack-desc | 16 ++++++++-------- source/n/samba/talloc.pc | 11 +++++++++++ 4 files changed, 64 insertions(+), 10 deletions(-) create mode 100755 source/n/samba/prune-samba.sh create mode 100644 source/n/samba/talloc.pc (limited to 'source/n/samba') diff --git a/source/n/samba/prune-samba.sh b/source/n/samba/prune-samba.sh new file mode 100755 index 000000000..a6106df33 --- /dev/null +++ b/source/n/samba/prune-samba.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# Copyright 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Pare down the Samba sources to just Samba3 for now, and drop redundant docs. +# This script expects the samba sources to be unpacked in the current +# directory. It will then "pare" them. You'll be expected to repack them +# afterwards. + +cd samba-?.?.? || cd samba-?.?.?? || exit 1 + +rm --verbose WHATSNEW4.txt howto-ol-backend-s4.txt howto4.txt prog_guide4.txt +rm -r --verbose docs-xml packaging4 source4 swat2* +rm --verbose docs/*.pdf + diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index cf3918a19..b7cbeefdd 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-$(echo samba-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo samba-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -42,7 +42,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf samba-$VERSION -tar xvf $CWD/samba-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/samba-$VERSION.tar.xz || exit 1 cd samba-$VERSION || exit 1 if [ ! -d source3/lib/cmdline ]; then @@ -69,6 +69,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi # Some of these options could be auto-detected, but declaring them @@ -93,6 +96,7 @@ CFLAGS="$SLKCFLAGS" \ --with-swatdir=/usr/share/swat \ --with-logfilebase=/var/log/samba \ --enable-cups \ + --enable-external-libtalloc=no \ --enable-static=no \ --enable-shared=yes \ --with-acl-support=yes \ @@ -133,6 +137,12 @@ cp -a ../nsswitch/libnss_wins.so $PKG/lib${LIBDIRSUFFIX}/libnss_wins.so.2 ln -sf libnss_wins.so.2 libnss_wins.so ) +# Install a pkgconfig file for libtalloc: +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig +if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc ]; then + cat $CWD/talloc.pc | sed -e "s/\/lib/\/lib${LIBDIRSUFFIX}/" > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/talloc.pc +fi + ## Make sure that other programs can link against libsmbclient: #( cd $PKG/usr/lib${LIBDIRSUFFIX} # for FILE in samba/libsmbclient.so* ; do diff --git a/source/n/samba/slack-desc b/source/n/samba/slack-desc index dc42f2b6f..c06b485d9 100644 --- a/source/n/samba/slack-desc +++ b/source/n/samba/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -samba: samba (SMB file and print server) +samba: samba (SMB/CIFS file and print server) samba: -samba: Samba is an SMB file and print server for SMB and CIFS clients. It -samba: allows you to make file space or printers on a Samba host available to -samba: any PCs running SMB clients (such as PCs running Windows). +samba: Samba is an SMB/CIFS file and print server for SMB and CIFS clients. +samba: It allows you to make file space or printers on a Samba host +samba: available to SMB/CIFS clients (such as PCs running Windows). samba: -samba: If you have any SMB servers (such as Windows NT/2K Server), you may be -samba: able to replace them by or supplement them with Samba. One of Samba's -samba: big strengths is integration, so you can use it to tie together your -samba: Linux hosts and Windows PC clients. +samba: If you have any Windows file servers, you may be able to replace them +samba: or supplement them with Samba. One of Samba's big strengths is +samba: integration, so you can use it to tie together your Linux hosts and +samba: Windows PC clients. samba: diff --git a/source/n/samba/talloc.pc b/source/n/samba/talloc.pc new file mode 100644 index 000000000..7a23835ce --- /dev/null +++ b/source/n/samba/talloc.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: talloc +Description: A hierarchical pool based memory system with destructors +Version: 2.0.1 +Libs: -L${libdir} -ltalloc +Cflags: -I${includedir} +URL: http://talloc.samba.org/ -- cgit v1.2.3