Request 1178 (accepted)

Overview

Request 1178 (accepted)

Check in mozldap

Created by vanmeeuwen over 8 years ago
In state accepted

Submit mozldap

Submit package Kolab:Development / mozldap to package Kolab:16 / mozldap

mozldap.spec Added

@@ -0,0 +1,310 @@
+%if 0%{?suse_version}
+%define nspr_name       mozilla-nspr
+%else
+%define nspr_name       nspr
+%endif
+%define nspr_version    4.6
+
+%if 0%{?suse_version}
+%define nss_name        mozilla-nss
+%else
+%define nss_name        nss
+%endif
+%define nss_version     3.11
+
+%define svrcore_name    svrcore
+%define svrcore_version 4.0.3
+
+%define major           6
+%define minor           0
+%define submin          5
+%define libsuffix       %{major}0
+
+Summary:          Mozilla LDAP C SDK
+Name:             mozldap
+Version:          %{major}.%{minor}.%{submin}
+Release:          11%{?dist}
+License:          MPLv1.1 or GPLv2+ or LGPLv2+
+URL:              http://www.mozilla.org/directory/csdk.html
+Group:            System Environment/Libraries
+Requires:         %{nspr_name} >= %{nspr_version}
+Requires:         %{nss_name} >= %{nss_version}
+%if 0%{?suse_version}
+Requires:         lib%{svrcore_name}0 >= %{svrcore_version}
+%else
+Requires:         %{svrcore_name} >= %{svrcore_version}
+%endif
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    %{nspr_name}-devel >= %{nspr_version}
+BuildRequires:    %{nss_name}-devel >= %{nss_version}
+BuildRequires:    %{svrcore_name}-devel >= %{svrcore_version}
+BuildRequires:    gcc-c++
+BuildRequires:    cyrus-sasl-devel
+
+Source0:          ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{version}/src/%{name}-%{version}.tar.gz
+
+%description
+The Mozilla LDAP C SDK is a set of libraries that
+allow applications to communicate with LDAP directory
+servers.  These libraries are derived from the University
+of Michigan and Netscape LDAP libraries.  They use Mozilla
+NSPR and NSS for crypto.
+
+
+%package tools
+Summary:          Tools for the Mozilla LDAP C SDK
+Group:            System Environment/Base
+Requires:         %{name} = %{version}-%{release}
+BuildRequires:    %{nspr_name}-devel >= %{nspr_version}
+BuildRequires:    %{nss_name}-devel >= %{nss_version}
+BuildRequires:    %{svrcore_name}-devel >= %{svrcore_version}
+
+%description tools
+The mozldap-tools package provides the ldapsearch,
+ldapmodify, and ldapdelete tools that use the
+Mozilla LDAP C SDK libraries.
+
+
+%package devel
+Summary:          Development libraries and examples for Mozilla LDAP C SDK
+Group:            Development/Libraries
+Requires:         %{name} = %{version}-%{release}
+Requires:         %{nspr_name}-devel >= %{nspr_version}
+Requires:         %{nss_name}-devel >= %{nss_version}
+Requires:         %{svrcore_name}-devel >= %{svrcore_version}
+Requires:         pkgconfig
+
+%description devel
+Header and Library files for doing development with the Mozilla LDAP C SDK
+
+%prep
+%setup -q
+
+%build
+cd mozilla/directory/c-sdk
+
+%configure \
+%ifarch x86_64 ppc64 ia64 s390x sparc64
+    --enable-64bit \
+%endif
+    --with-sasl \
+    --enable-clu \
+    --with-system-svrcore \
+    --enable-optimize \
+    --disable-debug
+
+# Enable compiler optimizations and disable debugging code
+BUILD_OPT=1
+export BUILD_OPT
+
+# Generate symbolic info for debuggers
+XCFLAGS="$RPM_OPT_FLAGS"
+export XCFLAGS
+
+PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
+
+make \
+%ifarch x86_64 ppc64 ia64 s390x sparc64
+    USE_64=1
+%endif
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+
+# Set up our package file
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+%{__cat} mozilla/directory/c-sdk/mozldap.pc.in \
+    | sed -e "s,%%libdir%%,%{_libdir},g" \
+          -e "s,%%prefix%%,%{_prefix},g" \
+          -e "s,%%major%%,%{major},g" \
+          -e "s,%%minor%%,%{minor},g" \
+          -e "s,%%submin%%,%{submin},g" \
+          -e "s,%%libsuffix%%,%{libsuffix},g" \
+          -e "s,%%bindir%%,%{_libdir}/%{name},g" \
+          -e "s,%%exec_prefix%%,%{_prefix},g" \
+          -e "s,%%includedir%%,%{_includedir}/%{name},g" \
+          -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
+          -e "s,%%NSS_VERSION%%,%{nss_version},g" \
+          -e "s,%%SVRCORE_VERSION%%,%{svrcore_version},g" \
+          -e "s,%%MOZLDAP_VERSION%%,%{version},g" \
+    > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
+
+# There is no make install target so we'll do it ourselves.
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_includedir}/%{name}
+%if "%{_libexecdir}" != "%{_libdir}"
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+%endif
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/%{name}
+
+# Copy the binary libraries we want
+for file in libssldap%{libsuffix}.so libprldap%{libsuffix}.so libldap%{libsuffix}.so libldif%{libsuffix}.so
+do
+  %{__install} -m 755 mozilla/dist/lib/$file $RPM_BUILD_ROOT%{_libdir}
+done
+
+# Copy the binaries we want
+for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare ldappasswd
+do
+  %{__install} -m 755 mozilla/dist/bin/$file $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+%if "%{_libexecdir}" != "%{_libdir}"
+  pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
+  ln -s ../../..%{_libexecdir}/%{name}/$file $file
+  popd
+%endif
+done
+
+# Copy the include files
+for file in mozilla/dist/public/ldap/*.h
+do
+  %{__install} -p -m 644 $file $RPM_BUILD_ROOT%{_includedir}/%{name}
+done
+
+# Copy the developer files
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -r mozilla/directory/c-sdk/ldap/examples $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
+%{__install} -m 644 mozilla/directory/c-sdk/ldap/examples/xmplflt.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
+%{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldaptemplates.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
+%{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldapfilter.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
+%{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldapsearchprefs.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
+
+%pre
+%if "%{_libexecdir}" != "%{_libdir}"
+for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare ldappasswd; do
+    if [ -f "%{_libdir}/%{name}/${file}" -a ! -L "%{_libdir}/%{name}/${file}" ]; then
+        rm -rf %{_libdir}/%{name}/${file}
+    fi
+done
+%endif
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc mozilla/directory/c-sdk/README.rpm
+%{_libdir}/libssldap*.so
+%{_libdir}/libprldap*.so
+%{_libdir}/libldap*.so
+%{_libdir}/libldif*.so
+
+%files tools
+%defattr(-,root,root,-)
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/ldapsearch
+%{_libexecdir}/%{name}/ldapmodify
+%{_libexecdir}/%{name}/ldapdelete
+%{_libexecdir}/%{name}/ldapcmp
+%{_libexecdir}/%{name}/ldapcompare
+%{_libexecdir}/%{name}/ldappasswd
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/ldapsearch
+%{_libdir}/%{name}/ldapmodify
+%{_libdir}/%{name}/ldapdelete
+%{_libdir}/%{name}/ldapcmp
+%{_libdir}/%{name}/ldapcompare
+%{_libdir}/%{name}/ldappasswd
+%endif
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/%{name}
+%{_datadir}/%{name}
+
+%changelog
+* Wed Oct 30 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 6.0.5-11
+- Move the commands from a lib_t labeled directory to a bin_t labeled
+  directory.
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Aug 26 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 6.0.5-4
+- actually fix license tag (whoops)
+
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 6.0.5-3
+- fix license tag
+- enable sparc64
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 6.0.5-2
+- Autorebuild for GCC 4.3
+
+* Wed Sep 26 2007 Rich Megginson <rmeggins@redhat.com> - 6.0.5-1
+- bump to version 6.0.5 - this version allows the use of SASL
+- with IPv6 numeric addresses, as well as some memory leak fixes
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 6.0.4-2
+- Rebuild for selinux ppc32 issue.
+
+* Wed Jun 20 2007 Rich Megginson <rmeggins@redhat.com> - 6.0.4-1
+- bump version to 6.0.4 - this version has some memory leak
+- fixes for SASL related code, fixes for control handling with
+- referral chasing, and packaging improvements
+- use -p when installing include files to preserve timestamps
+
+* Thu May 24 2007 Rich Megginson <rmeggins@redhat.com> - 6.0.3-3
+- We only need cyrus-sasl-devel as a BuildRequires in the main package
+
+* Mon May 21 2007 Rich Megginson <rmeggins@redhat.com> - 6.0.3-2
+- added cyrus-sasl-devel and pkgconfig to devel package Requires
+
+* Tue Mar 13 2007 Rich Megginson <richm@stanfordalumni.org> - 6.0.3-1
+- bumped version to 6.0.3
+- minor build fixes for some platforms
+
+* Mon Jan 15 2007 Rich Megginson <richm@stanfordalumni.org> - 6.0.2-1
+- Fixed exports file generation for Solaris and Windows - no effect on linux
+- bumped version to 6.0.2
+
+* Mon Jan  9 2007 Rich Megginson <richm@stanfordalumni.org> - 6.0.1-2
+- Remove buildroot = "/" checking
+- Remove buildroot removal from %%build section
+
+* Mon Jan  8 2007 Rich Megginson <richm@stanfordalumni.org> - 6.0.1-1
+- bump version to 6.0.1
+- added libldif and ldif.h
+
+* Fri Dec  8 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 6.0.0-2
+- Rename to mozldap.
+- move configure step to %%build section.
+- clean up excessive use of %%defines, make more Fedora like.
+- fix mismatching soname issue.
+- generic specfile cosmetics.
+
+* Thu Oct  5 2006 Rich Megginson <richm@stanforalumni.org> - 6.0.0-1
+- Bump version to 6.0.0 - add support for submit/patch level (3rd level) in version numbering
+
+* Tue Apr 18 2006 Richard Megginson <richm@stanforalumni.org> - 5.17-3
+- make more Fedora Core friendly - move each requires and buildrequires to a separate line
+- remove --with-nss since svrcore implies it; fix some macro errors; macro-ize nspr and nss names
+- fix directory attrs in devel package
+
+* Tue Jan 31 2006 Rich Megginson <rmeggins@redhat.com> - 5.17-2
+- use --with-system-svrcore to configure
+
+* Mon Dec 19 2005 Rich Megginson <rmeggins@redhat.com> - 5.17-1
+- Initial revision
+

debian-aggregate.patch Added

@@ -0,0 +1,224 @@
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/config/nsinstall.c mozldap-6.0.5/mozilla/directory/c-sdk/config/nsinstall.c
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/config/nsinstall.c	2003-10-10 16:03:43.000000000 +0100
++++ mozldap-6.0.5/mozilla/directory/c-sdk/config/nsinstall.c	2013-09-07 16:35:36.268374378 +0100
+@@ -109,7 +109,7 @@
+ }
+ #endif /* NEXTSTEP */
+ 
+-#ifdef LINUX
++#if defined(LINUX) || defined(__GLIBC__) || defined(__GNU__)
+ #include <getopt.h>
+ #endif
+ 
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/configure.in mozldap-6.0.5/mozilla/directory/c-sdk/configure.in
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/configure.in	2007-09-17 18:46:23.000000000 +0100
++++ mozldap-6.0.5/mozilla/directory/c-sdk/configure.in	2013-09-07 16:36:01.274304681 +0100
+@@ -42,7 +42,7 @@
+ AC_PREREQ(2.12)
+ AC_INIT(ldap/include/ldap.h)
+ 
+-AC_CONFIG_AUX_DIR(${srcdir}/config/autoconf)
++AC_CONFIG_AUX_DIR(config/autoconf)
+ AC_CANONICAL_SYSTEM
+ 
+ dnl ========================================================
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/include/portable.h mozldap-6.0.5/mozilla/directory/c-sdk/ldap/include/portable.h
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/include/portable.h	2006-10-03 21:43:40.000000000 +0100
++++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/include/portable.h	2013-09-07 16:35:36.268374378 +0100
+@@ -122,7 +122,7 @@
+  * some systems don't have the BSD re_comp and re_exec routines
+  */
+ #ifndef NEED_BSDREGEX
+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined(__GNU__) || defined(__GLIBC__) || defined( DARWIN )) && !defined(sgi)
+ #define NEED_BSDREGEX
+ #endif
+ #endif
+@@ -151,7 +151,8 @@
+  * Is snprintf() part of the standard C runtime library?
+  */
+ #if !defined(HAVE_SNPRINTF)
+-#if defined(SOLARIS) || defined(LINUX) || defined(HPUX) || defined(AIX)
++#if defined(SOLARIS) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(HPUX) || defined(AIX)
++
+ #define HAVE_SNPRINTF
+ #endif
+ #if defined(_WINDOWS)
+@@ -175,7 +176,7 @@
+  * for select()
+  */
+ #if !defined(WINSOCK) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2)
+-#if defined(hpux) || defined(LINUX) || defined(SUNOS4) || defined(XP_BEOS)
++#if defined(hpux) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(XP_BEOS)
+ #include <sys/time.h>
+ #else
+ #include <sys/select.h>
+@@ -247,15 +248,15 @@
+ #define HAVE_TIME_R
+ #endif
+ 
+-#if defined(SNI) || defined(LINUX1_2)
++#if defined(SNI) || defined(LINUX1_2) || defined(__GNU__) || defined(__GLIBC__)
+ int strcasecmp(const char *, const char *);
+ #ifdef SNI
+ int strncasecmp(const char *, const char *, int);
+-#endif /* SNI */
+-#ifdef LINUX1_2
++#else /* SNI */
+ int strncasecmp(const char *, const char *, size_t);
+-#endif /* LINUX1_2 */
+-#endif /* SNI || LINUX1_2 */
++#endif
++#endif /* SNI || LINUX1_2 || __GNU__ || __GLIBC__ */
++
+ 
+ #if defined(_WINDOWS) || defined(macintosh) || defined(XP_OS2) || defined(DARWIN)
+ #define GETHOSTBYNAME( n, r, b, l, e )  gethostbyname( n )
+@@ -306,7 +307,7 @@
+ #define GETHOSTBYNAME( n, r, b, l, e )  gethostbyname_r( n, r, b, l, e )
+ #endif
+ #if defined(HPUX9) || defined(LINUX1_2) || defined(LINUX2_0) || \
+-    defined(LINUX2_1) || defined(SUNOS4) || defined(SNI) || \
++    defined(LINUX2_1) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(SNI) || \
+     defined(SCOOS) || defined(BSDI) || defined(NCR) || \
+     defined(NEC) || ( defined(HPUX10) && !defined(_REENTRANT)) || \
+     (defined(AIX) && !defined(USE_REENTRANT_LIBC))
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client	2003-10-15 18:26:01.000000000 +0100
++++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client	2013-09-07 16:35:36.269374375 +0100
+@@ -177,7 +177,7 @@
+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
+ endif
+ 
+-ifeq ($(OS_ARCH), Linux)
++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
+ EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME)
+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
+ endif
+@@ -253,7 +253,7 @@
+ ifeq ($(OS_ARCH), AIX)
+ 	$(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
+ else
+-ifeq ($(OS_ARCH), Linux)
++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
+ 	$(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
+ else
+ 	$(LINK_LIB) $(EXTRA_LIBS)
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	2007-06-20 18:57:11.000000000 +0100
++++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	2013-09-07 16:35:51.511333122 +0100
+@@ -122,7 +122,7 @@
+ HDIR		= $(topsrcdir)/ldap/include
+ 
+ LIBLDAP		= $(addprefix $(OBJDIR_NAME)/, $(LIB_PREFIX)$(LDAP_LIBNAME).$(LIB_SUFFIX))
+-DLLLDAP		= $(addprefix $(OBJDIR_NAME)/, $(LIB_PREFIX)$(LDAP_LIBNAME).$(DLL_SUFFIX))
++DLLLDAP		= $(addprefix $(OBJDIR_NAME)/, $(LIB_PREFIX)$(LDAP_LIBNAME).$(DLL_SUFFIX))$(DEBIAN_SO_SUFFIX)
+ 
+ INSTALLDIR	= $(DIST)/$(OBJDIR_NAME)
+ 
+@@ -202,8 +202,8 @@
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc
+ endif
+ 
+-ifeq ($(OS_ARCH), Linux)
+-EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
+ endif
+ 
+ ifeq ($(OS_ARCH), WINNT)
+@@ -324,7 +324,7 @@
+ ifdef SO_FILES_TO_REMOVE
+ 	-$(RM) $(SO_FILES_TO_REMOVE)
+ endif
+-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
++ifneq (,$(filter AIX Linux GNU GNU_% HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
+ 	$(LINK_LIB)
+ else
+ ifeq ($(OS_ARCH),OS2)
+@@ -364,6 +364,7 @@
+ 	$(INSTALL) -m 444 $(LIBLDAP) $(dist_libdir)
+ 	$(INSTALL) -m 444 $(DLLLDAP) $(dist_libdir)
+ 	$(INSTALL) -m 444 $(DLLLDAP) $(dist_bindir)
++	ln -sf $(DLLLDAP) $(dist_libdir)/$(LIB_PREFIX)$(LDAP_LIBNAME).$(DLL_SUFFIX)
+ endif
+ ifeq ($(OS_ARCH), WINNT)
+ 	$(INSTALL) -m 444 $(LIBLDAP) $(dist_libdir)
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in	2007-06-20 18:57:11.000000000 +0100
++++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in	2013-09-07 16:35:47.129344984 +0100
+@@ -53,7 +53,7 @@
+ HDIR		= $(topsrcdir)/ldap/include
+ 
+ LIBLDIF		= $(addprefix $(OBJDIR_NAME)/, $(LIB_PREFIX)$(LDIF_LIBNAME).$(LIB_SUFFIX))
+-DLLLDIF         = $(addprefix $(OBJDIR_NAME)/, $(LIB_PREFIX)$(LDIF_LIBNAME).$(DLL_SUFFIX))
++DLLLDIF         = $(addprefix $(OBJDIR_NAME)/, $(LIB_PREFIX)$(LDIF_LIBNAME).$(DLL_SUFFIX))$(DEBIAN_SO_SUFFIX)
+ 
+ INSTALLDIR      = $(DIST)/$(OBJDIR_NAME)
+ 
+@@ -163,4 +163,5 @@
+ 	$(INSTALL) -m 444 $(LIBLDIF) $(dist_libdir)
+ 	$(INSTALL) -m 444 $(DLLLDIF) $(dist_libdir)
+ 	$(INSTALL) -m 444 $(DLLLDIF) $(dist_bindir)
++	ln -sf $(DLLLDIF) $(dist_libdir)/$(LIB_PREFIX)$(LDIF_LIBNAME).$(DLL_SUFFIX)
+ endif
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c	2004-03-15 06:25:32.000000000 +0000
++++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c	2013-09-07 16:35:36.269374375 +0100
+@@ -233,7 +233,7 @@
+ 
+ #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \
+   defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \
+-  defined(OPENBSD) || defined(NETBSD)
++  defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__)
+ #define EDEADLOCK       -1
+ #endif
+ 
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in	2007-06-20 18:57:12.000000000 +0100
++++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in	2013-09-07 16:35:47.130344981 +0100
+@@ -64,7 +64,7 @@
+ LIBPRLDAP =
+ endif
+ DLLPRLDAP	= $(addprefix $(OBJDIR_NAME)/, \
+-			$(LIB_PREFIX)$(PRLDAP_LIBNAME).$(DLL_SUFFIX))
++			$(LIB_PREFIX)$(PRLDAP_LIBNAME).$(DLL_SUFFIX))$(DEBIAN_SO_SUFFIX)
+ 
+ INSTALLDIR      = $(DIST)/$(OBJDIR_NAME)
+ 
+@@ -247,4 +247,5 @@
+ ifdef MKSHLIB
+ 	$(INSTALL) -m 555 $(DLLPRLDAP) $(dist_libdir)
+ 	$(INSTALL) -m 444 $(DLLPRLDAP) $(dist_bindir)
++	ln -sf $(DLLPRLDAP) $(dist_libdir)/$(LIB_PREFIX)$(PRLDAP_LIBNAME).$(DLL_SUFFIX)
+ endif
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in	2007-06-20 18:57:12.000000000 +0100
++++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in	2013-09-07 16:35:47.130344981 +0100
+@@ -60,7 +60,7 @@
+ HDIR		= $(topsrcdir)/ldap/include
+ 
+ LIBSSLDAP	= $(addprefix $(SSLOBJDEST)/, $(LIB_PREFIX)$(SSLDAP_LIBNAME).$(LIB_SUFFIX))
+-DLLSSLDAP	= $(addprefix $(SSLOBJDEST)/, $(LIB_PREFIX)$(SSLDAP_LIBNAME).$(DLL_SUFFIX))
++DLLSSLDAP	= $(addprefix $(SSLOBJDEST)/, $(LIB_PREFIX)$(SSLDAP_LIBNAME).$(DLL_SUFFIX))$(DEBIAN_SO_SUFFIX)
+ 
+ INSTALLDIR      = $(DIST)/$(OBJDIR_NAME)
+ 
+@@ -240,4 +240,5 @@
+ ifdef MKSHLIB
+ 	$(INSTALL) -m 555 $(DLLSSLDAP) $(dist_libdir)
+ 	$(INSTALL) -m 444 $(DLLSSLDAP) $(dist_bindir)
++	ln -sf $(DLLSSLDAP) $(dist_libdir)/$(LIB_PREFIX)$(SSLDAP_LIBNAME).$(DLL_SUFFIX)
+ endif
+diff -ur mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libssldap/sslerrstrs.h mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/sslerrstrs.h
+--- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libssldap/sslerrstrs.h	2006-10-10 14:37:35.000000000 +0100
++++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/sslerrstrs.h	2013-09-07 16:35:55.767321281 +0100
+@@ -247,7 +247,7 @@
+ "SSL peer was not expecting a handshake message it received.")
+ 
+ ER3(SSL_ERROR_DECOMPRESSION_FAILURE_ALERT   , (SSL_ERROR_BASE + 60),
+-"SSL peer was unable to succesfully decompress an SSL record it received.")
++"SSL peer was unable to successfully decompress an SSL record it received.")
+ 
+ ER3(SSL_ERROR_HANDSHAKE_FAILURE_ALERT       , (SSL_ERROR_BASE + 61),
+ "SSL peer was unable to negotiate an acceptable set of security parameters.")

debian.changelog Added

@@ -0,0 +1,64 @@
+mozilla-ldap-sdk (6.0.5-3) unstable; urgency=low
+
+  * Attempt to build in OBS
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat,  7 Sep 2013 13:42:23 +0100
+
+mozilla-ldap-sdk (6.0.5+dfsg-7) unstable; urgency=low
+
+  * Fixed watch file
+  * 3.8.0 policy
+  * Fix "dpatch-missing-description" lintian warning
+
+ -- Michele Baldessari <michele@pupazzo.org>  Fri, 22 Aug 2008 13:40:38 +0200
+
+mozilla-ldap-sdk (6.0.5+dfsg-6) unstable; urgency=low
+
+  * Renamed the source package to mozilla-ldap-sdk
+  * Renamed the binary packages to libmozillaldap
+
+ -- Michele Baldessari <michele@pupazzo.org>  Sat, 26 Jul 2008 08:20:26 +0200
+
+mozldap (6.0.5+dfsg-5) unstable; urgency=low
+
+  * Fixed up descriptions a bit
+
+ -- Michele Baldessari <michele@pupazzo.org>  Sun, 25 May 2008 21:17:39 +0200
+
+mozldap (6.0.5+dfsg-4) unstable; urgency=low
+
+  * Removed spurious copyright file outside debian/ dir
+
+ -- Michele Baldessari <michele@pupazzo.org>  Sun, 18 May 2008 00:37:52 +0200
+
+mozldap (6.0.5+dfsg-3) unstable; urgency=low
+
+  * Removed silly mozldap.pc creation in debian/rules in favor of shipping a
+    complete new .pc file.
+
+ -- Michele Baldessari <michele@pupazzo.org>  Sat, 17 May 2008 20:40:08 +0200
+
+mozldap (6.0.5+dfsg-2) unstable; urgency=low
+
+  * Fixed wrong copyright
+  * Package mostly lintian clean
+
+ -- Michele Baldessari <michele@pupazzo.org>  Sun, 27 Apr 2008 11:56:30 +0200
+
+mozldap (6.0.5+dfsg-1) unstable; urgency=low
+
+  * Switched to parseable copyright format
+  * Switched to a DFSG tarball (removed non-free
+    ldap/docs/ldap-c-api-internet-draft.txt, ldap/examples/macintosh,
+    ldap/examples/windows/winldap/res)
+
+ -- Michele Baldessari <michele@pupazzo.org>  Sun, 27 Apr 2008 11:30:29 +0200
+
+mozldap (6.0.5-1) unstable; urgency=low
+
+  * Adapted the icedov portability fixes by Peter Salinger (suggested by Mike
+    Hommey)
+  * Removed the binary and the windows-only examples (FIXME: these should be
+    removed from the source package too)
+
+ -- Michele Baldessari <michele@pupazzo.org>  Sat, 26 Apr 2008 22:41:22 +0200

debian.control Added

@@ -0,0 +1,47 @@
+Source: mozilla-ldap-sdk
+Section: libs
+Priority: optional
+Maintainer: Michele Baldessari <michele@acksyn.org>
+Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Build-Depends: debhelper (>= 5.0.0), libnss3-dev, libsasl2-dev, libsvrcore-dev, pkg-config, quilt, autoconf, libtool, autotools-dev
+Build-Conflicts: autoconf2.13, automake1.4
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-fedora-ds/mozilla-ldap-sdk/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-fedora-ds/mozilla-ldap-sdk/trunk/
+Homepage: http://wiki.mozilla.org/LDAP_C_SDK
+
+Package: mozldap-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Mozilla LDAP client utilities
+ The Mozilla LDAP C SDK includes a set of LDAP client
+ utilities capable of a unique set of LDAP features.
+
+Package: libmozldap-0d
+Architecture: any
+Depends: ${shlibs:Depends}, libnss3-1d, libsvrcore0, libsasl2-2, ${misc:Depends}
+Description: Mozilla LDAP client library
+ The Mozilla LDAP C SDK is a set of libraries that
+ allow applications to communicate with LDAP (Lightweight
+ Directory Access Protocol) directory servers.  
+
+Package: libmozldap-dev
+Section: libdevel
+Architecture: any
+Depends: libmozldap-0d (= ${binary:Version}), libnss3-dev, libsvrcore-dev, libsasl2-dev, ${misc:Depends}
+Description: Mozilla LDAP development library
+ This package allows development of LDAP applications 
+ using the Mozilla LDAP libraries. It includes headers, 
+ libraries and links to allow static and dynamic linking.
+
+Package: libmozldap-0d-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libmozldap-0d (>= ${source:Version}), libnss3-dev, libsvrcore-dev, libsasl2-dev, ${misc:Depends}
+Description: Debugging information for the Mozilla LDAP client library
+ This package provides detached debugging information for the Mozilla
+ LDAP (Lightweight Directory Access Protocol) client libraries. It is 
+ useful primarily to permit better backtraces and crash dump analysis after
+ problems with the libraries. GDB will find this debug information
+ automatically.

debian.rules Added

@@ -0,0 +1,174 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *$.*$-.*$$/\1/ p' | sed -e 's/~.*//')
+MOD_MAJOR_VERSION := $(word 1, $(subst ., ,$(UPSTREAM_VERSION)))
+MOD_MINOR_VERSION := $(word 2, $(subst ., ,$(UPSTREAM_VERSION)))
+MOD_PATCH_VERSION := $(word 3, $(subst ., ,$(UPSTREAM_VERSION)))
+
+USE_64 := $(shell echo "int main(void) { int assert[(sizeof(long) == 8) ? 1 : -1]; return 0; }" | gcc -o /dev/null -x c - 2> /dev/null && echo --enable-64bit)
+
+CFLAGS := -Wall -pipe
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2 -fno-strict-aliasing
+endif
+
+CFLAGS += -g
+SO_SUFFIX := 60
+BASEDIR := $(CURDIR)/mozilla/directory/c-sdk
+DISTDIR := $(CURDIR)/mozilla/dist
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+CONFIGURE_SWITCHES := --build $(DEB_HOST_GNU_TYPE)
+else
+CONFIGURE_SWITCHES := --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+CONFIGURE_SWITCHES += --prefix=/usr \
+			--exec-prefix=/usr \
+			--with-dist-prefix=${DISTDIR} \
+			--sysconfdir=/etc \
+			--mandir=/usr/share/man \
+			--with-system-svrcore \
+			--with-system-nss \
+			--with-system-nspr \
+			--with-pthreads \
+			--enable-ipv6 \
+			--with-sasl \
+			$(USE_64)
+
+DEBIAN_SO :=.0d
+
+
+# These variables are used only by get-orig-source, which will normally only
+# be run by maintainers.
+VERSION = 6.0.5
+URL     = http://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v$(VERSION)/src/
+# Download the upstream source and make changes as required for DFSG reasons.
+# Assumes wget is available, as this is generally only used by the package
+# maintainers.
+get-orig-source:
+	@if [ ! -f "debian/rules" ] ; then \
+            echo 'Run this from the top directory of the Debian source' >&2; \
+            exit 1; \
+        fi
+	wget $(URL)/mozldap-$(VERSION).tar.gz
+	tar xzf mozldap-$(VERSION).tar.gz
+	rm -r mozldap-$(VERSION)/mozilla/directory/c-sdk/ldap/docs/
+	rm -r mozldap-$(VERSION)/mozilla/directory/c-sdk/ldap/examples/macintosh
+	rm -r mozldap-$(VERSION)/mozilla/directory/c-sdk/ldap/examples/windows/winldap/res
+	mv mozldap-$(VERSION) mozilla-ldap-sdk-$(VERSION)
+	tar cf mozilla-ldap-sdk_$(VERSION)+dfsg.orig.tar mozilla-ldap-sdk-$(VERSION)
+	rm -r mozilla-ldap-sdk-$(VERSION) mozldap-$(VERSION).tar.gz
+	gzip -9 mozilla-ldap-sdk_$(VERSION)+dfsg.orig.tar
+
+
+configure: configure-stamp
+configure-stamp: $(QUILT_STAMPFN)
+	dh_testdir
+	cp /usr/share/misc/config.sub /usr/share/misc/config.guess $(BASEDIR)/config/autoconf
+	cd $(BASEDIR) && autoreconf -ivf
+	cd $(BASEDIR) && ./configure $(CONFIGURE_SWITCHES)
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure
+	dh_testdir
+	# Disable softokn3 linking (see bug #473275)
+	$(MAKE) -C $(BASEDIR) \
+		NSS_DYNAMIC_SOFTOKN=0 \
+		DEBIAN_SO_SUFFIX=$(DEBIAN_SO)
+	$(MAKE) -C mozilla/directory/c-sdk/ldap/clients/tools \
+		NSS_DYNAMIC_SOFTOKN=0
+
+	touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	[ ! -f $(BASEDIR)/Makefile ] || $(MAKE) -C $(BASEDIR) distclean
+	rm -rf $(BASEDIR)/config/now
+	rm -rf $(BASEDIR)/config/nsinstall
+	#rm -f $(BASEDIR)/ldap/clients/tools/Makefile $(BASEDIR)/ldap/libraries/libutil/Makefile $(BASEDIR)/config/autoconf.mk
+	rm -f $(BASEDIR)/ldap/libraries/libutil/Makefile $(BASEDIR)/config/autoconf.mk
+	find . -name "*.so.*" -type f -exec rm "{}" \;
+	find . -name "*.so" -type f -exec rm "{}" \;
+	rm -rf config config.cache config.log config.status Makefile cscope.out
+	rm -f $(BASEDIR)/config/autoconf/config.{guess,sub}
+	rm -rf $(DISTDIR)
+	rm -f patches
+	dh_clean build-stamp install-stamp configure-stamp
+
+install: install-stamp
+install-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/
+	# Copy the binary libraries we want
+	-for file in libssldap$(SO_SUFFIX).so$(DEBIAN_SO) libprldap$(SO_SUFFIX).so$(DEBIAN_SO) libldap$(SO_SUFFIX).so$(DEBIAN_SO) libldif$(SO_SUFFIX).so$(DEBIAN_SO); \
+		do install -m 755 $(DISTDIR)/lib/$$file $(CURDIR)/debian/tmp/usr/lib/; done
+
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/mozldap/
+	# Copy the utilities we want
+	-for file in ldapcompare ldapdelete ldapmodify ldapmodrdn ldappasswd ldapsearch; \
+		do install -m 755 $(DISTDIR)/bin/$$file $(CURDIR)/debian/tmp/usr/lib/mozldap; done
+
+	mkdir -p $(CURDIR)/debian/tmp/usr/include/mozldap
+	# Copy the include files
+	-for file in $(DISTDIR)/public/ldap/*.h; \
+		do echo $$file; install -m 644 $$file $(CURDIR)/debian/tmp/usr/include/mozldap; done
+
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/libmozldap-dev/examples
+	# Copy the examples
+	-cp -r $(CURDIR)/mozilla/directory/c-sdk/ldap/examples/*.[ch] $(CURDIR)/mozilla/directory/c-sdk/ldap/examples/*.conf $(CURDIR)/debian/tmp/usr/share/doc/libmozldap-dev/examples
+
+	install -m644 $(CURDIR)/debian/libmozldap-0d.lintian-overrides $(CURDIR)/debian/libmozldap-0d/usr/share/lintian/overrides/libmozldap-0d
+	install -m 644 -t $(CURDIR)/debian/libmozldap-dev/usr/lib/pkgconfig/ \
+		$(CURDIR)/debian/mozldap.pc
+
+	install -m 644 -t debian/libmozldap-0d/usr/lib \
+		$(CURDIR)/debian/tmp/usr/lib/*.so$(DEBIAN_SO)
+
+	install -m 644 -t debian/libmozldap-dev/usr/include/mozldap \
+		$(CURDIR)/debian/tmp/usr/include/mozldap/*
+	cp -r $(CURDIR)/debian/tmp/usr/share/doc/libmozldap-dev/examples/* $(CURDIR)/debian/libmozldap-dev/usr/share/doc/libmozldap-dev/examples
+
+	install -m 755 -t debian/mozldap-tools/usr/lib/mozldap/ \
+		$(CURDIR)/debian/tmp/usr/lib/mozldap/*
+
+	touch install-stamp
+
+binary-indep:
+
+binary-arch: install-stamp
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_link -a
+	dh_strip -a --dbg-package=libmozldap-0d-dbg
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a -V 'libmozldap-0d (>= 0.6.5)'
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-arch
+
+.PHONY: clean install build clean-patched binary-indep binary-arch binary

debian.series Added

debian.tar.gz Added

mozldap-6.0.5.tar.gz Added

mozldap.dsc Added

@@ -0,0 +1,21 @@
+Format: 1.0
+Source: mozilla-ldap-sdk
+Binary: mozldap-tools, libmozldap-0d, libmozldap-dev, libmozldap-0d-dbg
+Architecture: any
+Version: 6.0.5-3
+Maintainer: Michele Baldessari <michele@acksyn.org>
+Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Homepage: http://wiki.mozilla.org/LDAP_C_SDK
+Standards-Version: 3.9.1
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-fedora-ds/mozilla-ldap-sdk/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-fedora-ds/mozilla-ldap-sdk/trunk/
+Build-Depends: debhelper (>= 5.0.0), libnss3-dev, libsasl2-dev, libsvrcore-dev, pkg-config, quilt, autoconf, libtool, autotools-dev
+Build-Conflicts: autoconf2.13, automake1.4
+Package-List: 
+ libmozldap-0d deb libs optional
+ libmozldap-0d-dbg deb debug extra
+ libmozldap-dev deb libdevel optional
+ mozldap-tools deb libs optional
+Files: 
+ 00000000000000000000000000000000 0 mozldap-6.0.5.tar.gz
+ 00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 1178 0

Request History

vanmeeuwen created request over 8 years ago

Check in mozldap

vanmeeuwen accepted review over 8 years ago

vanmeeuwen approved review over 8 years ago

vanmeeuwen accepted request over 8 years ago