[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#513305: ITP: unscd -- Micro Name Server Caching Daemon



Coin,

Not much has changed here...

I made a few improvements to the packaging (on top of the latest Don's SVN; see attachment; now using 0.45 and the upstream Makefile). The new package should replace nscd smoothly on upgrade now, but i guess more extensive tests should be done.

I'm still interrested to comaint with Don and the glibc team.

--
Marc Dequènes (Duck)
Index: control
===================================================================
--- control	(revision 472)
+++ control	(working copy)
@@ -1,15 +1,15 @@
 Source: unscd
 Section: admin
 Priority: extra
-Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 5), groff-base
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50), groff-base
 Maintainer: Don Armstrong <don@debian.org>
 
 Package: unscd
 Section: admin
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: nscd
 Replaces: nscd
 Provides: nscd
Index: compat
===================================================================
--- compat	(revision 472)
+++ compat	(working copy)
@@ -1 +1 @@
-4
+7
Index: preinst
===================================================================
--- preinst	(revision 0)
+++ preinst	(revision 0)
@@ -0,0 +1,18 @@
+#! /bin/sh
+# preinst script for unscd
+
+set -e
+
+case "$1" in
+    install)
+	# necessary in case nscd is not purged
+	# (useful to keep the config file, mostly compatible)
+	if [ ! -e /etc/init.d/.legacy-bootordering && -e /etc/init.d/nscd ]; then
+		insserv -r /etc/init.d/nscd
+	fi
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Index: install
===================================================================
--- install	(revision 0)
+++ install	(revision 0)
@@ -0,0 +1,2 @@
+nscd usr/sbin/
+debian/nscd.conf etc/
Index: changelog
===================================================================
--- changelog	(revision 472)
+++ changelog	(working copy)
@@ -1,3 +1,16 @@
+unscd (0.45-0+dc1) unstable; urgency=low
+
+  * NMU by DuckCorp.
+  * New upstream release.
+  * Switched to compat level 7 and DH.
+  * Increased Standards-Version to 3.8.4 (no changes needed).
+  * Added preinst script to avoid init resource clash if nscd was
+    installed but not purged.
+  * Updated default config file to what is really supported by unscd
+    (even if the nscd config will work).
+
+ -- Marc Dequènes (Duck) <Duck@DuckCorp.org>  Fri, 25 Jun 2010 14:53:26 +0200
+
 unscd (0.36-1) unstable; urgency=low
 
   * Initial packaging for Debian
Index: copyright
===================================================================
--- copyright	(revision 472)
+++ copyright	(working copy)
@@ -1,7 +1,8 @@
 Authors: Denys Vlasenko <vda.linux@googlemail.com>
 Webpage: http://busybox.net/~vda/unscd/
 Download: http://busybox.net/~vda/unscd/
-Debianized: Don Armstrong <don@debian.org> Tuesday, January 27, 2009 16:58:55 PST
+Debianized: Don Armstrong <don@debian.org> Tuesday, January 27, 2009 16:58:55 PST,
+ Marc Dequènes (Duck) <Duck@DuckCorp.org>  Fri, 25 Jun 2010 14:25:32 +0200
 
 Copyright: Copyright (C) 2007 Denys Vlasenko. Licensed under the GPL version 2. 
 
Index: rules
===================================================================
--- rules	(revision 472)
+++ rules	(working copy)
@@ -1,67 +1,14 @@
 #!/usr/bin/make -f
 
-#DH_VERBOSE = 1
+VERSION = $(shell dpkg-parsechangelog | sed -r '/^Version:/ !d; s/^.*: ([^-]+).*$$/\1/')
 
+%:
+	dh $@
 
-PREFIX=$(shell pwd)/debian/unscd/
+override_dh_auto_configure:
+	ln -s nscd-$(VERSION).c nscd.c
+	dh_auto_configure
 
-CFLAGS = -Wall -g
-
-INSTALL=install
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	gcc $(CFLAGS) -o nscd nscd-*.c
-
-	touch $@
-
 clean:
-	dh_testdir
-	dh_testroot
+	rm -f nscd.c
 
-	rm -f build-stamp
-
-	rm -f nscd
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(INSTALL) -d $(PREFIX)/usr/sbin/
-	$(INSTALL) -t $(PREFIX)/usr/sbin/ nscd
-	$(INSTALL) -d $(PREFIX)/etc/
-	$(INSTALL) -t $(PREFIX)/etc/ debian/nscd.conf
-
-binary-indep:
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs README
-	dh_installman
-	dh_installinit
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary-indep binary install
Index: nscd.conf
===================================================================
--- nscd.conf	(revision 472)
+++ nscd.conf	(working copy)
@@ -25,10 +25,9 @@
 #	check-files		<service> <yes|no>
 #	persistent		<service> <yes|no>
 #	shared			<service> <yes|no>
-#	max-db-size		<service> <number bytes>
 #	auto-propagate		<service> <yes|no>
 #
-# Currently supported cache names (services): passwd, group, hosts, services
+# Currently supported cache names (services): passwd, group, hosts
 #
 
 
@@ -49,7 +48,6 @@
 	check-files		passwd		yes
 	persistent		passwd		yes
 	shared			passwd		yes
-	max-db-size		passwd		33554432
 	auto-propagate		passwd		yes
 
 	enable-cache		group		yes
@@ -59,7 +57,6 @@
 	check-files		group		yes
 	persistent		group		yes
 	shared			group		yes
-	max-db-size		group		33554432
 	auto-propagate		group		yes
 
 # hosts caching is broken with gethostby* calls, hence is now disabled
@@ -71,13 +68,3 @@
 	check-files		hosts		yes
 	persistent		hosts		yes
 	shared			hosts		yes
-	max-db-size		hosts		33554432
-
-	enable-cache		services	yes
-	positive-time-to-live	services	28800
-	negative-time-to-live	services	20
-	suggested-size		services	211
-	check-files		services	yes
-	persistent		services	yes
-	shared			services	yes
-	max-db-size		services	33554432

Attachment: pgpGM7r5eYZEJ.pgp
Description: PGP Digital Signature


Reply to: