diff mbox

[OpenWrt-Devel,1/2] lldpd: remove patch 001

Message ID 1429601445-2905-1-git-send-email-ardeleanalex@gmail.com
State Superseded
Headers show

Commit Message

Alexandru Ardelean April 21, 2015, 7:30 a.m. UTC 
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---
 ...lookup-for-_lldpd-when-privsep-is-disable.patch | 73 ----------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch

Comments

Jonas Gorski April 21, 2015, 2:40 p.m. UTC | #1 
On Tue, Apr 21, 2015 at 9:30 AM, Alexandru Ardelean
<ardeleanalex@gmail.com> wrote:
> Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

Please provide some explanation why it is okay to remove the patch.


Jonas
Alexandru Ardelean April 21, 2015, 2:56 p.m. UTC | #2 
On Tue, Apr 21, 2015 at 5:40 PM, Jonas Gorski <jogo@openwrt.org> wrote:

> On Tue, Apr 21, 2015 at 9:30 AM, Alexandru Ardelean
> <ardeleanalex@gmail.com> wrote:
> > Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
>
> Please provide some explanation why it is okay to remove the patch.
>
>
> Jonas
>

My bad for omitting the explanation.
Removed patch is included in the 0.7.14 release which is the second patch
that upgrades lldpd to 0.7.14.
Jonas Gorski April 21, 2015, 2:58 p.m. UTC | #3 
On Tue, Apr 21, 2015 at 4:56 PM, Alexandru Ardelean
<ardeleanalex@gmail.com> wrote:
> On Tue, Apr 21, 2015 at 5:40 PM, Jonas Gorski <jogo@openwrt.org> wrote:
>>
>> On Tue, Apr 21, 2015 at 9:30 AM, Alexandru Ardelean
>> <ardeleanalex@gmail.com> wrote:
>> > Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
>>
>> Please provide some explanation why it is okay to remove the patch.
>>
>>
>> Jonas
>
>
> My bad for omitting the explanation.
> Removed patch is included in the 0.7.14 release which is the second patch
> that upgrades lldpd to 0.7.14.

Then you should remove the patch at the same time as updating the
version, not before. So please merge both into one patch.


Jonas
diff mbox

Patch

diff --git a/package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch b/package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch
deleted file mode 100644
index 907c21b..0000000
--- a/package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch
+++ /dev/null
@@ -1,73 +0,0 @@ 
-From 28bf40220840c277d70ed66f6d58729ebb975de8 Mon Sep 17 00:00:00 2001
-From: Vincent Bernat <vincent@bernat.im>
-Date: Thu, 12 Feb 2015 08:07:43 +0100
-Subject: [PATCH] priv: don't lookup for _lldpd when privsep is disabled
-
-Closes #95
----
- src/daemon/lldpd.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c
-index f868fc7..6a3a160 100644
---- a/src/daemon/lldpd.c
-+++ b/src/daemon/lldpd.c
-@@ -1335,11 +1335,13 @@ lldpd_main(int argc, char *argv[], char *envp[])
- 	int receiveonly = 0;
- 	int ctl;
- 
-+#ifdef ENABLE_PRIVSEP
- 	/* Non privileged user */
- 	struct passwd *user;
- 	struct group *group;
- 	uid_t uid;
- 	gid_t gid;
-+#endif
- 
- 	saved_argv = argv;
- 
-@@ -1493,12 +1495,14 @@ lldpd_main(int argc, char *argv[], char *envp[])
- 	log_debug("main", "lldpd starting...");
- 
- 	/* Grab uid and gid to use for priv sep */
-+#ifdef ENABLE_PRIVSEP
- 	if ((user = getpwnam(PRIVSEP_USER)) == NULL)
- 		fatal("main", "no " PRIVSEP_USER " user for privilege separation");
- 	uid = user->pw_uid;
- 	if ((group = getgrnam(PRIVSEP_GROUP)) == NULL)
- 		fatal("main", "no " PRIVSEP_GROUP " group for privilege separation");
- 	gid = group->gr_gid;
-+#endif
- 
- 	/* Create and setup socket */
- 	int retry = 1;
-@@ -1526,12 +1530,14 @@ lldpd_main(int argc, char *argv[], char *envp[])
- 		log_warn("main", "unable to create control socket");
- 		fatalx("giving up");
- 	}
-+#ifdef ENABLE_PRIVSEP
- 	if (chown(ctlname, uid, gid) == -1)
- 		log_warn("main", "unable to chown control socket");
- 	if (chmod(ctlname,
- 		S_IRUSR | S_IWUSR | S_IXUSR |
- 		S_IRGRP | S_IWGRP | S_IXGRP) == -1)
- 		log_warn("main", "unable to chmod control socket");
-+#endif
- 
- 	/* Disable SIGPIPE */
- 	signal(SIGPIPE, SIG_IGN);
-@@ -1576,7 +1582,11 @@ lldpd_main(int argc, char *argv[], char *envp[])
- 	}
- 
- 	log_debug("main", "initialize privilege separation");
-+#ifdef ENABLE_PRIVSEP
- 	priv_init(PRIVSEP_CHROOT, ctl, uid, gid);
-+#else
-+	priv_init(PRIVSEP_CHROOT, ctl, 0, 0);
-+#endif
- 
- 	/* Initialization of global configuration */
- 	if ((cfg = (struct lldpd *)
--- 
-2.1.2
-