New upstream release

* New upstream release
* Silence the cache invalidation output (Closes: #622230)

diff --git a/debian/changelog b/debian/changelog
index 9209e4f5deb3e0d9072c5555ebc80a768252909f..6b9ba827d7baf7047e132fb3b311d907c20a2a9d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+unscd (0.51-1) unstable; urgency=low
+
+  * New upstream release
+  * Silence the cache invalidation output (Closes: #622230)
+
+ --
+
 unscd (0.49-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/patches/change_invalidate_request_info_output b/debian/patches/change_invalidate_request_info_output
new file mode 100644 (file)
index 0000000..d5dfb17
--- /dev/null
+++ b/debian/patches/change_invalidate_request_info_output
@@ -0,0 +1,26 @@
+From: Don Armstrong <don@debian.org>
+Subject: Silence cache invalidation requests unless in debug mode
+Origin: debian, http://websvn.donarmstrong.com/filedetails.php?repname=deb_pkgs&path=%2Funscd%2Ftrunk%2Fdebian%2Fpatches%2Fsilence_cache_invalidation
+Bug-Debian: http://bugs.debian.org/622230
+--- a/nscd.c
++++ b/nscd.c
+@@ -2432,7 +2432,7 @@
+ 
+       if (!arg) { /* shutdown */
+               xfull_write(sock, &ureq, sizeof(ureq));
+-              printf("sent shutdown request, exiting\n");
++              fprintf(stderr,"sent shutdown request, exiting\n");
+       } else { /* invalidate */
+               size_t arg_len = strlen(arg) + 1;
+               struct {
+@@ -2444,7 +2444,9 @@
+               reqdata.req.key_len = arg_len;
+               memcpy(reqdata.arg, arg, arg_len);
+               xfull_write(sock, &reqdata, arg_len + sizeof(ureq));
+-              printf("sent invalidate(%s) request, exiting\n", arg);
++        if (debug) {
++          fprintf(stderr,"sent invalidate(%s) request, exiting\n", arg);
++        }
+       }
+       exit(0);
+ }

diff --git a/debian/patches/series b/debian/patches/series
index 9d5b3aa06fbf1f99336b6e234b17f3be1679d7b1..c5742c031a88d50f2593d3c9bf21d1d6809d7619 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-silence_cache_invalidation
+change_invalidate_request_info_output
+

diff --git a/debian/patches/silence_cache_invalidation b/debian/patches/silence_cache_invalidation
deleted file mode 100644 (file)
index 4df8ba7..0000000
--- a/debian/patches/silence_cache_invalidation
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Don Armstrong <don@debian.org>
-Subject: Silence cache invalidation requests unless in debug mode
-Origin: debian, http://websvn.donarmstrong.com/filedetails.php?repname=deb_pkgs&path=%2Funscd%2Ftrunk%2Fdebian%2Fpatches%2Fsilence_cache_invalidation
-Bug-Debian: http://bugs.debian.org/622230
-Index: unscd/nscd.c
-===================================================================
---- unscd.orig/nscd.c  2012-01-21 16:05:03.000000000 -0800
-+++ unscd/nscd.c       2012-01-21 16:05:33.000000000 -0800
-@@ -2391,7 +2391,9 @@
-               reqdata.req.key_len = arg_len;
-               memcpy(reqdata.arg, arg, arg_len);
-               xfull_write(sock, &reqdata, arg_len + sizeof(ureq));
--              printf("sent invalidate(%s) request, exiting\n", arg);
-+              if (debug) {
-+                printf("sent invalidate(%s) request, exiting\n", arg);
-+              }
-       }
-       exit(0);
- }