[Pkg-sysvinit-commits] r1866 - in sysvinit/trunk/debian: . patches
Petter Reinholdtsen
pere at alioth.debian.org
Fri Apr 23 05:57:20 UTC 2010
Author: pere
Date: 2010-04-23 05:57:17 +0000 (Fri, 23 Apr 2010)
New Revision: 1866
Removed:
sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch
sysvinit/trunk/debian/patches/15_doc_upstream_email.dpatch
sysvinit/trunk/debian/patches/50_bootlogd_devsubdir.dpatch
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/patches/series
Log:
- Drop 14_doc_fsf_addr.dpatch, now included upstream.
- Drop 15_doc_upstream_email.dpatch, now included upstream.
- Drop 50_bootlogd_devsubdir.dpatch, now included upstream.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2010-04-23 05:46:26 UTC (rev 1865)
+++ sysvinit/trunk/debian/changelog 2010-04-23 05:57:17 UTC (rev 1866)
@@ -2,6 +2,9 @@
* New upstream release.
- Drop 11_doc_shutdown-c.dpatch, now included upstream.
+ - Drop 14_doc_fsf_addr.dpatch, now included upstream.
+ - Drop 15_doc_upstream_email.dpatch, now included upstream.
+ - Drop 50_bootlogd_devsubdir.dpatch, now included upstream.
- Drop 94_fstab-decode.dpatch, now included upstream.
* New patch 99_nostrip.patch to remove stripping from src/Makefile to
get nostrip build option working (Closes: #438085).
Deleted: sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch 2010-04-23 05:46:26 UTC (rev 1865)
+++ sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch 2010-04-23 05:57:17 UTC (rev 1866)
@@ -1,15 +0,0 @@
-Purpose: Refer to /usr/share/common-licenses/GPL-2 and not the versionless
- symlink /usr/share/common-licenses/GPL.
-Authour: Kel Modderman <kel at otaku42.de>
-Fixes: -
-Status: Debian specific
-
---- a/COPYRIGHT
-+++ b/COPYRIGHT
-@@ -15,5 +15,5 @@
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- On Debian GNU/Linux systems, the complete text of the GNU General
--Public License can be found in `/usr/share/common-licenses/GPL'.
-+Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
Deleted: sysvinit/trunk/debian/patches/15_doc_upstream_email.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/15_doc_upstream_email.dpatch 2010-04-23 05:46:26 UTC (rev 1865)
+++ sysvinit/trunk/debian/patches/15_doc_upstream_email.dpatch 2010-04-23 05:57:17 UTC (rev 1866)
@@ -1,13 +0,0 @@
-Purpose: Update to the current email address for upstream bug reports.
-Authour: Petter Reinholdtsen
-Fixes: -
-Status: Applied upstream
-
---- a/README (revision 1827)
-+++ b/README (working copy)
-@@ -5,4 +5,4 @@
- obsolete Really obsolete stuff ;)
- src Source code
-
--Send patches to initscripts-ng-devel at lists.alioth.debian.org.
-+Send patches to sysvinit-devel at nongnu.org .
Deleted: sysvinit/trunk/debian/patches/50_bootlogd_devsubdir.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/50_bootlogd_devsubdir.dpatch 2010-04-23 05:46:26 UTC (rev 1865)
+++ sysvinit/trunk/debian/patches/50_bootlogd_devsubdir.dpatch 2010-04-23 05:57:17 UTC (rev 1866)
@@ -1,111 +0,0 @@
-Purpose: Rewrite findtty() in bootlogd to recursively search /dev/ for the
- correct device, to handle terminal devices for example in /dev/pty/.
-Authour: Petter Reinholdtsen
-Fixes: #376406
-Status: Applied upstream.
-
---- a/src/bootlogd.c
-+++ b/src/bootlogd.c
-@@ -98,41 +98,60 @@
-
- /*
- * Scan /dev and find the device name.
-- * Side-effect: directory is changed to /dev
-- *
-- * FIXME: scan subdirectories for devfs support ?
- */
--int findtty(char *res, int rlen, dev_t dev)
-+static int findtty(char *res, const char *startdir, int rlen, dev_t dev)
- {
- DIR *dir;
- struct dirent *ent;
- struct stat st;
-- int r = 0;
-+ int r = -1;
-+ char *olddir = getcwd(NULL, 0);
-
-- if (chdir("/dev") < 0 || (dir = opendir(".")) == NULL) {
-- perror("bootlogd: /dev");
-+ if (chdir(startdir) < 0 || (dir = opendir(".")) == NULL) {
-+ int msglen = strlen(startdir) + 11;
-+ char *msg = malloc(msglen);
-+ snprintf(msg, msglen, "bootlogd: %s", startdir);
-+ perror(msg);
-+ free(msg);
-+ chdir(olddir);
- return -1;
- }
- while ((ent = readdir(dir)) != NULL) {
- if (lstat(ent->d_name, &st) != 0)
- continue;
-+ if (S_ISDIR(st.st_mode)
-+ && 0 != strcmp(".", ent->d_name)
-+ && 0 != strcmp("..", ent->d_name)) {
-+ char *path = malloc(rlen);
-+ snprintf(path, rlen, "%s/%s", startdir, ent->d_name);
-+ r = findtty(res, path, rlen, dev);
-+ free(path);
-+ if (0 == r) { /* device found, return */
-+ closedir(dir);
-+ chdir(olddir);
-+ return 0;
-+ }
-+ continue;
-+ }
- if (!S_ISCHR(st.st_mode))
- continue;
- if (st.st_rdev == dev) {
-- break;
-+ if (strlen(ent->d_name) + strlen(startdir) + 1 >= rlen) {
-+ fprintf(stderr, "bootlogd: console device name too long\n");
-+ closedir(dir);
-+ chdir(olddir);
-+ return -1;
-+ } else {
-+ snprintf(res, rlen, "%s/%s", startdir, ent->d_name);
-+ closedir(dir);
-+ chdir(olddir);
-+ return 0;
-+ }
- }
- }
-- if (ent == NULL) {
-- fprintf(stderr, "bootlogd: cannot find console device "
-- "%d:%d in /dev\n", major(dev), minor(dev));
-- r = -1;
-- } else if (strlen(ent->d_name) + 5 >= rlen) {
-- fprintf(stderr, "bootlogd: console device name too long\n");
-- r = -1;
-- } else
-- snprintf(res, rlen, "/dev/%s", ent->d_name);
- closedir(dir);
-
-+ chdir(olddir);
- return r;
- }
-
-@@ -227,12 +246,21 @@
- /*
- * Old kernel, can find real device easily.
- */
-- return findtty(res, rlen, st.st_rdev);
-+ int r = findtty(res, "/dev", rlen, st.st_rdev);
-+ if (0 != r)
-+ fprintf(stderr, "bootlogd: cannot find console device "
-+ "%d:%d under /dev\n", major(st.st_rdev), minor(st.st_rdev));
-+ return r;
- }
-
- #ifdef TIOCGDEV
-- if (ioctl(0, TIOCGDEV, &kdev) == 0)
-- return findtty(res, rlen, (dev_t)kdev);
-+ if (ioctl(0, TIOCGDEV, &kdev) == 0) {
-+ int r = findtty(res, "/dev", rlen, (dev_t)kdev);
-+ if (0 != r)
-+ fprintf(stderr, "bootlogd: cannot find console device "
-+ "%d:%d under /dev\n", major(kdev), minor(kdev));
-+ return r;
-+ }
- if (errno != ENOIOCTLCMD) return -1;
- #endif
-
Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series 2010-04-23 05:46:26 UTC (rev 1865)
+++ sysvinit/trunk/debian/patches/series 2010-04-23 05:57:17 UTC (rev 1866)
@@ -1,9 +1,6 @@
10_doc_manuals.dpatch
-14_doc_fsf_addr.dpatch
-15_doc_upstream_email.dpatch
21_ifdown_kfreebsd.dpatch
46_pidof_symlinkman.dpatch
-50_bootlogd_devsubdir.dpatch
54_bootlogd_findptyfail.dpatch
55_bootlogd_flush.patch
60_init_selinux_ifdef.dpatch
More information about the Pkg-sysvinit-commits
mailing list