Package: ngetty
Version: 1.1-3
Severity: normal
Tags: patch

Dear maintainer,

I've prepared an NMU for ngetty (versioned as 1.1-3.1) and
uploaded it.

Ben.

-- 
Ben Hutchings
We get into the habit of living before acquiring the habit of thinking.
                                                         - Albert Camus
diff -Nru ngetty-1.1/debian/changelog ngetty-1.1/debian/changelog
--- ngetty-1.1/debian/changelog	2012-11-24 07:42:36.000000000 +0000
+++ ngetty-1.1/debian/changelog	2018-07-19 04:19:18.000000000 +0100
@@ -1,3 +1,23 @@
+ngetty (1.1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rebuild using a version of dietlibc that does not use vsyscall
+    (Closes: #802185)
+  * Add Built-Using relationship to dietlibc (Closes: #847579)
+  * sig_action.h: Define _NSIG_WORDS if necessary (Closes: #829550)
+  * ngetty-helper: Relax permissions check on Conf (Closes: #623264)
+  * Remove explicit use of quilt, which is not needed in a 3.0 (quilt)
+    format package
+  * Move dietlibc from Build-Depends to Build-Depends-Arch, as is not
+    needed when building the source package
+  * Use debhelper compat level 10
+    - Upstream changelog is only installed as changelog.gz, not also as
+      CHANGES
+  * debian/control: Update Standards-Version to 4.1.5
+    - Set Rules-Requires-Root: no
+
+ -- Ben Hutchings <b...@decadent.org.uk>  Thu, 19 Jul 2018 04:19:18 +0100
+
 ngetty (1.1-3) unstable; urgency=low
 
   * debian/ngetty.lintian-overrides: Remove dot-slash for newer lintian.
diff -Nru ngetty-1.1/debian/compat ngetty-1.1/debian/compat
--- ngetty-1.1/debian/compat	2011-02-15 08:44:34.000000000 +0000
+++ ngetty-1.1/debian/compat	2018-07-19 03:37:33.000000000 +0100
@@ -1 +1 @@
-7
+10
diff -Nru ngetty-1.1/debian/control ngetty-1.1/debian/control
--- ngetty-1.1/debian/control	2011-02-16 02:44:42.000000000 +0000
+++ ngetty-1.1/debian/control	2018-07-19 03:55:35.000000000 +0100
@@ -2,13 +2,16 @@
 Section: comm
 Priority: optional
 Maintainer: NIIBE Yutaka <gni...@fsij.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), dietlibc-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 10~)
+Build-Depends-Arch: dietlibc-dev (>= 0.34~cvs20160209.1)
+Rules-Requires-Root: no
+Standards-Version: 4.1.5
 Homepage: http://riemann.fmi.uni-sofia.bg/ngetty/
 
 Package: ngetty
 Architecture: any
 Depends: lsb-base (>= 3.0-6), ${misc:Depends}
+Built-Using: ${ngetty:Built-Using}
 Description: getty replacement - one single daemon for all consoles
  Ngetty is a daemon that starts login sessions on virtual console
  terminals, on demand.  It is a good replacement for all those getty
diff -Nru ngetty-1.1/debian/patches/ngetty-helper-relax-permissions-check-on-conf.patch ngetty-1.1/debian/patches/ngetty-helper-relax-permissions-check-on-conf.patch
--- ngetty-1.1/debian/patches/ngetty-helper-relax-permissions-check-on-conf.patch	1970-01-01 01:00:00.000000000 +0100
+++ ngetty-1.1/debian/patches/ngetty-helper-relax-permissions-check-on-conf.patch	2018-07-19 03:10:33.000000000 +0100
@@ -0,0 +1,23 @@
+From: Ben Hutchings <b...@decadent.org.uk>
+Date: Thu, 19 Jul 2018 03:03:02 +0100
+Subject: ngetty-helper: Relax permissions check on Conf
+Bug-Debian: https://bugs.debian.org/623264
+
+ngetty-helper ignores the contents of the configuration file if any
+permissions outside 0600 (owner read and writable) are set.  But
+debhelper sets the permissions to 0644, so it is ignored by default.
+
+There is nothing secret in the configuration file, so the only
+dangerous permission bits are the group and world writable bits.
+---
+--- a/ngetty-helper.c
++++ b/ngetty-helper.c
+@@ -232,7 +232,7 @@ int main(int argc,char *argv[]) {
+     /* 40 bytes for Months or Days */
+     if (GLOBAL_fstat_READ(fd,st,s, len,64000, 40)) _exit(1);
+     close(fd);
+-    if (st.st_uid || st.st_gid || (st.st_mode & 07177)) len = 0;
++    if (st.st_uid || st.st_gid || (st.st_mode & 07022)) len = 0;
+     s[len]=0;
+ 
+     GLOBAL_split(aa,s,'\n', len);
diff -Nru ngetty-1.1/debian/patches/series ngetty-1.1/debian/patches/series
--- ngetty-1.1/debian/patches/series	2011-02-15 08:49:51.000000000 +0000
+++ ngetty-1.1/debian/patches/series	2018-07-19 03:48:12.000000000 +0100
@@ -1,2 +1,4 @@
 01_no_gz_manual_install.diff
 
+sig_action.h-define-_nsig_words-if-necessary.patch
+ngetty-helper-relax-permissions-check-on-conf.patch
diff -Nru ngetty-1.1/debian/patches/sig_action.h-define-_nsig_words-if-necessary.patch ngetty-1.1/debian/patches/sig_action.h-define-_nsig_words-if-necessary.patch
--- ngetty-1.1/debian/patches/sig_action.h-define-_nsig_words-if-necessary.patch	1970-01-01 01:00:00.000000000 +0100
+++ ngetty-1.1/debian/patches/sig_action.h-define-_nsig_words-if-necessary.patch	2018-07-19 03:10:36.000000000 +0100
@@ -0,0 +1,25 @@
+From: Ben Hutchings <b...@decadent.org.uk>
+Date: Thu, 19 Jul 2018 02:53:20 +0100
+Subject: sig_action.h: Define _NSIG_WORDS if necessary
+Bug-Debian: https://bugs.debian.org/829550
+
+_NSIG_WORDS is defined in <asm/signal.h> on Linux, which I assume was
+previously included by dietlibc's <signal.h> but no longer is.
+
+Including <asm/signal.h> here might introduce conflicts, so just
+define _NSIG_WORDS here if we're going to use it and it's not already
+defined.
+---
+--- a/sig_action.h
++++ b/sig_action.h
+@@ -10,6 +10,10 @@ extern int system__errno;
+ 
+ #if defined(__i386__) || defined(__x86_64__)
+ 
++#ifndef _NSIG_WORDS
++#define _NSIG_WORDS (_NSIG / (8 * sizeof(unsigned long)))
++#endif
++
+ #define sigemptyset(set) \
+ do { \
+   set->sig[0]=0; \
diff -Nru ngetty-1.1/debian/rules ngetty-1.1/debian/rules
--- ngetty-1.1/debian/rules	2012-11-24 07:16:14.000000000 +0000
+++ ngetty-1.1/debian/rules	2018-07-19 03:16:00.000000000 +0100
@@ -5,7 +5,11 @@
 export DH_OPTIONS
 
 %:
-	dh $@ --with quilt
+	dh $@
 
 override_dh_auto_build:
 	$(MAKE) CC='diet -Os gcc -W'
+
+override_dh_gencontrol:
+	echo >> debian/ngetty.substvars "ngetty:Built-Using=$$(dpkg-query -W -f '$${source:Package} (= $${source:Version})' dietlibc-dev)"
+	dh_gencontrol

Attachment: signature.asc
Description: PGP signature

Reply via email to