OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 18-Jul-2009 00:51:39
Branch: HEAD Handle: 2009071723513900
Modified files:
openpkg-src/libsmbclient
libsmbclient.patch libsmbclient.spec
Log:
upgrading package: libsmbclient 3.3.5 -> 3.4.0
Summary:
Revision Changes Path
1.2 +28 -5 openpkg-src/libsmbclient/libsmbclient.patch
1.60 +5 -5 openpkg-src/libsmbclient/libsmbclient.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libsmbclient/libsmbclient.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 libsmbclient.patch
--- openpkg-src/libsmbclient/libsmbclient.patch 13 Dec 2008 16:14:13
-0000 1.1
+++ openpkg-src/libsmbclient/libsmbclient.patch 17 Jul 2009 22:51:39
-0000 1.2
@@ -1,11 +1,34 @@
-Index: source/configure
---- source/configure.orig 2008-12-10 12:46:52 +0100
-+++ source/configure 2008-12-13 16:45:39 +0100
-@@ -11279,6 +11279,7 @@
+Index: source3/configure
+--- source3/configure.orig 2009-07-03 13:46:28 +0200
++++ source3/configure 2009-07-18 00:15:39 +0200
+@@ -12692,6 +12692,7 @@
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/iniparser/src"
+ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
- SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/popt"
+ SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
+@@ -75436,6 +75437,8 @@
+
+ fi
++LIBWBCLIENT_STATIC=$LIBWBCLIENT_STATIC_TARGET
++LIBWBCLIENT_SHARED=$LIBWBCLIENT_STATIC_TARGET
+
+
+ { $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp" >&5
+Index: source3/lib/sysquotas_4A.c
+--- source3/lib/sysquotas_4A.c.orig 2009-07-03 13:21:14 +0200
++++ source3/lib/sysquotas_4A.c 2009-07-18 00:14:46 +0200
+@@ -71,6 +71,10 @@
+ #define dqb_curinodes dqb_curfiles
+ #endif
+
++#if defined(_LINUX_QUOTA_VERSION) && _LINUX_QUOTA_VERSION-0 >= 2
++#define dqb_curblocks dqb_curspace
++#endif
++
+ #ifdef INITQFNAMES
+ #define USERQUOTAFILE_EXTENSION ".user"
+ #else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libsmbclient/libsmbclient.spec
============================================================================
$ cvs diff -u -r1.59 -r1.60 libsmbclient.spec
--- openpkg-src/libsmbclient/libsmbclient.spec 16 Jun 2009 21:01:47
-0000 1.59
+++ openpkg-src/libsmbclient/libsmbclient.spec 17 Jul 2009 22:51:39
-0000 1.60
@@ -31,8 +31,8 @@
Class: PLUS
Group: Filesystem
License: GPL
-Version: 3.3.5
-Release: 20090616
+Version: 3.4.0
+Release: 20090718
# list of sources
Source0: http://us1.samba.org/samba/ftp/samba-%{version}.tar.gz
@@ -63,7 +63,7 @@
%patch -p0
%build
- cd source
+ cd source3
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags openssl} -DOPENSSL_DISABLE_OLD_DES_SUPPORT" \
@@ -86,10 +86,10 @@
$RPM_BUILD_ROOT%{l_prefix}/include \
$RPM_BUILD_ROOT%{l_prefix}/lib
%{l_shtool} install -c -m 644 \
- source/include/libsmbclient.h \
+ source3/include/libsmbclient.h \
$RPM_BUILD_ROOT%{l_prefix}/include/
%{l_shtool} install -c -m 644 \
- source/bin/libsmbclient.a \
+ source3/bin/libsmbclient.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
