From 6743bde31848cfa840789e7be7bbd3c646239b98 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 20 Jun 2007 21:02:21 +0000 Subject: [PATCH 01/10] Initialize branch FC-6 for adminutil --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 9ddaa9022b626013fb5c39f14c496cac34a97d93 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 20 Jun 2007 21:44:11 +0000 Subject: [PATCH 02/10] initial commit for FC-6 --- .cvsignore | 1 + adminutil.spec | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 103 insertions(+) create mode 100644 adminutil.spec diff --git a/.cvsignore b/.cvsignore index e69de29..415d941 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +adminutil-1.1.1.tar.bz2 diff --git a/adminutil.spec b/adminutil.spec new file mode 100644 index 0000000..ed82e1f --- /dev/null +++ b/adminutil.spec @@ -0,0 +1,101 @@ +%define nspr_version 4.6 +%define nss_version 3.11 +%define svrcore_version 4.0 +%define mozldap_version 6.0 +%define icu_version 3.4 + +Summary: Utility library for directory server administration +Name: adminutil +Version: 1.1.1 +Release: 3%{?dist} +License: LGPL +URL: http://directory.fedoraproject.org/wiki/AdminUtil +Group: Development/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: nspr-devel >= %{nspr_version} +BuildRequires: nss-devel >= %{nss_version} +BuildRequires: svrcore-devel >= %{svrcore_version} +BuildRequires: mozldap-devel >= %{mozldap_version} +BuildRequires: libicu-devel >= %{icu_version} +BuildRequires: icu >= %{icu_version} + +Source0: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2 + +%description +%{name} is libraries of functions used to administer directory +servers, usually in conjunction with the admin server. %{name} is +broken into two libraries - libadminutil contains the basic +functionality, and libadmsslutil contains SSL versions and wrappers +around the basic functions. The PSET functions allow applications to +store their preferences and configuration parameters in LDAP, without +having to know anything about LDAP. The configuration is cached in a +local file, allowing applications to function even if the LDAP server +is down. The other code is typically used by CGI programs used for +directory server management, containing GET/POST processing code as +well as resource handling (ICU ures API). + +%package devel +Summary: Development and header files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: nspr-devel >= %{nspr_version} +Requires: nss-devel >= %{nss_version} +Requires: svrcore-devel >= %{svrcore_version} +Requires: mozldap-devel >= %{mozldap_version} +Requires: libicu-devel >= %{icu_version} + +%description devel +Development files and header files necessary to build applications +that use %{name}. + +%prep +%setup -q + +%build + +%configure --disable-tests +%{__make} %{?_smp_mflags} + +%install +%{__rm} -rf $RPM_BUILD_ROOT + +%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.a +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.la + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc LICENSE README NEWS +%{_libdir}/*.so.* +%{_datadir}/%{name} + +%files devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/*.so +%{_includedir}/libadminutil +%{_includedir}/libadmsslutil + +%changelog +* Wed May 23 2007 Rich Megginson - 1.1.1-3 +- more fedora review stuff - use macros consistently +- make sure install preserves timestamps +- use lgpl instead of gpl for acclanglist.c +- fix undefined weak symbols in libadmsslutil + +* Fri May 18 2007 Rich Megginson - 1.1.1-2 +- pkgconfig is a requires not a build requires + +* Thu May 17 2007 Rich Megginson - 1.1.1-1 +- Many bug fixes - bumped version to 1.1.1 +- fixed concerns from Fedora package review + +* Wed Mar 28 2007 Rich Megginson - 1.1.0-1 +- Initial version - based largely on svrcore.spec diff --git a/sources b/sources index e69de29..630a91c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +3c963c97fa80552ec01621c8101fffd7 adminutil-1.1.1.tar.bz2 From 0583ca55ea048de599893095e480977916d7d929 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Fri, 22 Jun 2007 22:55:42 +0000 Subject: [PATCH 03/10] bump version to 1.1.2 --- .cvsignore | 1 + adminutil.spec | 9 +++++++-- sources | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 415d941..f0bc8ca 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ adminutil-1.1.1.tar.bz2 +adminutil-1.1.2.tar.bz2 diff --git a/adminutil.spec b/adminutil.spec index ed82e1f..7a59443 100644 --- a/adminutil.spec +++ b/adminutil.spec @@ -6,8 +6,8 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.1 -Release: 3%{?dist} +Version: 1.1.2 +Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil Group: Development/Libraries @@ -84,6 +84,11 @@ that use %{name}. %{_includedir}/libadmsslutil %changelog +* Fri Jun 22 2007 Rich Megginson - 1.1.2-1 +- Updated version to 1.1.2 +- This version fixes some memory leaks and invalid memory use +- issues + * Wed May 23 2007 Rich Megginson - 1.1.1-3 - more fedora review stuff - use macros consistently - make sure install preserves timestamps diff --git a/sources b/sources index 630a91c..3addb5b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 3c963c97fa80552ec01621c8101fffd7 adminutil-1.1.1.tar.bz2 +0a2552f8e62c7dc5604a6a9755fa78e4 adminutil-1.1.2.tar.bz2 From 1337f42b7d47d575772a7ff54d52dfc12ae6a4bc Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Tue, 24 Jul 2007 19:09:07 +0000 Subject: [PATCH 04/10] bump version to 1.1.3 --- .cvsignore | 3 +-- adminutil.spec | 6 +++++- sources | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f0bc8ca..0092f1b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -adminutil-1.1.1.tar.bz2 -adminutil-1.1.2.tar.bz2 +adminutil-1.1.3.tar.bz2 diff --git a/adminutil.spec b/adminutil.spec index 7a59443..bdc6da5 100644 --- a/adminutil.spec +++ b/adminutil.spec @@ -6,7 +6,7 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.2 +Version: 1.1.3 Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil @@ -84,6 +84,10 @@ that use %{name}. %{_includedir}/libadmsslutil %changelog +* Tue Jul 24 2007 Rich Megginson - 1.1.3-1 +- updated to version 1.1.3 +- fixes bugzillas 246124 and 247192 + * Fri Jun 22 2007 Rich Megginson - 1.1.2-1 - Updated version to 1.1.2 - This version fixes some memory leaks and invalid memory use diff --git a/sources b/sources index 3addb5b..0cbcd98 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -3c963c97fa80552ec01621c8101fffd7 adminutil-1.1.1.tar.bz2 -0a2552f8e62c7dc5604a6a9755fa78e4 adminutil-1.1.2.tar.bz2 +a00debecacbf2a669ca87fd691173da2 adminutil-1.1.3.tar.bz2 From 5c483d198806d7a8961a63b3e4b6dc7e2c19433d Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 2 Aug 2007 03:27:36 +0000 Subject: [PATCH 05/10] - updated to version 1.1.4 - fixes bugzilla 250526 --- .cvsignore | 1 + adminutil.spec | 6 +++++- sources | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index 0092f1b..2f71b9d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ adminutil-1.1.3.tar.bz2 +adminutil-1.1.4.tar.bz2 diff --git a/adminutil.spec b/adminutil.spec index bdc6da5..8c92a99 100644 --- a/adminutil.spec +++ b/adminutil.spec @@ -6,7 +6,7 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.3 +Version: 1.1.4 Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil @@ -84,6 +84,10 @@ that use %{name}. %{_includedir}/libadmsslutil %changelog +* Wed Aug 1 2007 Rich Megginson - 1.1.4-1 +- updated to version 1.1.4 +- fixes bugzilla 250526 + * Tue Jul 24 2007 Rich Megginson - 1.1.3-1 - updated to version 1.1.3 - fixes bugzillas 246124 and 247192 diff --git a/sources b/sources index 0cbcd98..57ab49b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ a00debecacbf2a669ca87fd691173da2 adminutil-1.1.3.tar.bz2 +26047d23b01e15177a772f79711eb969 adminutil-1.1.4.tar.bz2 From 0882b506fb0cee282ed99225f843ab4a3adb3015 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 18 Oct 2007 16:28:38 +0000 Subject: [PATCH 06/10] bump version to 1.1.5 - fix icu linking issue - disable libtool rpath by default - added --enable-rpath option to configure --- .cvsignore | 3 +-- adminutil.spec | 7 ++++++- sources | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2f71b9d..d5c6105 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -adminutil-1.1.3.tar.bz2 -adminutil-1.1.4.tar.bz2 +adminutil-1.1.5.tar.bz2 diff --git a/adminutil.spec b/adminutil.spec index 8c92a99..aed9069 100644 --- a/adminutil.spec +++ b/adminutil.spec @@ -6,7 +6,7 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.4 +Version: 1.1.5 Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil @@ -84,6 +84,11 @@ that use %{name}. %{_includedir}/libadmsslutil %changelog +* Thu Oct 18 2007 Rich Megginson - 1.1.5-1 +- bump version to 1.1.5 +- fix icu linking issue +- disable libtool rpath by default - added --enable-rpath option to configure + * Wed Aug 1 2007 Rich Megginson - 1.1.4-1 - updated to version 1.1.4 - fixes bugzilla 250526 diff --git a/sources b/sources index 57ab49b..43782b7 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a00debecacbf2a669ca87fd691173da2 adminutil-1.1.3.tar.bz2 -26047d23b01e15177a772f79711eb969 adminutil-1.1.4.tar.bz2 +1ce95159db07040d7095b805e9b3b533 adminutil-1.1.5.tar.bz2 From d38f6f5b550cacb38b6e38cc8f770088b4fae0fb Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Mon, 3 Mar 2008 18:16:46 +0000 Subject: [PATCH 07/10] Resolves bug 245248 - dsgw doesn\'t escape filename in error message - The new dsgw hasn\'t been released yet, and the old one doesn't use this code --- .cvsignore | 1 + adminutil.spec | 7 ++++++- sources | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index d5c6105..be69c54 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ adminutil-1.1.5.tar.bz2 +adminutil-1.1.6.tar.bz2 diff --git a/adminutil.spec b/adminutil.spec index aed9069..6896a54 100644 --- a/adminutil.spec +++ b/adminutil.spec @@ -6,7 +6,7 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} License: LGPL URL: http://directory.fedoraproject.org/wiki/AdminUtil @@ -84,6 +84,11 @@ that use %{name}. %{_includedir}/libadmsslutil %changelog +* Mon Mar 3 2008 Rich Megginson - 1.1.6-1 +- Resolves bug 245248 - dsgw doesn't escape filename in error message +- The new dsgw hasn't been released yet, and the old one doesn't use +- this code. + * Thu Oct 18 2007 Rich Megginson - 1.1.5-1 - bump version to 1.1.5 - fix icu linking issue diff --git a/sources b/sources index 43782b7..b7ab546 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 1ce95159db07040d7095b805e9b3b533 adminutil-1.1.5.tar.bz2 +b01d441f81d3d260ba84e4f0d5311721 adminutil-1.1.6.tar.bz2 From fda46361432e17c1b23ec71c83c5571b7825c837 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 27 Aug 2008 20:17:41 +0000 Subject: [PATCH 08/10] Resolves bug 454060 - ViewLog CGI crash with new adminutil Resolves bug 413531 - Web browser accepted languages configuration causes dsgw CGI binaries to segfault This is the 1.1.7 release --- .cvsignore | 1 + adminutil.spec | 8 ++++++-- sources | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index be69c54..dc6267e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ adminutil-1.1.5.tar.bz2 adminutil-1.1.6.tar.bz2 +adminutil-1.1.7.tar.bz2 diff --git a/adminutil.spec b/adminutil.spec index 6896a54..53fee4a 100644 --- a/adminutil.spec +++ b/adminutil.spec @@ -6,9 +6,9 @@ Summary: Utility library for directory server administration Name: adminutil -Version: 1.1.6 +Version: 1.1.7 Release: 1%{?dist} -License: LGPL +License: LGPLv2 URL: http://directory.fedoraproject.org/wiki/AdminUtil Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -84,6 +84,10 @@ that use %{name}. %{_includedir}/libadmsslutil %changelog +* Wed Aug 27 2008 Rich Megginson - 1.1.7-1 +- Resolves bug 454060 - ViewLog CGI crash with new adminutil +- Resolves bug 413531 - Web browser accepted languages configuration causes dsgw CGI binaries to segfault + * Mon Mar 3 2008 Rich Megginson - 1.1.6-1 - Resolves bug 245248 - dsgw doesn't escape filename in error message - The new dsgw hasn't been released yet, and the old one doesn't use diff --git a/sources b/sources index b7ab546..3fc6892 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 1ce95159db07040d7095b805e9b3b533 adminutil-1.1.5.tar.bz2 b01d441f81d3d260ba84e4f0d5311721 adminutil-1.1.6.tar.bz2 +e7d03be4651b36d1213b4f5cc15dfc5c adminutil-1.1.7.tar.bz2 From 36d227d3ab852f658a2c07604b3fb56d0b20181f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:04 +0000 Subject: [PATCH 09/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c2c5803..d8b26b2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := adminutil SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 76c756b63fb08461b120cdda920b0ffb26cd7a78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:36:09 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d8b26b2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: adminutil -# $Id$ -NAME := adminutil -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6