From 0019b390012a96cbbaee498382c335ebcec66183 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 12 Oct 2012 11:58:19 +0000 Subject: lldpd: bump to v0.6.1, enable privilege separation and chrooting SVN-Revision: 33729 --- .../services/lldpd/patches/001-no-multiuser.patch | 40 ---------------------- .../lldpd/patches/002-no-stack-protector.patch | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 package/network/services/lldpd/patches/001-no-multiuser.patch (limited to 'package/network/services/lldpd/patches') diff --git a/package/network/services/lldpd/patches/001-no-multiuser.patch b/package/network/services/lldpd/patches/001-no-multiuser.patch deleted file mode 100644 index 5f216c4289..0000000000 --- a/package/network/services/lldpd/patches/001-no-multiuser.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src/priv.c -+++ b/src/priv.c -@@ -518,12 +518,14 @@ priv_init(char *chrootdir) - fatal("[priv]: unable to create socket pair for privilege separation"); - - /* Get users */ -+ /* - if ((user = getpwnam(PRIVSEP_USER)) == NULL) - fatal("[priv]: no " PRIVSEP_USER " user for privilege separation"); - uid = user->pw_uid; - if ((group = getgrnam(PRIVSEP_GROUP)) == NULL) - fatal("[priv]: no " PRIVSEP_GROUP " group for privilege separation"); - gid = group->gr_gid; -+ */ - - /* Spawn off monitor */ - if ((monitored = fork()) < 0) -@@ -534,17 +536,17 @@ priv_init(char *chrootdir) - if (RUNNING_ON_VALGRIND) - LLOG_WARNX("[priv]: running on valgrind, keep privileges"); - else { -- if (chroot(chrootdir) == -1) -- fatal("[priv]: unable to chroot"); -- if (chdir("/") != 0) -+ /*if (chroot(chrootdir) == -1) -+ fatal("[priv]: unable to chroot");*/ -+ if (chdir("/tmp") != 0) - fatal("[priv]: unable to chdir"); - gidset[0] = gid; -- if (setresgid(gid, gid, gid) == -1) -+ /*if (setresgid(gid, gid, gid) == -1) - fatal("[priv]: setresgid() failed"); - if (setgroups(1, gidset) == -1) - fatal("[priv]: setgroups() failed"); - if (setresuid(uid, uid, uid) == -1) -- fatal("[priv]: setresuid() failed"); -+ fatal("[priv]: setresuid() failed");*/ - } - remote = pair[0]; - close(pair[1]); diff --git a/package/network/services/lldpd/patches/002-no-stack-protector.patch b/package/network/services/lldpd/patches/002-no-stack-protector.patch index 0a0c6fbb69..dc861bac64 100644 --- a/package/network/services/lldpd/patches/002-no-stack-protector.patch +++ b/package/network/services/lldpd/patches/002-no-stack-protector.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -48,7 +48,6 @@ AX_CFLAGS_GCC_OPTION([-Wformat]) +@@ -62,7 +62,6 @@ AX_CFLAGS_GCC_OPTION([-Wformat]) AX_CFLAGS_GCC_OPTION([-Wformat-security]) AX_CFLAGS_GCC_OPTION([-Wcast-align]) AX_CFLAGS_GCC_OPTION([-Winline]) -- cgit v1.2.3