From patchwork Tue Apr 21 15:07:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 463177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D570F1401E7 for ; Wed, 22 Apr 2015 01:07:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=GdSZhHy1; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id E452428B89D; Tue, 21 Apr 2015 17:06:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id EC5F028050D for ; Tue, 21 Apr 2015 17:06:50 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 21 Apr 2015 17:06:50 +0200 (CEST) Received: by wizk4 with SMTP id k4so143228264wiz.1 for ; Tue, 21 Apr 2015 08:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=dVzGD5e32RaCdHBZOGNHn1PasOwWNmDNiGAw4wxPC70=; b=GdSZhHy1MBcU5CjwsptLT85YzuGWt5vwpDDRMyh6DdPf547Qn/hg9eXOZZpDZTvMVY UdNOAyCphhcB7ONXrB5cPE4rl6NKCGmzrQ02Y5X+w00CywpI8Sh+RNNskBCuU96hoq3V NxnsS/ZTFcOl9bf9PcgdI1J1lc+J62Vu3WNNiP4ZoRj247FMO0pidZnjD6CL7JczeYp/ f10lhdgoPd1wNKdHMB4USHgRCqi9b7yk3yylCGPAZ0JVje0OL8Ly/mGx046dkmImcNER jdB2wOyuRffby1r4Kt4RtEnCZdLSXNeRG6APcQovWLUIZ5okXhwb4Y6+qoaGPYplDP3p KXKQ== X-Received: by 10.180.82.41 with SMTP id f9mr34956928wiy.48.1429628868004; Tue, 21 Apr 2015 08:07:48 -0700 (PDT) Received: from orion.local ([194.105.29.179]) by mx.google.com with ESMTPSA id r9sm3026269wjo.26.2015.04.21.08.07.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Apr 2015 08:07:47 -0700 (PDT) From: Alexandru Ardelean To: openwrt-devel@lists.openwrt.org Date: Tue, 21 Apr 2015 18:07:41 +0300 Message-Id: <1429628861-7010-1-git-send-email-ardeleanalex@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [OpenWrt-Devel] [PATCH][RESEND] lldpd: update to version 0.7.14 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" And removing patch 001 which is now included in the 0.7.14 release. Signed-off-by: Alexandru Ardelean --- package/network/services/lldpd/Makefile | 6 +- ...lookup-for-_lldpd-when-privsep-is-disable.patch | 73 ---------------------- 2 files changed, 3 insertions(+), 76 deletions(-) delete mode 100644 package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile index d80840e..382d127 100644 --- a/package/network/services/lldpd/Makefile +++ b/package/network/services/lldpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lldpd -PKG_VERSION:=0.7.13 -PKG_RELEASE:=2 +PKG_VERSION:=0.7.14 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://media.luffy.cx/files/lldpd -PKG_MD5SUM:=13e8be761753eac9a8e12128acba40b4 +PKG_MD5SUM:=66462f85e56895256fa77ea1ab53bfbc PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC 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 -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 -