summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-11-14 17:08:18 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-11-14 17:08:18 +0000
commitd6576066e0792230699a416de5c501c853691d67 (patch)
tree7fe3af4192fff417c2eb981aa405e5254068d7a3 /net-misc/rarpd/files
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-d6576066e0792230699a416de5c501c853691d67.tar.gz
gentoo-2-d6576066e0792230699a416de5c501c853691d67.tar.bz2
gentoo-2-d6576066e0792230699a416de5c501c853691d67.zip
Drop package masked for removal.
Diffstat (limited to 'net-misc/rarpd/files')
-rw-r--r--net-misc/rarpd/files/1.1-daemon.patch29
-rw-r--r--net-misc/rarpd/files/1.1-libnet-1.0.patch60
-rw-r--r--net-misc/rarpd/files/rarpd-1.1-daemon.patch29
-rw-r--r--net-misc/rarpd/files/rarpd-1.1-fix-packet-growth-bug246891.diff15
-rw-r--r--net-misc/rarpd/files/rarpd-1.1-libnet.diff155
-rw-r--r--net-misc/rarpd/files/rarpd-1.1-printf.diff13
-rw-r--r--net-misc/rarpd/files/rarpd.conf.d8
-rw-r--r--net-misc/rarpd/files/rarpd.init.d32
8 files changed, 0 insertions, 341 deletions
diff --git a/net-misc/rarpd/files/1.1-daemon.patch b/net-misc/rarpd/files/1.1-daemon.patch
deleted file mode 100644
index 7a2d68b856f8..000000000000
--- a/net-misc/rarpd/files/1.1-daemon.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- rarpd.c.orig 2003-11-03 22:10:41.000304928 -0500
-+++ rarpd.c 2003-11-03 22:13:52.683164704 -0500
-@@ -429,12 +429,25 @@
- openlog(program_name, syslogflags, LOG_LOCAL1);
-
- if (!nofork) {
-+ FILE *pidfile;
- pid = fork();
-- if (pid > 0) exit(0);
- if (pid < 0) {
- syslog(LOG_ERR, "%s: fork failed: %s", program_name, strerror(errno));
- exit(1);
- }
-+ if (pid) {
-+ pidfile = fopen("/var/run/rarpd.pid", "w");
-+ if (pidfile) {
-+ fprintf(pidfile, "%i", pid);
-+ fclose(pidfile);
-+ } else
-+ perror("Could not write pidfile");
-+ exit(0);
-+ }
-+ chdir("/");
-+ close(0);
-+ close(1);
-+ close(2);
- }
-
- if (ethers == NULL) ethers = _PATH_ETHERS;
diff --git a/net-misc/rarpd/files/1.1-libnet-1.0.patch b/net-misc/rarpd/files/1.1-libnet-1.0.patch
deleted file mode 100644
index 45bacd669423..000000000000
--- a/net-misc/rarpd/files/1.1-libnet-1.0.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -U 0 -r rarpd-1.1.orig/aclocal.m4 rarpd-1.1/aclocal.m4
---- rarpd-1.1.orig/aclocal.m4 2003-08-19 15:55:45.204522448 -0400
-+++ rarpd-1.1/aclocal.m4 2003-08-19 15:58:54.344768760 -0400
-@@ -278 +278 @@
--if test -f "$1/libnet-config" ; then
-+if test -f "$1/libnet-1.0-config" ; then
-@@ -299 +299 @@
--if test -f "$1/libnet.h" ; then
-+if test -f "$1/libnet-1.0.h" ; then
-@@ -321 +321 @@
--LIBS="$saved_LIBS -L$1 -lnet"
-+LIBS="$saved_LIBS -L$1 -lnet-1.0"
-@@ -375 +375 @@
-- if test -f "$with_libnet/libnet-config"; then
-+ if test -f "$with_libnet/libnet-1.0-config"; then
-@@ -413 +413 @@
-- LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-config
-+ LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-1.0-config
-diff -U 0 -r rarpd-1.1.orig/cmulocal/libnet.m4 rarpd-1.1/cmulocal/libnet.m4
---- rarpd-1.1.orig/cmulocal/libnet.m4 2003-08-19 15:55:45.205522296 -0400
-+++ rarpd-1.1/cmulocal/libnet.m4 2003-08-19 15:58:54.346768456 -0400
-@@ -7 +7 @@
--if test -f "$1/libnet-config" ; then
-+if test -f "$1/libnet-1.0-config" ; then
-@@ -28 +28 @@
--if test -f "$1/libnet.h" ; then
-+if test -f "$1/libnet-1.0.h" ; then
-@@ -50 +50 @@
--LIBS="$saved_LIBS -L$1 -lnet"
-+LIBS="$saved_LIBS -L$1 -lnet-1.0"
-@@ -104 +104 @@
-- if test -f "$with_libnet/libnet-config"; then
-+ if test -f "$with_libnet/libnet-1.0-config"; then
-@@ -142 +142 @@
-- LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-config
-+ LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-1.0-config
-diff -U 0 -r rarpd-1.1.orig/configure rarpd-1.1/configure
---- rarpd-1.1.orig/configure 2003-08-19 15:55:45.205522296 -0400
-+++ rarpd-1.1/configure 2003-08-19 15:58:54.370764808 -0400
-@@ -1670 +1670 @@
-- if test -f "$with_libnet/libnet-config"; then
-+ if test -f "$with_libnet/libnet-1.0-config"; then
-@@ -1690 +1690 @@
--if test -f "$i/libnet-config" ; then
-+if test -f "$i/libnet-1.0-config" ; then
-@@ -1716 +1716 @@
--LIBS="$saved_LIBS -L$i -lnet"
-+LIBS="$saved_LIBS -L$i -lnet-1.0"
-@@ -1789 +1789 @@
--if test -f "$i/libnet.h" ; then
-+if test -f "$i/libnet-1.0.h" ; then
-@@ -1812 +1812 @@
-- LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-config
-+ LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-1.0-config
-diff -U 0 -r rarpd-1.1.orig/rarpd.c rarpd-1.1/rarpd.c
---- rarpd-1.1.orig/rarpd.c 2003-08-19 15:55:45.205522296 -0400
-+++ rarpd-1.1/rarpd.c 2003-08-19 15:58:54.374764200 -0400
-@@ -34 +34 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-misc/rarpd/files/rarpd-1.1-daemon.patch b/net-misc/rarpd/files/rarpd-1.1-daemon.patch
deleted file mode 100644
index 7a2d68b856f8..000000000000
--- a/net-misc/rarpd/files/rarpd-1.1-daemon.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- rarpd.c.orig 2003-11-03 22:10:41.000304928 -0500
-+++ rarpd.c 2003-11-03 22:13:52.683164704 -0500
-@@ -429,12 +429,25 @@
- openlog(program_name, syslogflags, LOG_LOCAL1);
-
- if (!nofork) {
-+ FILE *pidfile;
- pid = fork();
-- if (pid > 0) exit(0);
- if (pid < 0) {
- syslog(LOG_ERR, "%s: fork failed: %s", program_name, strerror(errno));
- exit(1);
- }
-+ if (pid) {
-+ pidfile = fopen("/var/run/rarpd.pid", "w");
-+ if (pidfile) {
-+ fprintf(pidfile, "%i", pid);
-+ fclose(pidfile);
-+ } else
-+ perror("Could not write pidfile");
-+ exit(0);
-+ }
-+ chdir("/");
-+ close(0);
-+ close(1);
-+ close(2);
- }
-
- if (ethers == NULL) ethers = _PATH_ETHERS;
diff --git a/net-misc/rarpd/files/rarpd-1.1-fix-packet-growth-bug246891.diff b/net-misc/rarpd/files/rarpd-1.1-fix-packet-growth-bug246891.diff
deleted file mode 100644
index a020a0974d2c..000000000000
--- a/net-misc/rarpd/files/rarpd-1.1-fix-packet-growth-bug246891.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/176558
-
-ripped from suse's rarpd-1.1-631.src.rpm:
-* Wed Apr 18 2007 - nadvornik@suse.cz
-- fixed unlimited packet growth [#246891]
-
---- rarpd.c.orig 2007-02-21 11:41:25.099136000 +0100
-+++ rarpd.c 2007-02-21 12:39:49.837404920 +0100
-@@ -307,6 +307,8 @@ void send_rarpreply(unsigned char *dest_
- syslog(LOG_ERR, "%s: Write error: %s", program_name, libnet_geterror(ld));
- exit(1);
- }
-+
-+ libnet_clear_packet(ld);
- }
diff --git a/net-misc/rarpd/files/rarpd-1.1-libnet.diff b/net-misc/rarpd/files/rarpd-1.1-libnet.diff
deleted file mode 100644
index c395309b130f..000000000000
--- a/net-misc/rarpd/files/rarpd-1.1-libnet.diff
+++ /dev/null
@@ -1,155 +0,0 @@
-ripped from suse
-
---- rarpd.c
-+++ rarpd.c
-@@ -65,18 +65,12 @@
- #define ETHERSTRLEN sizeof("00:00:00:00:00:00")
- #define IPSTRLEN sizeof(".xxx.xxx.xxx.xxx")
-
--#ifdef NEW_LIBNET_INTERFACE
--#define open_link_interface libnet_open_link_interface
--#define link_int libnet_link_int
--#define build_arp libnet_build_arp
--#define get_ipaddr libnet_get_ipaddr
--#define get_hwaddr libnet_get_hwaddr
--#define build_ethernet libnet_build_ethernet
--#define write_link_layer libnet_write_link_layer
--
--/* Temporary workaround */
--#define ARP_H LIBNET_ARP_H
--#endif
-+struct _ipv4_arp_data_ {
-+ u_char ar_sha[6]; /* sender hardware address */
-+ u_char ar_spa[4]; /* sender protocol address */
-+ u_char ar_tha[6]; /* target hardware address */
-+ u_char ar_tpa[4]; /* target protocol address */
-+};
-
- extern char pcap_version[];
- extern int optind;
-@@ -88,7 +82,7 @@
- static char *program_name;
-
- static pcap_t *pd;
--static struct link_int *ln;
-+static libnet_t *ld;
- static char *device, *ethers;
- struct in_addr my_ipaddr;
- static u_char my_hwaddr[ETHERADDRLEN];
-@@ -285,23 +279,34 @@
- void send_rarpreply(unsigned char *dest_hwaddr,
- unsigned char *her_hwaddr, struct in_addr *her_ipaddr)
- {
-- char ebuf[PCAP_ERRBUF_SIZE];
-- u_char buf[ARP_H+ETH_H];
--
-- memset(buf, 0, ARP_H + ETH_H);
--
-- /* Ethernet header */
-- build_ethernet(dest_hwaddr, my_hwaddr, ETHERTYPE_REVARP, NULL, 0, buf);
-+ int c;
-+ libnet_ptag_t t;
-
- /* ARP header */
-- build_arp(ARPHRD_ETHER, ETHERTYPE_IP,
-+ t = libnet_build_arp(ARPHRD_ETHER, ETHERTYPE_IP,
- ETHERADDRLEN, IPADDRLEN,
- ARPOP_REVREPLY,
- my_hwaddr, (u_char *)&(my_ipaddr.s_addr),
- her_hwaddr, (u_char *)&(her_ipaddr->s_addr),
-- NULL, 0, buf + ETH_H);
-+ NULL, 0, ld, 0);
-+ if (t == -1) {
-+ syslog(LOG_ERR, "%s: Can't build ARP header: %s", program_name, libnet_geterror(ld));
-+ exit(1);
-+ }
-
-- write_link_layer(ln, (const u_char *)device, buf, ARP_H + ETH_H);
-+ /* Ethernet header */
-+ t = libnet_build_ethernet(dest_hwaddr, my_hwaddr, ETHERTYPE_REVARP, NULL, 0, ld, 0);
-+ if (t == -1) {
-+ syslog(LOG_ERR, "%s: Can't build ethernet header: %s", program_name,
-+ libnet_geterror(ld));
-+ exit(1);
-+ }
-+
-+ c = libnet_write(ld);
-+ if (c == -1) {
-+ syslog(LOG_ERR, "%s: Write error: %s", program_name, libnet_geterror(ld));
-+ exit(1);
-+ }
- }
-
-
-@@ -314,11 +319,13 @@
- unsigned short pro, hrd, op;
- struct in_addr her_ipaddr;
- struct libnet_arp_hdr *ap;
-+ struct _ipv4_arp_data_ *ad;
- struct hostent *hp;
- char *ipp;
-
- bp += sizeof(struct libnet_ethernet_hdr);
- ap = (struct libnet_arp_hdr *)bp;
-+ ad = (struct _ipv4_arp_data_ *)(bp + sizeof(*ap));
-
- pro = EXTRACT_16BITS (&ap->ar_pro);
- hrd = EXTRACT_16BITS (&ap->ar_hrd);
-@@ -331,10 +338,10 @@
- /* We only answer RARP requests */
- if (op != ARPOP_REVREQUEST) return;
-
-- sha = ap->ar_sha;
-- spa = ap->ar_spa;
-- tha = ap->ar_tha;
-- tpa = ap->ar_tpa;
-+ sha = ad->ar_sha;
-+ spa = ad->ar_spa;
-+ tha = ad->ar_tha;
-+ tpa = ad->ar_tpa;
-
- if (my_ether_ntohost(toret, tha)) {
- if (vflag) {
-@@ -399,6 +406,7 @@
- int nofork, op, pid, syslogflags;
- bpf_u_int32 localnet, netmask;
- char ebuf[PCAP_ERRBUF_SIZE];
-+ char errbuf[LIBNET_ERRBUF_SIZE];
- char *cmdbuf;
- struct bpf_program fcode;
-
-@@ -446,9 +454,9 @@
- }
- }
-
-- ln = open_link_interface(device, ebuf);
-- if (ln == NULL) {
-- syslog(LOG_ERR, "%s: %s", program_name, ebuf);
-+ ld = libnet_init(LIBNET_LINK, device, errbuf);
-+ if (ld == NULL) {
-+ syslog(LOG_ERR, "%s: %s", program_name, errbuf);
- exit(1);
- }
-
-@@ -465,8 +473,8 @@
- }
-
- memset(&my_ipaddr, 0, sizeof(my_ipaddr));
-- my_ipaddr.s_addr = htonl(get_ipaddr(ln, device, ebuf));
-- memcpy(my_hwaddr, (char *)get_hwaddr(ln, device, ebuf), ETHERADDRLEN);
-+ my_ipaddr.s_addr = libnet_get_ipaddr4(ld);
-+ memcpy(my_hwaddr, (char *) libnet_get_hwaddr(ld), ETHERADDRLEN);
-
- setuid(getuid());
-
---- configure
-+++ configure
-@@ -1734,7 +1734,7 @@
- #include "confdefs.h"
-
- int main() {
--libnet_open_link_interface("","");
-+libnet_open_link("","");
- ; return 0; }
- EOF
- if { (eval echo configure:1741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/net-misc/rarpd/files/rarpd-1.1-printf.diff b/net-misc/rarpd/files/rarpd-1.1-printf.diff
deleted file mode 100644
index 76e49469e0e5..000000000000
--- a/net-misc/rarpd/files/rarpd-1.1-printf.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-ripped from suse
-
---- rarpd.c
-+++ rarpd.c
-@@ -238,7 +238,7 @@
- }
-
- fclose(f);
-- if (dflag) fprintf(stderr, "Not found\n", hostname);
-+ if (dflag) fprintf(stderr, "Not found: %s\n", hostname);
- errno = ENOENT;
- return -1;
- }
diff --git a/net-misc/rarpd/files/rarpd.conf.d b/net-misc/rarpd/files/rarpd.conf.d
deleted file mode 100644
index 6acbe2972c51..000000000000
--- a/net-misc/rarpd/files/rarpd.conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rarpd/files/rarpd.conf.d,v 1.2 2004/07/15 00:10:49 agriffis Exp $
-
-# Config file for /etc/init.d/rarpd
-
-# see the rarpd(8) manpage for more info
-RARPD_OPTS=""
diff --git a/net-misc/rarpd/files/rarpd.init.d b/net-misc/rarpd/files/rarpd.init.d
deleted file mode 100644
index 4c0fb44715b3..000000000000
--- a/net-misc/rarpd/files/rarpd.init.d
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rarpd/files/rarpd.init.d,v 1.3 2004/07/15 00:10:49 agriffis Exp $
-
-depend() {
- need net
-}
-
-checkconfig() {
- if [ ! -f /etc/ethers ] ; then
- eerror "Please create /etc/ethers with the following content:"
- eerror "[MAC address] [name or IP]"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting rarpd"
- /usr/sbin/rarpd ${RARPD_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping rarpd"
- kill $(</var/run/rarpd.pid)
- eend $?
- rm -f /var/run/rarpd.pid
-}