* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ifplugd/, sys-apps/ifplugd/files/
@ 2016-10-21 9:15 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2016-10-21 9:15 UTC (permalink / raw
To: gentoo-commits
commit: 6c6c2f6df5ed2ce0cff3451e1edbb72328587bd0
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Wed Oct 12 00:20:33 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 09:12:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6c2f6d
sys-apps/ifplugd: revision bump
* EAPI=6
* add patch from Chad Joan for compilation with musl libc
* remove obsolete pkg_postinst phase
Gentoo-Bug: https://bugs.gentoo.org/592912
Gentoo-Bug: https://bugs.gentoo.org/278653
Closes: https://github.com/gentoo/gentoo/pull/2541
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../ifplugd/files/ifplugd-0.28-interface.patch | 4 +-
sys-apps/ifplugd/files/ifplugd-0.28-musl.patch | 19 +++++++++
sys-apps/ifplugd/files/ifplugd-0.28-nlapi.diff | 4 +-
.../ifplugd/files/ifplugd-0.28-strictalias.patch | 4 +-
sys-apps/ifplugd/ifplugd-0.28-r10.ebuild | 49 ++++++++++++++++++++++
5 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch b/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch
index 9c2de46..f99f3a2 100644
--- a/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch
+++ b/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch
@@ -1,5 +1,5 @@
---- src/interface.c 2004/12/19 00:08:01 114
-+++ src/interface.c 2006/03/07 13:15:11 133
+--- a/src/interface.c
++++ b/src/interface.c
@@ -22,9 +22,9 @@
#include <config.h>
#endif
diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-musl.patch b/sys-apps/ifplugd/files/ifplugd-0.28-musl.patch
new file mode 100644
index 00000000..ecaaabf
--- /dev/null
+++ b/sys-apps/ifplugd/files/ifplugd-0.28-musl.patch
@@ -0,0 +1,19 @@
+--- a/src/ethtool-local.h
++++ b/src/ethtool-local.h
+@@ -21,10 +21,12 @@
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+-typedef unsigned long long u64;
+-typedef __uint32_t u32;
+-typedef __uint16_t u16;
+-typedef __uint8_t u8;
++#include <stdint.h>
++
++typedef uint64_t u64;
++typedef uint32_t u32;
++typedef uint16_t u16;
++typedef uint8_t u8;
+
+ #include "ethtool-kernel.h"
+
diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-nlapi.diff b/sys-apps/ifplugd/files/ifplugd-0.28-nlapi.diff
index b640543..a3d128f 100644
--- a/sys-apps/ifplugd/files/ifplugd-0.28-nlapi.diff
+++ b/sys-apps/ifplugd/files/ifplugd-0.28-nlapi.diff
@@ -1,6 +1,6 @@
diff -urN src/nlapi.c src/nlapi.c
---- src/nlapi.c 2004-12-20 08:39:14.682706517 -0500
-+++ src/nlapi.c 2004-12-20 08:39:50.185734092 -0500
+--- a/src/nlapi.c
++++ b/src/nlapi.c
@@ -86,7 +86,7 @@
for (; bytes > 0; p = NLMSG_NEXT(p, bytes)) {
struct callback_info *c;
diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-strictalias.patch b/sys-apps/ifplugd/files/ifplugd-0.28-strictalias.patch
index 3c5de8a..ae8292d 100644
--- a/sys-apps/ifplugd/files/ifplugd-0.28-strictalias.patch
+++ b/sys-apps/ifplugd/files/ifplugd-0.28-strictalias.patch
@@ -1,5 +1,5 @@
---- src/interface.c.orig 2007-03-23 13:29:40.000000000 +0000
-+++ src/interface.c 2007-03-23 13:30:05.000000000 +0000
+--- a/src/interface.c
++++ b/src/interface.c
@@ -89,6 +89,10 @@
interface_status_t interface_detect_beat_mii(int fd, char *iface) {
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
new file mode 100644
index 00000000..889836c
--- /dev/null
+++ b/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
+HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
+SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~hppa ~ppc ~x86"
+IUSE="doc selinux"
+
+DEPEND="virtual/pkgconfig
+ doc? ( www-client/lynx )
+ >=dev-libs/libdaemon-0.5"
+RDEPEND=">=dev-libs/libdaemon-0.5
+ >=sys-apps/baselayout-1.12
+ selinux? ( sec-policy/selinux-ifplugd )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-nlapi.diff"
+ "${FILESDIR}/${P}-interface.patch"
+ "${FILESDIR}/${P}-strictalias.patch"
+ "${FILESDIR}/${P}-noip.patch"
+ "${FILESDIR}/${P}-musl.patch"
+ )
+DOCS=( doc/README doc/SUPPORTED_DRIVERS )
+HTML_DOCS=( doc/README.html doc/style.css )
+
+src_configure() {
+ econf \
+ $(use_enable doc lynx) \
+ --with-initdir=/etc/init.d \
+ --disable-xmltoman \
+ --disable-subversion
+}
+
+src_install() {
+ default
+
+ # Remove init.d configuration as we no longer use it
+ rm -rf "${ED}/etc/ifplugd" "${ED}/etc/init.d/${PN}" || die
+
+ exeinto "/etc/${PN}"
+ newexe "${FILESDIR}/${PN}.action" "${PN}.action"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ifplugd/, sys-apps/ifplugd/files/
@ 2020-05-03 20:20 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2020-05-03 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 9c5cef11f89018c18d3f78657864434f3f232744
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 20:14:32 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 3 20:20:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5cef11
sys-apps/ifplugd: rev bump
- Bump to EAPI 7
- Fix building against GCC 10
Thanks-to: Jeroen Roovers <jer <AT> gentoo.org>
Closes: https://bugs.gentoo.org/706746
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../ifplugd/files/ifplugd-0.28-gcc10-compatibility.patch | 13 +++++++++++++
.../{ifplugd-0.28-r10.ebuild => ifplugd-0.28-r11.ebuild} | 8 +++++---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-gcc10-compatibility.patch b/sys-apps/ifplugd/files/ifplugd-0.28-gcc10-compatibility.patch
new file mode 100644
index 00000000000..c87419e5a54
--- /dev/null
+++ b/sys-apps/ifplugd/files/ifplugd-0.28-gcc10-compatibility.patch
@@ -0,0 +1,13 @@
+--- a/./src/interface.h
++++ b/./src/interface.h
+@@ -21,8 +21,8 @@
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+-int interface_auto_up;
+-int interface_do_message;
++extern int interface_auto_up;
++extern int interface_do_message;
+
+ typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
+
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r11.ebuild
similarity index 92%
rename from sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
rename to sys-apps/ifplugd/ifplugd-0.28-r11.ebuild
index 9854033e325..560ccc4ef8f 100644
--- a/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.28-r11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="7"
DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
@@ -25,7 +25,9 @@ PATCHES=(
"${FILESDIR}/${P}-strictalias.patch"
"${FILESDIR}/${P}-noip.patch"
"${FILESDIR}/${P}-musl.patch"
- )
+ "${FILESDIR}/${P}-gcc10-compatibility.patch"
+)
+
DOCS=( doc/README doc/SUPPORTED_DRIVERS )
HTML_DOCS=( doc/README.html doc/style.css )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ifplugd/, sys-apps/ifplugd/files/
@ 2024-11-22 13:55 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-11-22 13:55 UTC (permalink / raw
To: gentoo-commits
commit: f4d9934f34952493a6c372d389e92875d23d2a3e
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Thu Apr 25 14:21:20 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 13:51:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d9934f
sys-apps/ifplugd: fix incompatible pointer types
After discussion switched include from linux/if.h to net/if.h
libc version contains everything needed both in musl and glibc.
eautoreconf automagics away implicit function declaration errors
in configure
update EAPI 7 -> 8 in process
Closes: https://bugs.gentoo.org/921384
Closes: https://bugs.gentoo.org/908538
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36420
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/ifplugd-0.28-fix-if.h-include.patch | 60 ++++++++++++++++++++++
sys-apps/ifplugd/ifplugd-0.28-r12.ebuild | 54 +++++++++++++++++++
2 files changed, 114 insertions(+)
diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-fix-if.h-include.patch b/sys-apps/ifplugd/files/ifplugd-0.28-fix-if.h-include.patch
new file mode 100644
index 000000000000..4b6fd1c8220c
--- /dev/null
+++ b/sys-apps/ifplugd/files/ifplugd-0.28-fix-if.h-include.patch
@@ -0,0 +1,60 @@
+diff -ru a/src/ifmonitor.c b/src/ifmonitor.c
+--- a/src/ifmonitor.c 2024-04-25 13:35:56.625794510 +0000
++++ b/src/ifmonitor.c 2024-04-25 14:13:08.734022552 +0000
+@@ -27,7 +27,7 @@
+ #include <linux/types.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+-#include <linux/if.h>
++#include <net/if.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
+diff -ru a/src/interface.c b/src/interface.c
+--- a/src/interface.c 2024-04-25 13:35:56.625794510 +0000
++++ b/src/interface.c 2024-04-25 14:12:49.510133122 +0000
+@@ -27,7 +27,7 @@
+ #include <linux/if_ether.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+-#include <linux/if.h>
++#include <net/if.h>
+ #include <syslog.h>
+ #include <string.h>
+ #include <errno.h>
+diff -ru a/src/wireless.15.h b/src/wireless.15.h
+--- a/src/wireless.15.h 2024-04-25 13:35:56.625794510 +0000
++++ b/src/wireless.15.h 2024-04-25 14:12:56.254094333 +0000
+@@ -71,7 +71,7 @@
+
+ #include <linux/types.h> /* for "caddr_t" et al */
+ #include <linux/socket.h> /* for "struct sockaddr" et al */
+-#include <linux/if.h> /* for IFNAMSIZ and co... */
++#include <net/if.h> /* for IFNAMSIZ and co... */
+
+ /***************************** VERSION *****************************/
+ /*
+diff -ru a/src/wireless.16.h b/src/wireless.16.h
+--- a/src/wireless.16.h 2024-04-25 13:35:56.625794510 +0000
++++ b/src/wireless.16.h 2024-04-25 14:12:42.710172234 +0000
+@@ -73,7 +73,7 @@
+ * at some point. Jean II */
+ #include <linux/types.h> /* for "caddr_t" et al */
+ #include <linux/socket.h> /* for "struct sockaddr" et al */
+-#include <linux/if.h> /* for IFNAMSIZ and co... */
++#include <net/if.h> /* for IFNAMSIZ and co... */
+
+ /***************************** VERSION *****************************/
+ /*
+diff -ru a/src/wireless.h b/src/wireless.h
+--- a/src/wireless.h 2024-04-25 13:35:56.625794510 +0000
++++ b/src/wireless.h 2024-04-25 14:13:02.574057982 +0000
+@@ -23,7 +23,7 @@
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <linux/if.h>
++#include <net/if.h>
+ #include <net/if_arp.h>
+
+ #include "wireless.16.h"
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r12.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r12.ebuild
new file mode 100644
index 000000000000..6a8cb71d2f87
--- /dev/null
+++ b/sys-apps/ifplugd/ifplugd-0.28-r12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
+HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
+SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc selinux"
+
+DEPEND="virtual/pkgconfig
+ doc? ( www-client/lynx )
+ >=dev-libs/libdaemon-0.5"
+RDEPEND=">=dev-libs/libdaemon-0.5
+ >=sys-apps/baselayout-1.12
+ selinux? ( sec-policy/selinux-ifplugd )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-nlapi.diff"
+ "${FILESDIR}/${P}-interface.patch"
+ "${FILESDIR}/${P}-strictalias.patch"
+ "${FILESDIR}/${P}-noip.patch"
+ "${FILESDIR}/${P}-musl.patch"
+ "${FILESDIR}/${P}-gcc10-compatibility.patch"
+ "${FILESDIR}/${P}-fix-if.h-include.patch"
+)
+
+DOCS=( doc/README doc/SUPPORTED_DRIVERS )
+HTML_DOCS=( doc/README.html doc/style.css )
+
+src_configure() {
+ eautoreconf
+ econf \
+ $(use_enable doc lynx) \
+ --with-initdir=/etc/init.d \
+ --disable-xmltoman \
+ --disable-subversion
+}
+
+src_install() {
+ default
+
+ # Remove init.d configuration as we no longer use it
+ rm -rf "${ED}/etc/ifplugd" "${ED}/etc/init.d/${PN}" || die
+
+ exeinto "/etc/${PN}"
+ newexe "${FILESDIR}/${PN}.action" "${PN}.action"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-22 13:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-22 13:55 [gentoo-commits] repo/gentoo:master commit in: sys-apps/ifplugd/, sys-apps/ifplugd/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-05-03 20:20 Thomas Deutschmann
2016-10-21 9:15 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox