[Pkg-samba-maint] r2574 - in trunk/samba/debian: . patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sat Feb 14 17:55:37 UTC 2009
Author: vorlon
Date: 2009-02-14 17:55:37 +0000 (Sat, 14 Feb 2009)
New Revision: 2574
Added:
trunk/samba/debian/patches/fhs-assignpaths.patch.old
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/patches/autoconf.patch
trunk/samba/debian/patches/fhs-assignpaths.patch
trunk/samba/debian/patches/fhs-filespaths-debatable.patch
trunk/samba/debian/patches/proper-static-lib-linking.patch
trunk/samba/debian/patches/series
trunk/samba/debian/rules
Log:
merge revisions 2197:2203 from experimental
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2009-02-14 17:34:53 UTC (rev 2573)
+++ trunk/samba/debian/changelog 2009-02-14 17:55:37 UTC (rev 2574)
@@ -47,6 +47,12 @@
-- Christian Perrier <bubulle at debian.org> Thu, 27 Nov 2008 11:36:35 +0100
+samba (2:3.3.0~pre2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Christian Perrier <bubulle at debian.org> Fri, 07 Nov 2008 20:52:36 +0100
+
samba (2:3.2.4-1) unstable; urgency=low
[ Steve Langasek ]
Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch 2009-02-14 17:34:53 UTC (rev 2573)
+++ trunk/samba/debian/patches/autoconf.patch 2009-02-14 17:55:37 UTC (rev 2574)
@@ -25,11 +25,11 @@
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba-deb/source/configure
+Index: samba-3.3.0pre2/source/configure
===================================================================
---- samba-deb.orig/source/configure
-+++ samba-deb/source/configure
-@@ -788,6 +788,7 @@
+--- samba-3.3.0pre2.orig/source/configure
++++ samba-3.3.0pre2/source/configure
+@@ -791,6 +791,7 @@
LIBTALLOC_SHARED
LIBTALLOC_STATIC
LIBTALLOC_LIBS
@@ -37,7 +37,7 @@
INSTALL_LIBTALLOC
UNINSTALL_LIBTALLOC
LIBTALLOC_SOVER
-@@ -796,6 +797,7 @@
+@@ -799,6 +800,7 @@
LIBTDB_SHARED
LIBTDB_STATIC
LIBTDB_LIBS
@@ -45,7 +45,7 @@
INSTALL_LIBTDB
UNINSTALL_LIBTDB
LIBTDB_SOVER
-@@ -804,6 +806,7 @@
+@@ -807,6 +809,7 @@
LIBNETAPI_SHARED
LIBNETAPI_STATIC
LIBNETAPI_LIBS
@@ -53,7 +53,7 @@
INSTALL_LIBNETAPI
UNINSTALL_LIBNETAPI
LIBNETAPI_SOVER
-@@ -812,6 +815,7 @@
+@@ -815,6 +818,7 @@
LIBSMBCLIENT_SHARED
LIBSMBCLIENT_STATIC
LIBSMBCLIENT_LIBS
@@ -61,7 +61,7 @@
INSTALL_LIBSMBCLIENT
UNINSTALL_LIBSMBCLIENT
LIBSMBCLIENT_SOVER
-@@ -820,6 +824,7 @@
+@@ -823,6 +827,7 @@
LIBSMBSHAREMODES_SHARED
LIBSMBSHAREMODES_STATIC
LIBSMBSHAREMODES_LIBS
@@ -69,7 +69,7 @@
INSTALL_LIBSMBSHAREMODES
UNINSTALL_LIBSMBSHAREMODES
LIBSMBSHAREMODES_SOVER
-@@ -828,6 +833,7 @@
+@@ -831,6 +836,7 @@
LIBADDNS_SHARED
LIBADDNS_STATIC
LIBADDNS_LIBS
@@ -77,28 +77,33 @@
INSTALL_LIBADDNS
UNINSTALL_LIBADDNS
LIBADDNS_SOVER
-@@ -2242,7 +2248,7 @@
- if test "${with_fhs+set}" = set; then
- withval=$with_fhs; case "$withval" in
- yes)
-- lockdir="\${VARDIR}/lib/samba"
-+ lockdir="\${VARDIR}/run/samba"
- piddir="\${VARDIR}/run"
- mandir="\${prefix}/share/man"
- logfilebase="\${VARDIR}/log/samba"
-@@ -2250,9 +2256,9 @@
- test "${libdir}" || libdir="\${prefix}/lib/samba"
+@@ -2241,9 +2247,9 @@
+ pammodulesdir="${libdir}/security"
+ configdir="${libdir}"
+ swatdir="\${prefix}/swat"
+-codepagedir="\${MODULESDIR}"
+-statedir="\${LOCKDIR}"
+-cachedir="\${prefix}/cache/samba"
++codepagedir="\${prefix}/share/samba"
++statedir="\${VARDIR}/lib/samba"
++cachedir="\${VARDIR}/cache/samba"
+
+
+ # Check whether --with-fhs was given.
+@@ -2258,10 +2264,10 @@
+ test "${libdir}" || libdir="\${prefix}/lib"
+ modulesdir="${libdir}/samba"
configdir="\${sysconfdir}/samba"
- swatdir="\${DATADIR}/samba/swat"
-- codepagedir="\${LIBDIR}"
-+ codepagedir="\${DATADIR}/samba"
+- swatdir="\${DATADIR}/samba/swat"
++ swatdir="\${prefix}/swat"
+ codepagedir="\${prefix}/share/samba"
statedir="\${VARDIR}/lib/samba"
- cachedir="\${VARDIR}/lib/samba"
+ cachedir="\${VARDIR}/cache/samba"
cat >>confdefs.h <<\_ACEOF
#define FHS_COMPATIBLE 1
-@@ -13059,6 +13065,27 @@
+@@ -13085,6 +13091,27 @@
fi
;;
@@ -126,7 +131,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
#
*linux*)
-@@ -40774,7 +40801,7 @@
+@@ -40961,7 +40988,7 @@
#
#
case "$host_os" in
@@ -135,7 +140,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -46010,11 +46037,14 @@
+@@ -46197,11 +46224,14 @@
# and these are for particular systems
case "$host_os" in
@@ -152,7 +157,7 @@
BLDSHARED="true"
if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -67170,7 +67200,8 @@
+@@ -67364,7 +67394,8 @@
LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
LIBTALLOC_SHARED=
LIBTALLOC_STATIC=
@@ -162,7 +167,7 @@
INSTALL_LIBTALLOC=
UNINSTALL_LIBTALLOC=
-@@ -67185,6 +67216,7 @@
+@@ -67379,6 +67410,7 @@
@@ -170,7 +175,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
echo $ECHO_N "checking whether to build the libtalloc shared library... $ECHO_C" >&6; }
-@@ -67219,15 +67251,17 @@
+@@ -67413,15 +67445,17 @@
UNINSTALL_LIBTALLOC=uninstalllibtalloc
if eval $BLDSHARED = true; then
LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
@@ -190,7 +195,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67254,7 +67288,8 @@
+@@ -67448,7 +67482,8 @@
LIBTDB_STATIC_TARGET=bin/libtdb.a
LIBTDB_SHARED=
LIBTDB_STATIC=
@@ -200,7 +205,7 @@
INSTALL_LIBTDB=
UNINSTALL_LIBTDB=
-@@ -67269,6 +67304,7 @@
+@@ -67463,6 +67498,7 @@
@@ -208,7 +213,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
echo $ECHO_N "checking whether to build the libtdb shared library... $ECHO_C" >&6; }
-@@ -67303,15 +67339,17 @@
+@@ -67497,15 +67533,17 @@
UNINSTALL_LIBTDB=uninstalllibtdb
if eval $BLDSHARED = true; then
LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
@@ -228,7 +233,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67338,7 +67376,8 @@
+@@ -67532,7 +67570,8 @@
LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
LIBNETAPI_SHARED=
LIBNETAPI_STATIC=
@@ -238,7 +243,7 @@
INSTALL_LIBNETAPI=
UNINSTALL_LIBNETAPI=
-@@ -67353,6 +67392,7 @@
+@@ -67547,6 +67586,7 @@
@@ -246,7 +251,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
echo $ECHO_N "checking whether to build the libnetapi shared library... $ECHO_C" >&6; }
-@@ -67387,15 +67427,17 @@
+@@ -67581,15 +67621,17 @@
UNINSTALL_LIBNETAPI=uninstalllibnetapi
if eval $BLDSHARED = true; then
LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
@@ -266,7 +271,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67422,7 +67464,8 @@
+@@ -67616,7 +67658,8 @@
LIBSMBCLIENT_STATIC_TARGET=bin/libsmbclient.a
LIBSMBCLIENT_SHARED=
LIBSMBCLIENT_STATIC=
@@ -276,7 +281,7 @@
INSTALL_LIBSMBCLIENT=
UNINSTALL_LIBSMBCLIENT=
-@@ -67437,6 +67480,7 @@
+@@ -67631,6 +67674,7 @@
@@ -284,7 +289,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
echo $ECHO_N "checking whether to build the libsmbclient shared library... $ECHO_C" >&6; }
-@@ -67471,15 +67515,17 @@
+@@ -67665,15 +67709,17 @@
UNINSTALL_LIBSMBCLIENT=uninstalllibsmbclient
if eval $BLDSHARED = true; then
LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
@@ -304,7 +309,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67506,7 +67552,8 @@
+@@ -67700,7 +67746,8 @@
LIBSMBSHAREMODES_STATIC_TARGET=bin/libsmbsharemodes.a
LIBSMBSHAREMODES_SHARED=
LIBSMBSHAREMODES_STATIC=
@@ -314,7 +319,7 @@
INSTALL_LIBSMBSHAREMODES=
UNINSTALL_LIBSMBSHAREMODES=
-@@ -67521,6 +67568,7 @@
+@@ -67715,6 +67762,7 @@
@@ -322,7 +327,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
echo $ECHO_N "checking whether to build the libsmbsharemodes shared library... $ECHO_C" >&6; }
-@@ -67555,15 +67603,17 @@
+@@ -67749,15 +67797,17 @@
UNINSTALL_LIBSMBSHAREMODES=uninstalllibsmbsharemodes
if eval $BLDSHARED = true; then
LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -342,7 +347,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -67590,7 +67640,8 @@
+@@ -67784,7 +67834,8 @@
LIBADDNS_STATIC_TARGET=bin/libaddns.a
LIBADDNS_SHARED=
LIBADDNS_STATIC=
@@ -352,7 +357,7 @@
INSTALL_LIBADDNS=
UNINSTALL_LIBADDNS=
-@@ -67605,6 +67656,7 @@
+@@ -67799,6 +67850,7 @@
@@ -360,7 +365,7 @@
{ echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
echo $ECHO_N "checking whether to build the libaddns shared library... $ECHO_C" >&6; }
-@@ -67641,15 +67693,17 @@
+@@ -67835,15 +67887,17 @@
UNINSTALL_LIBADDNS=uninstalllibaddns
if eval $BLDSHARED = true; then
LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
@@ -380,7 +385,7 @@
{ echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
echo "${ECHO_T}no shared library support -- will supply static library" >&6; }
fi
-@@ -69660,7 +69714,7 @@
+@@ -69916,7 +69970,7 @@
echo "${ECHO_T}yes" >&6; };
case "$host_os" in
@@ -389,7 +394,7 @@
{ echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6; }
if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -70868,11 +70922,11 @@
+@@ -71124,11 +71178,11 @@
WINBIND_NSS_PTHREAD=""
case "$host_os" in
@@ -403,7 +408,7 @@
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
-@@ -76739,6 +76793,7 @@
+@@ -77275,6 +77329,7 @@
LIBTALLOC_SHARED!$LIBTALLOC_SHARED$ac_delim
LIBTALLOC_STATIC!$LIBTALLOC_STATIC$ac_delim
LIBTALLOC_LIBS!$LIBTALLOC_LIBS$ac_delim
@@ -411,7 +416,7 @@
INSTALL_LIBTALLOC!$INSTALL_LIBTALLOC$ac_delim
UNINSTALL_LIBTALLOC!$UNINSTALL_LIBTALLOC$ac_delim
LIBTALLOC_SOVER!$LIBTALLOC_SOVER$ac_delim
-@@ -76747,6 +76802,7 @@
+@@ -77283,6 +77338,7 @@
LIBTDB_SHARED!$LIBTDB_SHARED$ac_delim
LIBTDB_STATIC!$LIBTDB_STATIC$ac_delim
LIBTDB_LIBS!$LIBTDB_LIBS$ac_delim
@@ -419,34 +424,34 @@
INSTALL_LIBTDB!$INSTALL_LIBTDB$ac_delim
UNINSTALL_LIBTDB!$UNINSTALL_LIBTDB$ac_delim
LIBTDB_SOVER!$LIBTDB_SOVER$ac_delim
-@@ -76755,12 +76811,10 @@
+@@ -77291,9 +77347,7 @@
LIBNETAPI_SHARED!$LIBNETAPI_SHARED$ac_delim
LIBNETAPI_STATIC!$LIBNETAPI_STATIC$ac_delim
LIBNETAPI_LIBS!$LIBNETAPI_LIBS$ac_delim
+-INSTALL_LIBNETAPI!$INSTALL_LIBNETAPI$ac_delim
+-UNINSTALL_LIBNETAPI!$UNINSTALL_LIBNETAPI$ac_delim
+-LIBNETAPI_SOVER!$LIBNETAPI_SOVER$ac_delim
+LIBNETAPI_TARGET!$LIBNETAPI_TARGET$ac_delim
- INSTALL_LIBNETAPI!$INSTALL_LIBNETAPI$ac_delim
- UNINSTALL_LIBNETAPI!$UNINSTALL_LIBNETAPI$ac_delim
- LIBNETAPI_SOVER!$LIBNETAPI_SOVER$ac_delim
--LIBSMBCLIENT_SHARED_TARGET!$LIBSMBCLIENT_SHARED_TARGET$ac_delim
--LIBSMBCLIENT_STATIC_TARGET!$LIBSMBCLIENT_STATIC_TARGET$ac_delim
--LIBSMBCLIENT_SHARED!$LIBSMBCLIENT_SHARED$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -76802,8 +76856,12 @@
+@@ -77335,11 +77389,15 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+LIBSMBCLIENT_SHARED_TARGET!$LIBSMBCLIENT_SHARED_TARGET$ac_delim
-+LIBSMBCLIENT_STATIC_TARGET!$LIBSMBCLIENT_STATIC_TARGET$ac_delim
-+LIBSMBCLIENT_SHARED!$LIBSMBCLIENT_SHARED$ac_delim
++INSTALL_LIBNETAPI!$INSTALL_LIBNETAPI$ac_delim
++UNINSTALL_LIBNETAPI!$UNINSTALL_LIBNETAPI$ac_delim
++LIBNETAPI_SOVER!$LIBNETAPI_SOVER$ac_delim
+ LIBSMBCLIENT_SHARED_TARGET!$LIBSMBCLIENT_SHARED_TARGET$ac_delim
+ LIBSMBCLIENT_STATIC_TARGET!$LIBSMBCLIENT_STATIC_TARGET$ac_delim
+ LIBSMBCLIENT_SHARED!$LIBSMBCLIENT_SHARED$ac_delim
LIBSMBCLIENT_STATIC!$LIBSMBCLIENT_STATIC$ac_delim
LIBSMBCLIENT_LIBS!$LIBSMBCLIENT_LIBS$ac_delim
+LIBSMBCLIENT_TARGET!$LIBSMBCLIENT_TARGET$ac_delim
INSTALL_LIBSMBCLIENT!$INSTALL_LIBSMBCLIENT$ac_delim
UNINSTALL_LIBSMBCLIENT!$UNINSTALL_LIBSMBCLIENT$ac_delim
LIBSMBCLIENT_SOVER!$LIBSMBCLIENT_SOVER$ac_delim
-@@ -76812,6 +76870,7 @@
+@@ -77348,6 +77406,7 @@
LIBSMBSHAREMODES_SHARED!$LIBSMBSHAREMODES_SHARED$ac_delim
LIBSMBSHAREMODES_STATIC!$LIBSMBSHAREMODES_STATIC$ac_delim
LIBSMBSHAREMODES_LIBS!$LIBSMBSHAREMODES_LIBS$ac_delim
@@ -454,7 +459,7 @@
INSTALL_LIBSMBSHAREMODES!$INSTALL_LIBSMBSHAREMODES$ac_delim
UNINSTALL_LIBSMBSHAREMODES!$UNINSTALL_LIBSMBSHAREMODES$ac_delim
LIBSMBSHAREMODES_SOVER!$LIBSMBSHAREMODES_SOVER$ac_delim
-@@ -76820,6 +76879,7 @@
+@@ -77356,6 +77415,7 @@
LIBADDNS_SHARED!$LIBADDNS_SHARED$ac_delim
LIBADDNS_STATIC!$LIBADDNS_STATIC$ac_delim
LIBADDNS_LIBS!$LIBADDNS_LIBS$ac_delim
@@ -462,19 +467,19 @@
INSTALL_LIBADDNS!$INSTALL_LIBADDNS$ac_delim
UNINSTALL_LIBADDNS!$UNINSTALL_LIBADDNS$ac_delim
LIBADDNS_SOVER!$LIBADDNS_SOVER$ac_delim
-@@ -76857,7 +76917,7 @@
+@@ -77395,7 +77455,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: samba-deb/source/include/config.h.in
+Index: samba-3.3.0pre2/source/include/config.h.in
===================================================================
---- samba-deb.orig/source/include/config.h.in
-+++ samba-deb/source/include/config.h.in
+--- samba-3.3.0pre2.orig/source/include/config.h.in
++++ samba-3.3.0pre2/source/include/config.h.in
@@ -66,6 +66,9 @@
/* Whether to use fully FHS-compatible paths */
#undef FHS_COMPATIBLE
Modified: trunk/samba/debian/patches/fhs-assignpaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-assignpaths.patch 2009-02-14 17:34:53 UTC (rev 2573)
+++ trunk/samba/debian/patches/fhs-assignpaths.patch 2009-02-14 17:55:37 UTC (rev 2574)
@@ -7,11 +7,11 @@
Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
change their default behaviour
-Index: samba-3.2.0rc1/source/param/loadparm.c
+Index: samba-3.3.0pre2/source/param/loadparm.c
===================================================================
---- samba-3.2.0rc1.orig/source/param/loadparm.c
-+++ samba-3.2.0rc1/source/param/loadparm.c
-@@ -121,6 +121,9 @@
+--- samba-3.3.0pre2.orig/source/param/loadparm.c
++++ samba-3.3.0pre2/source/param/loadparm.c
+@@ -120,6 +120,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
char *szOs2DriverMap;
@@ -21,7 +21,7 @@
char *szLockDir;
char *szPidDir;
char *szRootdir;
-@@ -3677,6 +3680,26 @@
+@@ -3705,6 +3708,26 @@
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
@@ -48,7 +48,7 @@
{
.label = "lock directory",
.type = P_STRING,
-@@ -3695,6 +3718,7 @@
+@@ -3723,6 +3746,7 @@
.enum_list = NULL,
.flags = FLAG_HIDE,
},
@@ -56,28 +56,56 @@
{
.label = "pid directory",
.type = P_STRING,
-Index: samba-3.2.0rc1/source/m4/check_path.m4
+Index: samba-3.3.0pre2/source/m4/check_path.m4
===================================================================
---- samba-3.2.0rc1.orig/source/m4/check_path.m4
-+++ samba-3.2.0rc1/source/m4/check_path.m4
-@@ -33,7 +33,7 @@
+--- samba-3.3.0pre2.orig/source/m4/check_path.m4
++++ samba-3.3.0pre2/source/m4/check_path.m4
+@@ -26,9 +26,9 @@
+ pammodulesdir="${libdir}/security"
+ configdir="${libdir}"
+ swatdir="\${prefix}/swat"
+-codepagedir="\${MODULESDIR}"
+-statedir="\${LOCKDIR}"
+-cachedir="\${LOCKDIR}"
++codepagedir="\${prefix}/share/samba"
++statedir="\${VARDIR}/lib/samba"
++cachedir="\${VARDIR}/cache/samba"
+
+ AC_ARG_WITH(fhs,
[AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
- [ case "$withval" in
- yes)
-- lockdir="\${VARDIR}/lib/samba"
-+ lockdir="\${VARDIR}/run/samba"
- piddir="\${VARDIR}/run"
- mandir="\${prefix}/share/man"
- logfilebase="\${VARDIR}/log/samba"
-@@ -41,9 +41,9 @@
- test "${libdir}" || libdir="\${prefix}/lib/samba"
+@@ -42,10 +42,10 @@
+ test "${libdir}" || libdir="\${prefix}/lib"
+ modulesdir="${libdir}/samba"
configdir="\${sysconfdir}/samba"
- swatdir="\${DATADIR}/samba/swat"
-- codepagedir="\${LIBDIR}"
-+ codepagedir="\${DATADIR}/samba"
+- swatdir="\${DATADIR}/samba/swat"
+- codepagedir="\${MODULESDIR}"
++ swatdir="\${prefix}/swat"
++ codepagedir="\${prefix}/share/samba"
statedir="\${VARDIR}/lib/samba"
- cachedir="\${VARDIR}/lib/samba"
+ cachedir="\${VARDIR}/cache/samba"
AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
;;
esac])
+Index: samba-3.3.0pre2/source/configure
+===================================================================
+--- samba-3.3.0pre2.orig/source/configure
++++ samba-3.3.0pre2/source/configure
+@@ -2243,7 +2243,7 @@
+ swatdir="\${prefix}/swat"
+ codepagedir="\${MODULESDIR}"
+ statedir="\${LOCKDIR}"
+-cachedir="\${LOCKDIR}"
++cachedir="\${prefix}/cache/samba"
+
+
+ # Check whether --with-fhs was given.
+@@ -2259,7 +2259,7 @@
+ modulesdir="${libdir}/samba"
+ configdir="\${sysconfdir}/samba"
+ swatdir="\${DATADIR}/samba/swat"
+- codepagedir="\${MODULESDIR}"
++ codepagedir="\${prefix}/share/samba"
+ statedir="\${VARDIR}/lib/samba"
+ cachedir="\${VARDIR}/lib/samba"
+
Copied: trunk/samba/debian/patches/fhs-assignpaths.patch.old (from rev 2203, branches/samba/experimental/debian/patches/fhs-assignpaths.patch.old)
===================================================================
--- trunk/samba/debian/patches/fhs-assignpaths.patch.old (rev 0)
+++ trunk/samba/debian/patches/fhs-assignpaths.patch.old 2009-02-14 17:55:37 UTC (rev 2574)
@@ -0,0 +1,81 @@
+Goal: Change install paths to better respect FHS. This needs fhs-newpaths.patch
+ to introduce new path variables and fhs-filespaths.patch to
+ associate files with these
+
+Fixes: #49011
+
+Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
+ change their default behaviour
+
+Index: samba-3.3.0pre2/source/param/loadparm.c
+===================================================================
+--- samba-3.3.0pre2.orig/source/param/loadparm.c
++++ samba-3.3.0pre2/source/param/loadparm.c
+@@ -120,6 +120,9 @@
+ char *szAddPrinterCommand;
+ char *szDeletePrinterCommand;
+ char *szOs2DriverMap;
++#ifdef FHS_COMPATIBLE
++ char *szLockDirStub;
++#endif
+ char *szLockDir;
+ char *szPidDir;
+ char *szRootdir;
+@@ -3705,6 +3708,26 @@
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
++#ifdef FHS_COMPATIBLE
++ {
++ .label = "lock directory",
++ .type = P_STRING,
++ .p_class = P_GLOBAL,
++ .ptr = &Globals.szLockDirStub,
++ .special = NULL,
++ .enum_list = NULL,
++ .flags = 0,
++ },
++ {
++ .label = "lock dir",
++ .type = P_STRING,
++ .p_class = P_GLOBAL,
++ .ptr = &Globals.szLockDirStub,
++ .special = NULL,
++ .enum_list = NULL,
++ .flags = 0,
++ },
++#else
+ {
+ .label = "lock directory",
+ .type = P_STRING,
+@@ -3723,6 +3746,7 @@
+ .enum_list = NULL,
+ .flags = FLAG_HIDE,
+ },
++#endif
+ {
+ .label = "pid directory",
+ .type = P_STRING,
+Index: samba-3.3.0pre2/source/m4/check_path.m4
+===================================================================
+--- samba-3.3.0pre2.orig/source/m4/check_path.m4
++++ samba-3.3.0pre2/source/m4/check_path.m4
+@@ -26,15 +26,15 @@
+ pammodulesdir="${libdir}/security"
+ configdir="${libdir}"
+ swatdir="\${prefix}/swat"
+-codepagedir="\${MODULESDIR}"
++codepagedir="\${DATADIR}/samba"
+ statedir="\${LOCKDIR}"
+-cachedir="\${LOCKDIR}"
++cachedir="\${VARDIR}/cache/samba"
+
+ AC_ARG_WITH(fhs,
+ [AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
+ [ case "$withval" in
+ yes)
+- lockdir="\${VARDIR}/lib/samba"
++ lockdir="\${VARDIR}/run/samba"
+ piddir="\${VARDIR}/run"
+ mandir="\${prefix}/share/man"
+ logfilebase="\${VARDIR}/log/samba"
Modified: trunk/samba/debian/patches/fhs-filespaths-debatable.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths-debatable.patch 2009-02-14 17:34:53 UTC (rev 2573)
+++ trunk/samba/debian/patches/fhs-filespaths-debatable.patch 2009-02-14 17:55:37 UTC (rev 2574)
@@ -46,11 +46,11 @@
grep -r lp_lockdir source/ | grep -vE \
'%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
-Index: samba-3.2.0rc1/source/lib/util.c
+Index: samba-3.3.0pre2/source/lib/util.c
===================================================================
---- samba-3.2.0rc1.orig/source/lib/util.c
-+++ samba-3.2.0rc1/source/lib/util.c
-@@ -2624,6 +2624,15 @@
+--- samba-3.3.0pre2.orig/source/lib/util.c
++++ samba-3.3.0pre2/source/lib/util.c
+@@ -2637,6 +2637,15 @@
return xx_path(name, get_dyn_STATEDIR());
}
@@ -66,10 +66,10 @@
/**
* @brief Returns the platform specific shared library extension.
*
-Index: samba-3.2.0rc1/source/libsmb/samlogon_cache.c
+Index: samba-3.3.0pre2/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.2.0rc1.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.2.0rc1/source/libsmb/samlogon_cache.c
+--- samba-3.3.0pre2.orig/source/libsmb/samlogon_cache.c
++++ samba-3.3.0pre2/source/libsmb/samlogon_cache.c
@@ -34,7 +34,7 @@
bool netsamlogon_cache_init(void)
{
@@ -79,10 +79,10 @@
TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
}
-Index: samba-3.2.0rc1/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.3.0pre2/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.2.0rc1.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.2.0rc1/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.3.0pre2.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.3.0pre2/source/nmbd/nmbd_serverlistdb.c
@@ -326,7 +326,7 @@
updatecount++;
@@ -92,10 +92,10 @@
if (!fname) {
return;
}
-Index: samba-3.2.0rc1/source/passdb/login_cache.c
+Index: samba-3.3.0pre2/source/passdb/login_cache.c
===================================================================
---- samba-3.2.0rc1.orig/source/passdb/login_cache.c
-+++ samba-3.2.0rc1/source/passdb/login_cache.c
+--- samba-3.3.0pre2.orig/source/passdb/login_cache.c
++++ samba-3.3.0pre2/source/passdb/login_cache.c
@@ -35,7 +35,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -105,10 +105,10 @@
if (cache_fname)
DEBUG(5, ("Opening cache file at %s\n", cache_fname));
else {
-Index: samba-3.2.0rc1/source/printing/printing.c
+Index: samba-3.3.0pre2/source/printing/printing.c
===================================================================
---- samba-3.2.0rc1.orig/source/printing/printing.c
-+++ samba-3.2.0rc1/source/printing/printing.c
+--- samba-3.3.0pre2.orig/source/printing/printing.c
++++ samba-3.3.0pre2/source/printing/printing.c
@@ -183,8 +183,8 @@
int services = lp_numservices();
int snum;
@@ -120,10 +120,10 @@
/* handle a Samba upgrade */
-Index: samba-3.2.0rc1/source/printing/printing_db.c
+Index: samba-3.3.0pre2/source/printing/printing_db.c
===================================================================
---- samba-3.2.0rc1.orig/source/printing/printing_db.c
-+++ samba-3.2.0rc1/source/printing/printing_db.c
+--- samba-3.3.0pre2.orig/source/printing/printing_db.c
++++ samba-3.3.0pre2/source/printing/printing_db.c
@@ -91,7 +91,7 @@
}
@@ -133,11 +133,11 @@
printername) < 0) {
DLIST_REMOVE(print_db_head, p);
SAFE_FREE(p);
-Index: samba-3.2.0rc1/source/smbd/lanman.c
+Index: samba-3.3.0pre2/source/smbd/lanman.c
===================================================================
---- samba-3.2.0rc1.orig/source/smbd/lanman.c
-+++ samba-3.2.0rc1/source/smbd/lanman.c
-@@ -1157,9 +1157,9 @@
+--- samba-3.3.0pre2.orig/source/smbd/lanman.c
++++ samba-3.3.0pre2/source/smbd/lanman.c
+@@ -1154,9 +1154,9 @@
bool local_list_only;
int i;
@@ -149,11 +149,11 @@
return 0;
}
-Index: samba-3.2.0rc1/source/utils/smbcontrol.c
+Index: samba-3.3.0pre2/source/utils/smbcontrol.c
===================================================================
---- samba-3.2.0rc1.orig/source/utils/smbcontrol.c
-+++ samba-3.2.0rc1/source/utils/smbcontrol.c
-@@ -875,10 +875,10 @@
+--- samba-3.3.0pre2.orig/source/utils/smbcontrol.c
++++ samba-3.3.0pre2/source/utils/smbcontrol.c
+@@ -868,10 +868,10 @@
/* Remove the entry in the winbindd_cache tdb to tell a later
starting winbindd that we're online. */
@@ -166,7 +166,7 @@
return False;
}
-@@ -912,13 +912,13 @@
+@@ -898,13 +898,13 @@
starting winbindd that we're offline. We may actually create
it here... */
@@ -182,10 +182,10 @@
return False;
}
-Index: samba-3.2.0rc1/source/libgpo/gpo_fetch.c
+Index: samba-3.3.0pre2/source/libgpo/gpo_fetch.c
===================================================================
---- samba-3.2.0rc1.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.2.0rc1/source/libgpo/gpo_fetch.c
+--- samba-3.3.0pre2.orig/source/libgpo/gpo_fetch.c
++++ samba-3.3.0pre2/source/libgpo/gpo_fetch.c
@@ -59,7 +59,7 @@
if ((path = talloc_asprintf(mem_ctx,
@@ -204,24 +204,11 @@
char *current_dir;
char *tok;
-Index: samba-3.2.0rc1/source/winbindd/idmap_cache.c
+Index: samba-3.3.0pre2/source/winbindd/winbindd_cache.c
===================================================================
---- samba-3.2.0rc1.orig/source/winbindd/idmap_cache.c
-+++ samba-3.2.0rc1/source/winbindd/idmap_cache.c
-@@ -54,7 +54,7 @@
- return NULL;
- }
-
-- cache_fname = lock_path("idmap_cache.tdb");
-+ cache_fname = cache_path("idmap_cache.tdb");
-
- DEBUG(10, ("Opening cache file at %s\n", cache_fname));
-
-Index: samba-3.2.0rc1/source/winbindd/winbindd_cache.c
-===================================================================
---- samba-3.2.0rc1.orig/source/winbindd/winbindd_cache.c
-+++ samba-3.2.0rc1/source/winbindd/winbindd_cache.c
-@@ -2310,7 +2310,7 @@
+--- samba-3.3.0pre2.orig/source/winbindd/winbindd_cache.c
++++ samba-3.3.0pre2/source/winbindd/winbindd_cache.c
+@@ -2532,7 +2532,7 @@
return true;
/* when working offline we must not clear the cache on restart */
@@ -230,7 +217,7 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
-@@ -2353,9 +2353,9 @@
+@@ -2575,9 +2575,9 @@
tdb_close(wcache->tdb);
wcache->tdb = NULL;
@@ -242,7 +229,7 @@
strerror(errno) ));
return false;
}
-@@ -2637,7 +2637,7 @@
+@@ -2859,7 +2859,7 @@
return;
/* when working offline we must not clear the cache on restart */
@@ -251,7 +238,7 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
-@@ -3422,7 +3422,7 @@
+@@ -3688,7 +3688,7 @@
int winbindd_validate_cache(void)
{
int ret = -1;
@@ -260,7 +247,7 @@
TDB_CONTEXT *tdb = NULL;
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
-@@ -3464,7 +3464,7 @@
+@@ -3730,7 +3730,7 @@
int winbindd_validate_cache_nobackup(void)
{
int ret = -1;
@@ -269,10 +256,10 @@
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
smb_panic_fn = validate_panic;
-Index: samba-3.2.0rc1/source/printing/nt_printing.c
+Index: samba-3.3.0pre2/source/printing/nt_printing.c
===================================================================
---- samba-3.2.0rc1.orig/source/printing/nt_printing.c
-+++ samba-3.2.0rc1/source/printing/nt_printing.c
+--- samba-3.3.0pre2.orig/source/printing/nt_printing.c
++++ samba-3.3.0pre2/source/printing/nt_printing.c
@@ -2552,7 +2552,7 @@
if (geteuid() == 0) {
@@ -282,16 +269,3 @@
sharename) < 0) {
return (uint32)-1;
}
-Index: samba-3.2.0rc1/source/winbindd/idmap_tdb2.c
-===================================================================
---- samba-3.2.0rc1.orig/source/winbindd/idmap_tdb2.c
-+++ samba-3.2.0rc1/source/winbindd/idmap_tdb2.c
-@@ -68,7 +68,7 @@
- return NT_STATUS_OK;
- }
-
-- db_path = lock_path("idmap2_cache.tdb");
-+ db_path = cache_path("idmap2_cache.tdb");
-
- /* Open idmap repository */
- if (!(idmap_tdb2_tmp = tdb_open_log(db_path, 0, TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0644))) {
Modified: trunk/samba/debian/patches/proper-static-lib-linking.patch
===================================================================
--- trunk/samba/debian/patches/proper-static-lib-linking.patch 2009-02-14 17:34:53 UTC (rev 2573)
+++ trunk/samba/debian/patches/proper-static-lib-linking.patch 2009-02-14 17:55:37 UTC (rev 2574)
@@ -7,20 +7,20 @@
Note:
=== modified file 'source/Makefile.in'
-Index: samba-3.2.2/source/Makefile.in
+Index: samba-3.3.0pre2/source/Makefile.in
===================================================================
---- samba-3.2.2.orig/source/Makefile.in
-+++ samba-3.2.2/source/Makefile.in
-@@ -228,7 +228,7 @@
+--- samba-3.3.0pre2.orig/source/Makefile.in
++++ samba-3.3.0pre2/source/Makefile.in
+@@ -233,7 +233,7 @@
TDB_OBJ = lib/util_tdb.o \
lib/dbwrap.o lib/dbwrap_tdb.o \
- lib/dbwrap_tdb2.o lib/dbwrap_ctdb.o \
+ lib/dbwrap_ctdb.o \
- lib/dbwrap_rbt.o @LIBTDB_STATIC@
+ lib/dbwrap_rbt.o
SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@
-@@ -292,8 +292,7 @@
+@@ -307,8 +307,7 @@
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
@@ -30,16 +30,16 @@
$(SOCKET_WRAPPER_OBJ) \
$(NSS_WRAPPER_OBJ)
-@@ -345,7 +344,7 @@
+@@ -358,7 +357,7 @@
LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \
libaddns/dnsgss.o libaddns/dnsmarshall.o
-LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ) @LIBTALLOC_STATIC@
+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ)
- LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \
- libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o
-@@ -1057,15 +1056,15 @@
+ GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@
+
+@@ -1082,15 +1081,15 @@
iniparser_build/strlib.o
TDBBACKUP_OBJ = @tdbdir@/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
@@ -59,7 +59,7 @@
$(SOCKET_WRAPPER_OBJ)
-@@ -1260,7 +1259,7 @@
+@@ -1302,7 +1301,7 @@
dir=bin $(MAKEDIR); fi
@: >> $@ || : > $@ # what a fancy emoticon!
@@ -68,7 +68,7 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-@@ -1268,45 +1267,45 @@
+@@ -1310,45 +1309,45 @@
$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
$(WINBIND_LIBS)
@@ -121,7 +121,7 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-@@ -1319,135 +1318,135 @@
+@@ -1361,135 +1360,135 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
@@ -280,7 +280,7 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-@@ -1455,64 +1454,64 @@
+@@ -1497,64 +1496,64 @@
@SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
$(WINBIND_LIBS)
@@ -356,7 +356,7 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
-@@ -1676,7 +1675,7 @@
+@@ -1718,7 +1717,7 @@
nsswitch/libwbclient/wbc_pam.o
LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
$(WBCOMMON_OBJ) \
@@ -365,7 +365,7 @@
LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
-@@ -1948,7 +1947,7 @@
+@@ -2000,7 +1999,7 @@
LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
@@ -374,7 +374,7 @@
LIBSMBSHAREMODES_SHARED_TARGET=@LIBSMBSHAREMODES_SHARED_TARGET@
LIBSMBSHAREMODES_SOVER=@LIBSMBSHAREMODES_SOVER@
-@@ -2014,7 +2013,7 @@
+@@ -2067,7 +2066,7 @@
#-------------------------------------------------------------------
# This is probably wrong for anything other than the GNU linker.
@@ -383,7 +383,7 @@
@echo Linking shared library $@
@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \
$(LIBS) $(LIBTALLOC_LIBS) \
-@@ -2095,13 +2094,13 @@
+@@ -2148,13 +2147,13 @@
@echo "Linking $@"
@$(SHLD_MODULE) $(RPC_ECHO_OBJ)
@@ -399,7 +399,7 @@
@echo "Linking $@"
@$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
-@@ -2114,7 +2113,7 @@
+@@ -2167,7 +2166,7 @@
$(WINBIND_NSS_EXTRA_LIBS) $(WINBIND_NSS_PTHREAD) \
@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
@@ -408,7 +408,7 @@
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
-@@ -2351,55 +2350,55 @@
+@@ -2432,55 +2431,55 @@
## None here right now
#########################################################
@@ -474,10 +474,10 @@
$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
torture/t_strappend.o -L ./bin -lbigballofmud
-Index: samba-3.2.2/source/m4/aclocal.m4
+Index: samba-3.3.0pre2/source/m4/aclocal.m4
===================================================================
---- samba-3.2.2.orig/source/m4/aclocal.m4
-+++ samba-3.2.2/source/m4/aclocal.m4
+--- samba-3.3.0pre2.orig/source/m4/aclocal.m4
++++ samba-3.3.0pre2/source/m4/aclocal.m4
@@ -68,7 +68,8 @@
LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
LIBUC[_SHARED]=
Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series 2009-02-14 17:34:53 UTC (rev 2573)
+++ trunk/samba/debian/patches/series 2009-02-14 17:55:37 UTC (rev 2574)
@@ -18,8 +18,3 @@
smbtar-bashism.patch
no-unnecessary-cups.patch
shrink-dead-code.patch
-documentation-links.patch
-documentation-links-debian.patch
-smbd-prevent-access-to-root-filesystem-when-connect.patch
-bug_500129_upstream_5953.patch
-bug_509101_upstream_5904.patch
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2009-02-14 17:34:53 UTC (rev 2573)
+++ trunk/samba/debian/rules 2009-02-14 17:55:37 UTC (rev 2574)
@@ -56,6 +56,10 @@
--with-dnsupdate \
--without-libtdb \
--without-libnetapi \
+ --with-modulesdir=/usr/lib/samba \
+ --datarootdir=/usr/share \
+ --with-swatdir=/usr/share/samba/swat \
+ --with-lockdir=/var/run/samba \
ifeq ($(DEB_HOST_ARCH_OS),linux)
conf_args += \
@@ -93,7 +97,7 @@
build-stamp:
dh_testdir
- $(MAKE) -C source headers
+ $(MAKE) -C source # headers
$(MAKE) -C source everything nsswitch/libnss_wins.so
touch build-stamp
More information about the Pkg-samba-maint
mailing list