Request 2192 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 2192 (accepted)

* Fix dependency on libnss3 in Debian package
* Bump version to 6.0.7

Created by sicherha about 7 years ago
In state accepted
Open review for Admin
Open review for vanmeeuwen

Submit mozldap

Submit package home:sicherha:branches:Kolab:16 / mozldap to package Kolab:16 / mozldap

mozldap.spec Changed

@@ -17,13 +17,13 @@
 
 %define major           6
 %define minor           0
-%define submin          5
+%define submin          7
 %define libsuffix       %{major}0
 
 Summary:          Mozilla LDAP C SDK
 Name:             mozldap
 Version:          %{major}.%{minor}.%{submin}
-Release:          11%{?dist}
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/directory/csdk.html
 Group:            System Environment/Libraries
@@ -81,7 +81,7 @@
 %setup -q
 
 %build
-cd mozilla/directory/c-sdk
+cd c-sdk
 
 %configure \
 %ifarch x86_64 ppc64 ia64 s390x sparc64
@@ -117,7 +117,7 @@
 
 # Set up our package file
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-%{__cat} mozilla/directory/c-sdk/mozldap.pc.in \
+%{__cat} c-sdk/mozldap.pc.in \
     | sed -e "s,%%libdir%%,%{_libdir},g" \
           -e "s,%%prefix%%,%{_prefix},g" \
           -e "s,%%major%%,%{major},g" \
@@ -144,13 +144,13 @@
 # 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}
+  %{__install} -m 755 ../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}
+  %{__install} -m 755 ../dist/bin/$file $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 %if "%{_libexecdir}" != "%{_libdir}"
   pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
   ln -s ../../..%{_libexecdir}/%{name}/$file $file
@@ -159,19 +159,19 @@
 done
 
 # Copy the include files
-for file in mozilla/dist/public/ldap/*.h
+for file in ../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}
+cp -r 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
+%{__install} -m 644 c-sdk/ldap/examples/xmplflt.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
+%{__install} -m 644 c-sdk/ldap/libraries/libldap/ldaptemplates.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
+%{__install} -m 644 c-sdk/ldap/libraries/libldap/ldapfilter.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
+%{__install} -m 644 c-sdk/ldap/libraries/libldap/ldapsearchprefs.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
 
 %pre
 %if "%{_libexecdir}" != "%{_libdir}"
@@ -194,7 +194,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc mozilla/directory/c-sdk/README.rpm
+%doc c-sdk/README.rpm
 %{_libdir}/libssldap*.so
 %{_libdir}/libprldap*.so
 %{_libdir}/libldap*.so
@@ -226,6 +226,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sat Apr 07 2018 Christoph Erhardt <kolab@sicherha.de> - 6.0.7-1
+- Bump version to 6.0.7.
+
 * 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.
@@ -279,7 +282,7 @@
 - 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
+* Tue Jan  9 2007 Rich Megginson <richm@stanfordalumni.org> - 6.0.1-2
 - Remove buildroot = "/" checking
 - Remove buildroot removal from %%build section

debian-aggregate.patch Changed

@@ -1,6 +1,6 @@
-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
+diff -ur mozldap-6.0.7.orig/c-sdk/config/nsinstall.c mozldap-6.0.7/c-sdk/config/nsinstall.c
+--- mozldap-6.0.7.orig/c-sdk/config/nsinstall.c	2003-10-10 16:03:43.000000000 +0100
++++ mozldap-6.0.7/c-sdk/config/nsinstall.c	2013-09-07 16:35:36.268374378 +0100
 @@ -109,7 +109,7 @@
  }
  #endif /* NEXTSTEP */
@@ -10,9 +10,9 @@
  #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
+diff -ur mozldap-6.0.7.orig/c-sdk/configure.in mozldap-6.0.7/c-sdk/configure.in
+--- mozldap-6.0.7.orig/c-sdk/configure.in	2007-09-17 18:46:23.000000000 +0100
++++ mozldap-6.0.7/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)
@@ -22,9 +22,9 @@
  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
+diff -ur mozldap-6.0.7.orig/c-sdk/ldap/include/portable.h mozldap-6.0.7/c-sdk/ldap/include/portable.h
+--- mozldap-6.0.7.orig/c-sdk/ldap/include/portable.h	2006-10-03 21:43:40.000000000 +0100
++++ mozldap-6.0.7/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
   */
@@ -83,9 +83,9 @@
      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
+diff -ur mozldap-6.0.7.orig/c-sdk/ldap/libraries/libldap/Makefile.client mozldap-6.0.7/c-sdk/ldap/libraries/libldap/Makefile.client
+--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libldap/Makefile.client	2003-10-15 18:26:01.000000000 +0100
++++ mozldap-6.0.7/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
@@ -104,9 +104,9 @@
  	$(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
+diff -ur mozldap-6.0.7.orig/c-sdk/ldap/libraries/libldap/Makefile.in mozldap-6.0.7/c-sdk/ldap/libraries/libldap/Makefile.in
+--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libldap/Makefile.in	2007-06-20 18:57:11.000000000 +0100
++++ mozldap-6.0.7/c-sdk/ldap/libraries/libldap/Makefile.in	2013-09-07 16:35:51.511333122 +0100
 @@ -122,7 +122,7 @@
  HDIR		= $(topsrcdir)/ldap/include
  
@@ -144,9 +144,9 @@
  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
+diff -ur mozldap-6.0.7.orig/c-sdk/ldap/libraries/libldif/Makefile.in mozldap-6.0.7/c-sdk/ldap/libraries/libldif/Makefile.in
+--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libldif/Makefile.in	2007-06-20 18:57:11.000000000 +0100
++++ mozldap-6.0.7/c-sdk/ldap/libraries/libldif/Makefile.in	2013-09-07 16:35:47.129344984 +0100
 @@ -53,7 +53,7 @@
  HDIR		= $(topsrcdir)/ldap/include
  
@@ -162,9 +162,9 @@
  	$(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
+diff -ur mozldap-6.0.7.orig/c-sdk/ldap/libraries/libprldap/ldappr-error.c mozldap-6.0.7/c-sdk/ldap/libraries/libprldap/ldappr-error.c
+--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libprldap/ldappr-error.c	2004-03-15 06:25:32.000000000 +0000
++++ mozldap-6.0.7/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) || \
@@ -174,9 +174,9 @@
  #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
+diff -ur mozldap-6.0.7.orig/c-sdk/ldap/libraries/libprldap/Makefile.in mozldap-6.0.7/c-sdk/ldap/libraries/libprldap/Makefile.in
+--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libprldap/Makefile.in	2007-06-20 18:57:12.000000000 +0100
++++ mozldap-6.0.7/c-sdk/ldap/libraries/libprldap/Makefile.in	2013-09-07 16:35:47.130344981 +0100
 @@ -64,7 +64,7 @@
  LIBPRLDAP =
  endif
@@ -192,9 +192,9 @@
  	$(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
+diff -ur mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/Makefile.in mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/Makefile.in
+--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/Makefile.in	2007-06-20 18:57:12.000000000 +0100
++++ mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/Makefile.in	2013-09-07 16:35:47.130344981 +0100
 @@ -60,7 +60,7 @@
  HDIR		= $(topsrcdir)/ldap/include
  
@@ -210,9 +210,9 @@
  	$(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
+diff -ur mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/sslerrstrs.h mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/sslerrstrs.h
+--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/sslerrstrs.h	2006-10-10 14:37:35.000000000 +0100
++++ mozldap-6.0.7/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.")

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -25,7 +25,7 @@
 
 CFLAGS += -g
 SO_SUFFIX := 60
-BASEDIR := $(CURDIR)/mozilla/directory/c-sdk
+BASEDIR := $(CURDIR)/c-sdk
 DISTDIR := $(CURDIR)/mozilla/dist
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -51,7 +51,7 @@
 
 # These variables are used only by get-orig-source, which will normally only
 # be run by maintainers.
-VERSION = 6.0.5
+VERSION = 6.0.7
 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
@@ -63,9 +63,9 @@
         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
+	rm -r mozldap-$(VERSION)/c-sdk/ldap/docs/
+	rm -r mozldap-$(VERSION)/c-sdk/ldap/examples/macintosh
+	rm -r mozldap-$(VERSION)/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
@@ -87,7 +87,7 @@
 	$(MAKE) -C $(BASEDIR) \
 		NSS_DYNAMIC_SOFTOKN=0 \
 		DEBIAN_SO_SUFFIX=$(DEBIAN_SO)
-	$(MAKE) -C mozilla/directory/c-sdk/ldap/clients/tools \
+	$(MAKE) -C c-sdk/ldap/clients/tools \
 		NSS_DYNAMIC_SOFTOKN=0
 
 	touch build-stamp
@@ -133,7 +133,7 @@
 
 	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
+	-cp -r $(CURDIR)/c-sdk/ldap/examples/*.[ch] $(CURDIR)/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/ \

mozldap-6.0.5.tar.gz -> mozldap-6.0.7.tar.gz Changed

mozldap.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2192 0

Request History

sicherha created request about 7 years ago

* Fix dependency on libnss3 in Debian package
* Bump version to 6.0.7

sicherha accepted request about 7 years ago