Development February 2023

development@lists.ipfire.org

9 participants
118 discussions

[PATCH] net-tools: Drop package
by Stefan Schantl 20 Feb '23

20 Feb '23

The net-tools package is deprecated and was used by us to ship the "netstat" binary. The successor of "netstat" is the "ss" command from the iproute2. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- net-tools/config.h | 75 -- net-tools/config.make | 37 - net-tools/mii-diag.8 | 160 ----- net-tools/mii-diag.c | 653 ------------------ net-tools/net-tools.nm | 84 --- net-tools/patches/001-net-tools-cycle.patch | 375 ---------- net-tools/patches/002-net-tools-ipx.patch | 31 - net-tools/patches/003-net-tools-man.patch | 149 ---- .../patches/004-net-tools-interface.patch | 102 --- .../patches/005-net-tools-duplicate-tcp.patch | 146 ---- .../patches/006-net-tools-statalias.patch | 16 - .../007-net-tools-interface_stack.patch | 119 ---- .../008-net-tools-sctp-statistics.patch | 534 -------------- ...et-tools-ifconfig-long-iface-crasher.patch | 36 - 14 files changed, 2517 deletions(-) delete mode 100644 net-tools/config.h delete mode 100644 net-tools/config.make delete mode 100644 net-tools/mii-diag.8 delete mode 100644 net-tools/mii-diag.c delete mode 100644 net-tools/net-tools.nm delete mode 100644 net-tools/patches/001-net-tools-cycle.patch delete mode 100644 net-tools/patches/002-net-tools-ipx.patch delete mode 100644 net-tools/patches/003-net-tools-man.patch delete mode 100644 net-tools/patches/004-net-tools-interface.patch delete mode 100644 net-tools/patches/005-net-tools-duplicate-tcp.patch delete mode 100644 net-tools/patches/006-net-tools-statalias.patch delete mode 100644 net-tools/patches/007-net-tools-interface_stack.patch delete mode 100644 net-tools/patches/008-net-tools-sctp-statistics.patch delete mode 100644 net-tools/patches/009-net-tools-ifconfig-long-iface-crasher.patch diff --git a/net-tools/config.h b/net-tools/config.h deleted file mode 100644 index f63aecbfc..000000000 --- a/net-tools/config.h +++ /dev/null @@ -1,75 +0,0 @@ -/* -* config.h Automatically generated configuration includefile -* -* NET-TOOLS A collection of programs that form the base set of the -* NET-3 Networking Distribution for the LINUX operating -* system. -* -* DO NOT EDIT DIRECTLY -* -*/ - -/* - * - * Internationalization - * - * The net-tools package has currently been translated to French, - * German and Brazilian Portugese. Other translations are, of - * course, welcome. Answer `n' here if you have no support for - * internationalization on your system. - * - */ -#define I18N 1 - -/* - * - * Protocol Families. - * - */ -#define HAVE_AFUNIX 1 -#define HAVE_AFINET 1 -#define HAVE_AFINET6 1 -#define HAVE_AFIPX 1 -#define HAVE_AFATALK 1 -#define HAVE_AFAX25 1 -#define HAVE_AFNETROM 1 -#define HAVE_AFROSE 1 -#define HAVE_AFX25 0 -#define HAVE_AFECONET 1 -#define HAVE_AFDECnet 0 -#define HAVE_AFASH 1 - -/* - * - * Device Hardware types. - * - */ -#define HAVE_HWETHER 1 -#define HAVE_HWARC 1 -#define HAVE_HWSLIP 0 -#define HAVE_HWPPP 1 -#define HAVE_HWTUNNEL 1 -#define HAVE_HWSTRIP 0 -#define HAVE_HWTR 0 -#define HAVE_HWAX25 1 -#define HAVE_HWROSE 1 -#define HAVE_HWNETROM 1 -#define HAVE_HWX25 0 -#define HAVE_HWFR 1 -#define HAVE_HWSIT 1 -#define HAVE_HWFDDI 1 -#define HAVE_HWHIPPI 1 -#define HAVE_HWASH 1 -#define HAVE_HWHDLCLAPB 1 -#define HAVE_HWIRDA 1 -#define HAVE_HWEC 1 -#define HAVE_HWIB 1 - -/* - * - * Other Features. - * - */ -#define HAVE_FW_MASQUERADE 1 -#define HAVE_IP_TOOLS 1 -#define HAVE_MII 1 diff --git a/net-tools/config.make b/net-tools/config.make deleted file mode 100644 index 18907a595..000000000 --- a/net-tools/config.make +++ /dev/null @@ -1,37 +0,0 @@ -I18N=1 -HAVE_AFUNIX=1 -HAVE_AFINET=1 -HAVE_AFINET6=1 -HAVE_AFIPX=1 -HAVE_AFATALK=1 -HAVE_AFAX25=1 -HAVE_AFNETROM=1 -HAVE_AFROSE=1 -HAVE_AFX25=1 -HAVE_AFECONET=1 -# HAVE_AFDECnet=0 -HAVE_AFASH=1 -HAVE_HWETHER=1 -HAVE_HWARC=1 -HAVE_HWSLIP=1 -HAVE_HWPPP=1 -HAVE_HWTUNNEL=1 -HAVE_HWSTRIP=0 -HAVE_HWTR=0 -HAVE_HWAX25=1 -HAVE_HWROSE=1 -HAVE_HWNETROM=1 -HAVE_HWX25=1 -HAVE_HWFR=1 -HAVE_HWSIT=1 -HAVE_HWFDDI=1 -HAVE_HWHIPPI=1 -HAVE_HWASH=1 -HAVE_HWHDLCLAPB=1 -HAVE_HWIRDA=1 -HAVE_HWEC=1 -HAVE_HWIB=1 -HAVE_FW_MASQUERADE=1 -HAVE_IP_TOOLS=1 -HAVE_MII=1 -HAVE_SELINUX=0 diff --git a/net-tools/mii-diag.8 b/net-tools/mii-diag.8 deleted file mode 100644 index aa0dc0be1..000000000 --- a/net-tools/mii-diag.8 +++ /dev/null @@ -1,160 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" $Revision: 1.1 $ $Date: 2003/09/06 17:20:17 $ -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH MII-DIAG 8 "September 9, 2003" "Scyld Beowulf\*(Tm" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -mii-diag \- Network adapter control and monitoring -.SH SYNOPSIS -.B mii-diag -.RI [ options ] <interface> -.SH DESCRIPTION -This manual page documents briefly the -.B mii-diag -network adapter control and monitoring command. -Addition documentation is available from http://scyld.com/diag/index.html. - -.\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, -.\" respectively. -.PP -This \fBmii-diag\fP command configures, controls and monitors the -transceiver management registers for network interfaces, and configures -driver operational parameters. For transceiver control \fBmii-diag\fP -uses the Media Independent Interface (MII) standard (thus the command name). -It also has additional Linux-specific controls to communicate parameters -such as message enable settings and buffer sizes to the underlying device -driver. -.PP -The MII standard defines registers that control and report network -transceiver capabilities, link settings and errors. Examples are link -speed, duplex, capabilities advertised to the link partner, status LED -indications and link error counters. - -.SH OPTIONS -The \fBmii-diag\fP command supports both single character and long -option names. Short options use a single dash (´-´) in front of the option -character. For options without parameters, multiple options may be -concatenated after a single dash. Long options are prefixed by two -dashes (´--´), and may be abbreviated with a unique prefix. -A long option may take a parameter of the form --arg=param or --arg param. - -.PP -A summary of options is as follows. - -.TP -.B \-A, --advertise <speed|setting> -.BR -.B \-F, --fixed-speed <speed|setting> - -Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD, 10baseT, -10baseT-FD, 10baseT-HD. For more precise control an explict numeric -register setting is also allowed. - - -.TP -.B \-a, \--all-interfaces -Show the status of all interfaces. This option is not recommended with -any other option, especially ones that change settings. - -.TP -.B \-s,\--status -Return exit status 2 if there is no link beat. - -.TP -.B \-D -Increase the debugging level. This may be used to understand the -actions the command is taking. - -.TP -.B \-g, \--read-parameters -Show driver-specific parameters. - -.TP -.B \-G, \--set-parameters value[,value...] -Set driver-specific parameters. -Set a adapter-specific parameters. -Parameters are comma separated, with missing elements retaining the -existing value. - -.TP -.B \-v -Increase the verbosity level. Additional "-v" options increase the -level further. - -.TP -.B \-V -Show the program version information. - -.TP -.B \-w, \--watch -Continuously monitor the transceiver and report changes. - -.TP -.B \-? -Emit usage information. - -.SH DESCRIPTION - -.PP -Calling the command with just the interface name (which defaults to -'eth0' if missing) produces extensive output describing the transceiver -capabilities, configuration and current status. - -.PP -The '--monitor' option allows scripting link beat changes. -.PP -This option is similar to --watch, but with lower overhead and simplifed -output. It polls the interface only once a second and the output format -is a single line per link change with three fixed words - <unknown|down||negotiating|up> <STATUS> <PARTNER-CAP> -.PP -Example output: mii-diag --monitor eth0 - down 0x7809 0x0000 - negotiating 0x7829 0x45e1 - up 0x782d 0x45e1 - down 0x7809 0x0000 - -.PP -This may be used as - mii-diag --monitor eth0 | - while read linkstatus bmsr linkpar; do - case $linkstatus in - up) ifup eth0 ;; - down) ifdown eth0 ;; - esac - done - -.PP -It may be useful to shorten the DHCP client daemon timeout if it does -not receive an address by adding the following setting to -/etc/sysconfig/network: -DHCPCDARGS="-t 3" - -.SH SEE ALSO -.BR ether-wake (8), net-diag (8), mii-tool (8). -.br -Addition documentation is available from http://scyld.com/diag/index.html. - -.SH KNOWN BUGS -The --all-interfaces option is quirky. There are very few settings that -are usefully applied to all interfaces. - -.SH AUTHOR -The manual pages, diagnostic commands, and many of the underlying Linux -network drivers were written by Donald Becker for the Scyld -Beowulf(\*(Tm) cluster system. - diff --git a/net-tools/mii-diag.c b/net-tools/mii-diag.c deleted file mode 100644 index 69ebd0bff..000000000 --- a/net-tools/mii-diag.c +++ /dev/null @@ -1,653 +0,0 @@ -/* Mode: C; - * mii-diag.c: Examine and set the MII registers of a network interfaces. - - Usage: mii-diag [-vw] interface. - - This program reads and writes the Media Independent Interface (MII) - management registers on network transceivers. The registers control - and report network link settings and errors. Examples are link speed, - duplex, capabilities advertised to the link partner, status LED - indications and link error counters. - - Notes: - The compile-command is at the end of this source file. - This program works with drivers that implement MII ioctl() calls. - - Written/copyright 1997-2003 by Donald Becker <becker(a)scyld.com> - - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation. - - The author may be reached as becker(a)scyld.com, or C/O - Scyld Computing Corporation - 914 Bay Ridge Road, Suite 220 - Annapolis MD 21403 - - References - http://scyld.com/expert/mii-status.html - http://scyld.com/expert/NWay.html - http://www.national.com/pf/DP/DP83840.html -*/ - -static char version[] = -"mii-diag.c:v2.11 3/21/2005 Donald Becker (becker(a)scyld.com)\n" -" http://www.scyld.com/diag/index.html\n"; - -static const char usage_msg[] = -"Usage: %s [--help] [-aDfrRvVw] [-AF <speed+duplex>] [--watch] <interface>\n"; -static const char long_usage_msg[] = -"Usage: %s [-aDfrRvVw] [-AF <speed+duplex>] [--watch] <interface>\n\ -\n\ - This program configures and monitors the transceiver management registers\n\ - for network interfaces. It uses the Media Independent Interface (MII)\n\ - standard with additional Linux-specific controls to communicate with the\n\ - underlying device driver. The MII registers control and report network\n\ - link settings and errors. Examples are link speed, duplex, capabilities\n\ - advertised to the link partner, status LED indications and link error\n\ - counters.\n\ -\n\ - The common usage is\n\ - mii-diag eth0\n\ -\n\ - Frequently used options are\n\ - -A --advertise <speed|setting>\n\ - -F --fixed-speed <speed>\n\ - Speed is one of: 100baseT4, 100baseTx, 100baseTx-FD, 100baseTx-HD,\n\ - 10baseT, 10baseT-FD, 10baseT-HD\n\ - -s --status Return exit status 2 if there is no link beat.\n\ -\n\ - Less frequently used options are\n\ - -a --all-interfaces Show the status all interfaces\n\ - (Not recommended with options that change settings.)\n\ - -D --debug\n\ - -g --read-parameters Get driver-specific parameters.\n\ - -G --set-parameters PARMS Set driver-specific parameters.\n\ - Parameters are comma separated, missing parameters retain\n\ - their previous values.\n\ - -M --msg-level LEVEL Set the driver message bit map.\n\ - -p --phy ADDR Set the PHY (MII address) to report.\n\ - -r --restart Restart the link autonegotiation.\n\ - -R --reset Reset the transceiver.\n\ - -v --verbose Report each action taken.\n\ - -V --version Emit version information.\n\ - -w --watch Continuously monitor the transceiver and report changes.\n\ -\n\ - This command returns success (zero) if the interface information can be\n\ - read. If the --status option is passed, a zero return means that the\n\ - interface has link beat.\n\ -"; - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <ctype.h> -#include <string.h> -#include <errno.h> -#include <fcntl.h> -#include <getopt.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <net/if.h> -#ifdef use_linux_libc5 -#include <linux/if_arp.h> -#include <linux/if_ether.h> -#endif - -typedef u_int32_t u32; -typedef u_int16_t u16; -typedef u_int8_t u8; - -#if defined(SIOCGPARAMS) && SIOCGPARAMS != SIOCDEVPRIVATE+3 -#error Changed definition for SIOCGPARAMS -#else -#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters. */ -#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters. */ -#endif - -const char shortopts[] = "aA:C:DfF:gG:hmM:p:rRsvVw?"; -struct option longopts[] = { - /* { name has_arg *flag val } */ - {"all-interfaces", 0, 0, 'a'}, /* Show all interfaces. */ - {"advertise", 1, 0, 'A'}, /* Change the capabilities advertised. */ - {"BMCR", 1, 0, 'C'}, /* Set the control register. */ - {"debug", 0, 0, 'D'}, /* Increase the debug level. */ - {"force", 0, 0, 'f'}, /* Force the operation. */ - {"fixed-speed", 1, 0, 'F'}, /* Fixed speed name. */ - {"read-parameters", 0, 0, 'g'}, /* Show general settings values. */ - {"set-parameters", 1, 0, 'G'}, /* Write general settings values. */ - {"help", 0, 0, 'h'}, /* Print a long usage message. */ - {"monitor", 0, 0, 'm'}, /* Monitor status register. */ - {"msg-level", 1, 0, 'M'}, /* Set the driver message level. */ - {"phy", 1, 0, 'p'}, /* Set the PHY (MII address) to report. */ - {"restart", 0, 0, 'r'}, /* Restart the link negotiation */ - {"reset", 0, 0, 'R'}, /* Reset the transceiver. */ - {"status", 0, 0, 's'}, /* Non-zero exit status w/ no link beat. */ - {"verbose", 0, 0, 'v'}, /* Report each action taken. */ - {"version", 0, 0, 'V'}, /* Emit version information. */ - {"watch", 0, 0, 'w'}, /* Constantly monitor the port. */ - {"error", 0, 0, '?'}, /* Return the error message. */ - { 0, 0, 0, 0 } -}; - -/* Usually in libmii.c, but trivial substitions are below. */ -extern int show_mii_details(long ioaddr, int phy_id); -extern void monitor_mii(long ioaddr, int phy_id); -int show_mii_details(long ioaddr, int phy_id) __attribute__((weak)); -void monitor_mii(long ioaddr, int phy_id) __attribute__((weak)); - - -/* Command-line flags. */ -unsigned int opt_a = 0, /* Show-all-interfaces flag. */ - opt_f = 0, /* Force the operation. */ - opt_g = 0, - opt_G = 0, - verbose = 0, /* Verbose flag. */ - debug = 0, - opt_version = 0, - opt_restart = 0, - opt_reset = 0, - opt_status = 0, - opt_watch = 0; -static int msg_level = -1; -static int set_BMCR = -1; -static int nway_advertise = 0; -static int fixed_speed = -1; -static int override_phy = -1; -char *opt_G_string = NULL; - -/* Internal values. */ -int new_ioctl_nums; -int skfd = -1; /* AF_INET socket for ioctl() calls. */ -struct ifreq ifr; - -int do_one_xcvr(int skfd); -int show_basic_mii(long ioaddr, int phy_id); -int mdio_read(int skfd, int phy_id, int location); -void mdio_write(int skfd, int phy_id, int location, int value); -static int parse_advertise(const char *capabilities); -static void monitor_status(long ioaddr, int phy_id); - - -int -main(int argc, char **argv) -{ - int c, errflag = 0; - char **spp, *ifname; - char *progname = rindex(argv[0], '/') ? rindex(argv[0], '/')+1 : argv[0]; - - while ((c = getopt_long(argc, argv, shortopts, longopts, 0)) != EOF) - switch (c) { - case 'a': opt_a++; break; - case 'A': nway_advertise |= parse_advertise(optarg); - if (nway_advertise == -1) errflag++; - break; - case 'C': set_BMCR = strtoul(optarg, NULL, 16); break; - case 'D': debug++; break; - case 'f': opt_f++; break; - case 'F': fixed_speed = parse_advertise(optarg); - if (fixed_speed == -1) errflag++; - break; - case 'g': opt_g++; break; - case 'G': opt_G++; opt_G_string = strdup(optarg); break; - case 'm': opt_watch++; opt_status++; break; - case 'M': msg_level = strtoul(optarg, NULL, 0); break; - case 'h': fprintf(stderr, long_usage_msg, progname); return 0; - case 'p': override_phy = atoi(optarg); break; - case 'r': opt_restart++; break; - case 'R': opt_reset++; break; - case 's': opt_status++; break; - case 'v': verbose++; break; - case 'V': opt_version++; break; - case 'w': opt_watch++; break; - case '?': errflag++; break; - } - if (errflag) { - fprintf(stderr, usage_msg, progname); - return 2; - } - - if (verbose || opt_version) - printf("%s", version); - - /* Open a basic socket. */ - if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) { - perror("socket"); - return 1; - } - - if (debug) - fprintf(stderr, "DEBUG: argc=%d, optind=%d and argv[optind] is %s.\n", - argc, optind, argv[optind]); - - /* No remaining args means interface wasn't specified. */ - if (optind == argc) { - fprintf(stderr, "No interface specified.\n"); - fprintf(stderr, usage_msg, progname); - (void) close(skfd); - return 2; - } else { - /* Copy the interface name. */ - spp = argv + optind; - ifname = *spp++; - } - - if (ifname == NULL) { - fprintf(stderr, "No ifname.\n"); - (void) close(skfd); - return -1; - } - - /* Verify that the interface supports the ioctl(), and if - it is using the new or old SIOCGMIIPHY value (grrr...). - */ - { - u16 *data = (u16 *)(&ifr.ifr_data); - - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - ifr.ifr_name[IFNAMSIZ-1] = '\0'; - data[0] = 0; - - if (ioctl(skfd, 0x8947, &ifr) >= 0) { - new_ioctl_nums = 1; - } else if (ioctl(skfd, SIOCDEVPRIVATE, &ifr) >= 0) { - new_ioctl_nums = 0; - } else { - fprintf(stderr, "SIOCGMIIPHY on %s failed: %s\n", ifname, - strerror(errno)); - (void) close(skfd); - return 1; - } - if (verbose) - printf(" Using the %s SIOCGMIIPHY value on PHY %d " - "(BMCR 0x%4.4x).\n", - new_ioctl_nums ? "new" : "old", data[0], data[3]); - } - - do_one_xcvr(skfd); - - (void) close(skfd); - return 0; -} - -int do_one_xcvr(int skfd) -{ - u16 *data = (u16 *)(&ifr.ifr_data); - u32 *data32 = (u32 *)(&ifr.ifr_data); - unsigned phy_id = data[0]; - - if (override_phy >= 0) { - printf("Using the specified MII PHY index %d.\n", override_phy); - phy_id = override_phy; - } - - if (opt_g || opt_G || msg_level >= 0) { - if (ioctl(skfd, SIOCGPARAMS, &ifr) < 0) { - fprintf(stderr, "SIOCGPARAMS on %s failed: %s\n", ifr.ifr_name, - strerror(errno)); - return -1; - } - } - if (opt_g) { - int i; - printf("Driver general parameter settings:"); - for (i = 0; i*sizeof(u32) < sizeof(ifr.ifr_ifru); i++) { - printf(" %d", data32[i]); - } - printf(".\n"); - } - if (opt_G) { - /* Set up to four arbitrary driver parameters from the -G parameter. - The format is comma separated integers, with a missing element - retaining the previous value. - */ - char *str = opt_G_string; - int i; - for (i = 0; str && i < 4; i++) { - char *endstr; - u32 newval = strtol(str, &endstr, 0); - if (debug) - printf(" parse string '%s' value %d end '%s'.\n", - str, newval, endstr); - if (str == endstr) { - if (endstr[0] == ',') /* No parameter */ - str = endstr+1; - else { - fprintf(stderr, "Invalid driver parameter '%s'.\n", str); - str = index(str, ','); - } - } else if (endstr[0] == ',') { - data32[i] = newval; - str = endstr + 1; - } else if (endstr[0] == 0) { - data32[i] = newval; - break; - } - } - printf("Setting new driver general parameters:"); - for (i = 0; i*sizeof(u32) < sizeof(ifr.ifr_ifru); i++) { - printf(" %d", data32[i]); - } - printf(".\n"); - if (ioctl(skfd, SIOCSPARAMS, &ifr) < 0) { - fprintf(stderr, "SIOCSPARAMS on %s failed: %s\n", ifr.ifr_name, - strerror(errno)); - return -1; - } - } - if (msg_level >= 0) { - data32[0] = msg_level; - if (ioctl(skfd, SIOCSPARAMS, &ifr) < 0) { - fprintf(stderr, "SIOCSPARAMS on %s failed: %s\n", ifr.ifr_name, - strerror(errno)); - return -1; - } - } - - if (opt_reset) { - printf("Resetting the transceiver...\n"); - mdio_write(skfd, phy_id, 0, 0x8000); - } - /* Note: PHY addresses > 32 are pseudo-MII devices, usually built-in. */ - if (phy_id < 64 && nway_advertise > 0) { - printf(" Setting the media capability advertisement register of " - "PHY #%d to 0x%4.4x.\n", phy_id, nway_advertise | 1); - mdio_write(skfd, phy_id, 4, nway_advertise | 1); - mdio_write(skfd, phy_id, 0, 0x1000); - } - - if (opt_restart) { - printf("Restarting negotiation...\n"); - mdio_write(skfd, phy_id, 0, 0x0000); - mdio_write(skfd, phy_id, 0, 0x1200); - } - /* To force 100baseTx-HD do mdio_write(skfd, phy_id, 0, 0x2000); */ - if (fixed_speed >= 0) { - int reg0_val = 0; - if (fixed_speed & 0x0180) /* 100mpbs */ - reg0_val |= 0x2000; - if ((fixed_speed & 0x0140) && /* A full duplex type and */ - ! (fixed_speed & 0x0820)) /* no half duplex types. */ - reg0_val |= 0x0100; - printf("Setting the speed to \"fixed\", Control register %4.4x.\n", - reg0_val); - mdio_write(skfd, phy_id, 0, reg0_val); - } - if (set_BMCR >= 0) { - printf("Setting the Basic Mode Control Register to 0x%4.4x.\n", - set_BMCR); - mdio_write(skfd, phy_id, 0, set_BMCR); - } - - if (opt_watch && opt_status) - monitor_status(skfd, phy_id); - - show_basic_mii(skfd, phy_id); -#ifdef LIBMII - if (verbose) - show_mii_details(skfd, phy_id); -#else - if (verbose || debug) { - int mii_reg, mii_val; - printf(" MII PHY #%d transceiver registers:", phy_id); - for (mii_reg = 0; mii_reg < 32; mii_reg++) { - mii_val = mdio_read(skfd, phy_id, mii_reg); - printf("%s %4.4x", (mii_reg % 8) == 0 ? "\n " : "", - mii_val); - } - printf("\n"); - } -#endif - - if (opt_watch) - monitor_mii(skfd, phy_id); - if (opt_status && - (mdio_read(skfd, phy_id, 1) & 0x0004) == 0) - exit(2); - return 0; -} - -int mdio_read(int skfd, int phy_id, int location) -{ - u16 *data = (u16 *)(&ifr.ifr_data); - - data[0] = phy_id; - data[1] = location; - - if (ioctl(skfd, new_ioctl_nums ? 0x8948 : SIOCDEVPRIVATE+1, &ifr) < 0) { - fprintf(stderr, "SIOCGMIIREG on %s failed: %s\n", ifr.ifr_name, - strerror(errno)); - return -1; - } - return data[3]; -} - -void mdio_write(int skfd, int phy_id, int location, int value) -{ - u16 *data = (u16 *)(&ifr.ifr_data); - - data[0] = phy_id; - data[1] = location; - data[2] = value; - - if (ioctl(skfd, new_ioctl_nums ? 0x8949 : SIOCDEVPRIVATE+2, &ifr) < 0) { - fprintf(stderr, "SIOCSMIIREG on %s failed: %s\n", ifr.ifr_name, - strerror(errno)); - } -} - -/* Parse the command line argument for advertised capabilities. */ -static int parse_advertise(const char *capabilities) -{ - const char *mtypes[] = { - "100baseT4", "100baseTx", "100baseTx-FD", "100baseTx-HD", - "10baseT", "10baseT-FD", "10baseT-HD", 0, - }; - char *endptr; - int cap_map[] = { 0x0200, 0x0180, 0x0100, 0x0080, 0x0060, 0x0040, 0x0020,}; - int i; - if ( ! capabilities) { - fprintf(stderr, "You passed -A 'NULL'. You must provide a media" - " list to advertise!\n"); - return -1; - } - if (debug) - fprintf(stderr, "Advertise string is '%s'.\n", capabilities); - for (i = 0; mtypes[i]; i++) - if (strcasecmp(mtypes[i], capabilities) == 0) - return cap_map[i]; - if ((i = strtol(capabilities, &endptr, 16)) <= 0xffff && endptr[0] == 0) - return i; - fprintf(stderr, "Invalid media advertisement value '%s'.\n" - " Either pass a numeric value or one of the following names:\n", - capabilities); - for (i = 0; mtypes[i]; i++) - fprintf(stderr, " %-14s %3.3x\n", mtypes[i], cap_map[i]); - return -1; -} - -/* Trivial versions if we don't link against libmii.c */ -static const char *media_names[] = { - "10baseT", "10baseT-FD", "100baseTx", "100baseTx-FD", "100baseT4", - "Flow-control", 0, -}; -/* Various non-good bits in the command register. */ -static const char *bmcr_bits[] = { - " Internal Collision-Test enabled!\n", "", /* 0x0080,0x0100 */ - " Restarted auto-negotiation in progress!\n", - " Transceiver isolated from the MII!\n", - " Transceiver powered down!\n", "", "", - " Transceiver in loopback mode!\n", - " Transceiver currently being reset!\n", -}; - -int show_basic_mii(long ioaddr, int phy_id) -{ - int mii_reg, i; - u16 mii_val[32]; - u16 bmcr, bmsr, new_bmsr, nway_advert, lkpar; - - for (mii_reg = 0; mii_reg < 8; mii_reg++) - mii_val[mii_reg] = mdio_read(ioaddr, phy_id, mii_reg); - if ( ! verbose) { - printf("Basic registers of MII PHY #%d: ", phy_id); - for (mii_reg = 0; mii_reg < 8; mii_reg++) - printf(" %4.4x", mii_val[mii_reg]); - printf(".\n"); - } - - if (mii_val[0] == 0xffff || mii_val[1] == 0x0000) { - printf(" No MII transceiver present!.\n"); - if (! opt_f) { - printf(" Use '--force' to view the information anyway.\n"); - return -1; - } - } - /* Descriptive rename. */ - bmcr = mii_val[0]; - bmsr = mii_val[1]; - nway_advert = mii_val[4]; - lkpar = mii_val[5]; - - if (lkpar & 0x4000) { - int negotiated = nway_advert & lkpar & 0x3e0; - int max_capability = 0; - /* Scan for the highest negotiated capability, highest priority - (100baseTx-FDX) to lowest (10baseT-HDX). */ - int media_priority[] = {8, 9, 7, 6, 5}; /* media_names[i-5] */ - printf(" The autonegotiated capability is %4.4x.\n", negotiated); - for (i = 0; media_priority[i]; i++) - if (negotiated & (1 << media_priority[i])) { - max_capability = media_priority[i]; - break; - } - if (max_capability) - printf("The autonegotiated media type is %s.\n", - media_names[max_capability - 5]); - else - printf("No common media type was autonegotiated!\n" - "This is extremely unusual and typically indicates a " - "configuration error.\n" "Perhaps the advertised " - "capability set was intentionally limited.\n"); - } - printf(" Basic mode control register 0x%4.4x:", bmcr); - if (bmcr & 0x1000) - printf(" Auto-negotiation enabled.\n"); - else - printf(" Auto-negotiation disabled, with\n" - " Speed fixed at 10%s mbps, %s-duplex.\n", - bmcr & 0x2000 ? "0" : "", - bmcr & 0x0100 ? "full":"half"); - for (i = 0; i < 9; i++) - if (bmcr & (0x0080<<i)) - printf("%s", bmcr_bits[i]); - - new_bmsr = mdio_read(ioaddr, phy_id, 1); - if ((bmsr & 0x0016) == 0x0004) - printf( " You have link beat, and everything is working OK.\n"); - else - printf(" Basic mode status register 0x%4.4x ... %4.4x.\n" - " Link status: %sestablished.\n", - bmsr, new_bmsr, - bmsr & 0x0004 ? "" : - (new_bmsr & 0x0004) ? "previously broken, but now re" : "not "); - if (verbose) { - printf(" This transceiver is capable of "); - if (bmsr & 0xF800) { - for (i = 15; i >= 11; i--) - if (bmsr & (1<<i)) - printf(" %s", media_names[i-11]); - } else - printf("<Warning! No media capabilities>"); - printf(".\n"); - printf(" %s to perform Auto-negotiation, negotiation %scomplete.\n", - bmsr & 0x0008 ? "Able" : "Unable", - bmsr & 0x0020 ? "" : "not "); - } - - if (bmsr & 0x0010) - printf(" Remote fault detected!\n"); - if (bmsr & 0x0002) - printf(" *** Link Jabber! ***\n"); - - if (lkpar & 0x4000) { - printf(" Your link partner advertised %4.4x:", - lkpar); - for (i = 5; i >= 0; i--) - if (lkpar & (0x20<<i)) - printf(" %s", media_names[i]); - printf("%s.\n", lkpar & 0x0400 ? ", w/ 802.3X flow control" : ""); - } else if (lkpar & 0x00A0) - printf(" Your link partner is generating %s link beat (no" - " autonegotiation).\n", - lkpar & 0x0080 ? "100baseTx" : "10baseT"); - else if ( ! (bmcr & 0x1000)) - printf(" Link partner information is not exchanged when in" - " fixed speed mode.\n"); - else if ( ! (new_bmsr & 0x004)) - ; /* If no partner, do not report status. */ - else if (lkpar == 0x0001 || lkpar == 0x0000) { - printf(" Your link partner does not do autonegotiation, and this " - "transceiver type\n does not report the sensed link " - "speed.\n"); - } else - printf(" Your link partner is strange, status %4.4x.\n", lkpar); - - printf(" End of basic transceiver information.\n\n"); - return 0; -} - -static void monitor_status(long ioaddr, int phy_id) -{ - unsigned int baseline_1 = 0x55555555; /* Always show initial status. */ - - while (1) { - unsigned int new_1 = mdio_read(ioaddr, phy_id, 1); - if (new_1 != baseline_1) { - printf("%-12s 0x%4.4x 0x%4.4x\n", - new_1 & 0x04 ? (new_1==0xffff ? "unknown" : "up") : - new_1 & 0x20 ? "negotiating" : "down", - new_1, mdio_read(ioaddr, phy_id, 5)); - fflush(stdout); - baseline_1 = new_1; - } - sleep(1); - } -} - -int show_mii_details(long ioaddr, int phy_id) -{ - int mii_reg, mii_val; - printf(" MII PHY #%d transceiver registers:", phy_id); - for (mii_reg = 0; mii_reg < 32; mii_reg++) { - mii_val = mdio_read(skfd, phy_id, mii_reg); - printf("%s %4.4x", (mii_reg % 8) == 0 ? "\n " : "", - mii_val); - } - printf("\nThis version of 'mii-diag' has not been linked with " - "the libmii.c library.\n" - " That library provides extended transceiver status reports.\n"); - return 0; -} - -void monitor_mii(long ioaddr, int phy_id) -{ - fprintf(stderr, "\nThis version of 'mii-diag' has not been linked with " - "the libmii.c library \n" - " required for the media monitor option.\n"); -} - - - -/* - * Local variables: - * version-control: t - * kept-new-versions: 5 - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * compile-command: "gcc -Wall -Wstrict-prototypes -O mii-diag.c -DLIBMII libmii.c -o mii-diag" - * simple-compile-command: "gcc mii-diag.c -o mii-diag" - * End: - */ diff --git a/net-tools/net-tools.nm b/net-tools/net-tools.nm deleted file mode 100644 index 24ae372ad..000000000 --- a/net-tools/net-tools.nm +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = net-tools -version = 2.0 -git_rev = e5f1be13 -release = 2.%{git_rev} - -groups = System/Base -url = http://net-tools.berlios.de/ -license = GPL+ -summary = Basic networking tools. - -description - The net-tools package contains basic networking tools, - including ifconfig, netstat, route, and others. -end - -source_dl = -sources = %{thisapp}-%{git_rev}.tar.xz - -build - requires - gettext - end - - prepare_cmds - # Copy config files - cp %{DIR_SOURCE}/config.h %{DIR_APP} - cp %{DIR_SOURCE}/config.make %{DIR_APP} - - # Copy additional man pages - mkdir -pv %{DIR_APP}/man/en_US - cp %{DIR_SOURCE}/*.8 %{DIR_APP}/man/en_US - - # Copy source for mii-diag - cp %{DIR_SOURCE}/mii-diag.c %{DIR_APP} - end - - make_build_targets += \ - CC=gcc - - # Compiling in parallel mode is unsafe for this pkg. - PARALLELISMFLAGS = - - build_cmds - # Compile mii-diag - make mii-diag - end - - install - mv man/de_DE man/de - mv man/fr_FR man/fr - mv man/pt_BR man/pt - - make BASEDIR=%{BUILDROOT} BINDIR=%{bindir} \ - SBINDIR=%{sbindir} mandir=%{mandir} install - - # Install mii-diag - install -m 755 %{DIR_APP}/mii-diag %{BUILDROOT}%{sbindir} - - # Remove tools we do not want - rm -rvf \ - %{BUILDROOT}%{prefix}/{,*}/{arp,ifconfig,ip,nameif,plipconfig,rarp,route,slattach}* \ - %{BUILDROOT}%{mandir}/{,*}/man*/{arp,ifconfig,ip,nameif,plipconfig,rarp,route,slattach}* - - # Remove hostname (has its own package) - rm -rvf \ - %{BUILDROOT}%{bindir}/{dnsdomainname,domainname,hostname,nisdomainname,ypdomainname}* \ - %{BUILDROOT}%{mandir}/{,*}/man*/{dnsdomainname,domainname,hostname,nisdomainname,ypdomainname}* - end -end - -packages - package %{name} - groups += Base - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/net-tools/patches/001-net-tools-cycle.patch b/net-tools/patches/001-net-tools-cycle.patch deleted file mode 100644 index 7d58dbbd6..000000000 --- a/net-tools/patches/001-net-tools-cycle.patch +++ /dev/null @@ -1,375 +0,0 @@ -diff -up net-tools-2.0/lib/interface.c.cycle net-tools-2.0/lib/interface.c ---- net-tools-2.0/lib/interface.c.cycle 2014-11-11 14:38:03.000000000 +0100 -+++ net-tools-2.0/lib/interface.c 2014-11-24 14:45:46.128480980 +0100 -@@ -93,6 +93,7 @@ int if_list_all = 0; /* do we have reque - static struct interface *int_list, *int_last; - - static int if_readlist_proc(const char *); -+static int if_readlist_rep(const char *, struct interface *); - - static struct interface *if_cache_add(const char *name) - { -@@ -138,11 +139,14 @@ struct interface *lookup_interface(const - int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie) - { - struct interface *ife; -+ int err; - - if (!if_list_all && (if_readlist() < 0)) - return -1; - for (ife = int_list; ife; ife = ife->next) { -- int err = doit(ife, cookie); -+ if_readlist_rep(ife->name, ife); -+ err = doit(ife, cookie); -+ - if (err) - return err; - } -@@ -379,6 +383,41 @@ static int if_readlist_proc(const char * - fclose(fh); - return err; - } -+ -+static int if_readlist_rep(const char *target, struct interface *ife) -+{ -+ FILE *fh; -+ char buf[512]; -+ int err; -+ -+ fh = fopen(_PATH_PROCNET_DEV, "r"); -+ if (!fh) { -+ fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"), -+ _PATH_PROCNET_DEV, strerror(errno)); -+ return if_readconf(); -+ } -+ fgets(buf, sizeof buf, fh); /* eat line */ -+ fgets(buf, sizeof buf, fh); -+ -+ procnetdev_vsn = procnetdev_version(buf); -+ -+ err = 0; -+ while (fgets(buf, sizeof buf, fh)) { -+ char *s, name[IFNAMSIZ]; -+ s = get_name(name, buf); -+ get_dev_fields(s, ife); -+ ife->statistics_valid = 1; -+ if (target && !strcmp(target,name)) -+ break; -+ } -+ if (ferror(fh)) { -+ perror(_PATH_PROCNET_DEV); -+ err = -1; -+ } -+ -+ fclose(fh); -+ return err; -+} - - int if_readlist(void) - { -diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat.8 ---- net-tools-2.0/man/en_US/netstat.8.cycle 2014-11-11 14:38:03.000000000 +0100 -+++ net-tools-2.0/man/en_US/netstat.8 2014-11-24 14:47:36.140944944 +0100 -@@ -36,6 +36,7 @@ netstat \- Print network connections, ro - .RB [ \-\-verbose | \-v ] - .RB [ \-\-continuous | \-c] - .RB [ \-\-wide | \-W ] -+.RB [delay] - .P - .B netstat - .RB { \-\-route | \-r } -@@ -45,6 +46,7 @@ netstat \- Print network connections, ro - .RB [ \-\-numeric | \-n ] - .RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] - .RB [ \-\-continuous | \-c ] -+.RB [delay] - .P - .B netstat - .RB { \-\-interfaces | \-i } -@@ -55,12 +57,14 @@ netstat \- Print network connections, ro - .RB [ \-\-numeric | \-n ] - .RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ] - .RB [ \-\-continuous | \-c ] -+.RB [delay] - .P - .B netstat - .RB { \-\-groups | \-g } - .RB [ \-\-numeric | \-n ] - .RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] - .RB [ \-\-continuous | \-c ] -+.RB [delay] - .P - .B netstat - .RB { \-\-masquerade | \-M } -@@ -68,6 +72,7 @@ netstat \- Print network connections, ro - .RB [ \-\-numeric | \-n ] - .RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] - .RB [ \-\-continuous | \-c ] -+.RB [delay] - .P - .B netstat - .RB { \-\-statistics | -s } -@@ -76,6 +81,7 @@ netstat \- Print network connections, ro - .RB [ \-\-udplite | \-U ] - .RB [ \-\-sctp | \-S ] - .RB [ \-\-raw | \-w ] -+.RB [delay] - .P - .B netstat - .RB { \-\-version | \-V } -@@ -208,6 +214,10 @@ option, show interfaces that are not up - Print routing information from the FIB. (This is the default.) - .SS "\-C" - Print routing information from the route cache. -+.SS delay -+Netstat will cycle printing through statistics every -+.B delay -+seconds. - .P - .SH OUTPUT - .P -diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c ---- net-tools-2.0/netstat.c.cycle 2014-11-11 14:38:03.000000000 +0100 -+++ net-tools-2.0/netstat.c 2014-11-24 14:44:24.948614445 +0100 -@@ -115,9 +115,9 @@ - #endif - - /* prototypes for statistics.c */ --void parsesnmp(int, int, int); -+int parsesnmp(int, int, int); - void inittab(void); --void parsesnmp6(int, int, int); -+int parsesnmp6(int, int, int); - void inittab6(void); - - typedef enum { -@@ -342,10 +342,10 @@ static void prg_cache_clear(void) - prg_cache_loaded = 0; - } - --static void wait_continous(void) -+static void wait_continous(int reptimer) - { - fflush(stdout); -- sleep(1); -+ sleep(reptimer); - } - - static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) { -@@ -1787,6 +1787,8 @@ static int rfcomm_info(void) - - static int iface_info(void) - { -+ static int count=0; -+ - if (skfd < 0) { - if ((skfd = sockets_open(0)) < 0) { - perror("socket"); -@@ -1796,20 +1798,21 @@ static int iface_info(void) - } - if (flag_exp < 2) { - ife_short = 1; -- printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); -+ if(!(count % 8)) -+ printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); - } - - if (for_all_interfaces(do_if_print, &flag_all) < 0) { - perror(_("missing interface information")); - exit(1); - } -- if (flag_cnt) -+ if (!flag_cnt) { - if_cache_free(); -- else { - close(skfd); - skfd = -1; - } - -+ count++; - return 0; - } - -@@ -1825,7 +1828,7 @@ static void usage(void) - { - fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n")); - fprintf(stderr, _(" netstat [-vWnNcaeol] [<Socket> ...]\n")); -- fprintf(stderr, _(" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n\n")); -+ fprintf(stderr, _(" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] } [delay]\n\n")); - - fprintf(stderr, _(" -r, --route display routing table\n")); - fprintf(stderr, _(" -i, --interfaces display interface table\n")); -@@ -1867,6 +1870,7 @@ int main - (int argc, char *argv[]) { - int i; - int lop; -+ int reptimer = 1; - static struct option longopts[] = - { - AFTRANS_OPTS, -@@ -2049,6 +2053,12 @@ int main - flag_sta++; - } - -+ if(argc == optind + 1) { -+ if((reptimer = atoi(argv[optind])) <= 0) -+ usage(); -+ flag_cnt++; -+ } -+ - if (flag_int + flag_rou + flag_mas + flag_sta > 1) - usage(); - -@@ -2078,7 +2088,7 @@ int main - flag_not & FLAG_NUM_PORT, flag_exp); - if (i || !flag_cnt) - break; -- wait_continous(); -+ wait_continous(reptimer); - } - #else - ENOSUPP("netstat", "FW_MASQUERADE"); -@@ -2091,17 +2101,18 @@ int main - if (!afname[0]) - safe_strncpy(afname, DFLT_AF, sizeof(afname)); - -+ for (;;) { - if (!strcmp(afname, "inet")) { - #if HAVE_AFINET - inittab(); -- parsesnmp(flag_raw, flag_tcp, flag_udp); -+ i = parsesnmp(flag_raw, flag_tcp, flag_udp); - #else - ENOSUPP("netstat", "AF INET"); - #endif - } else if(!strcmp(afname, "inet6")) { - #if HAVE_AFINET6 - inittab6(); -- parsesnmp6(flag_raw, flag_tcp, flag_udp); -+ i = parsesnmp6(flag_raw, flag_tcp, flag_udp); - #else - ENOSUPP("netstat", "AF INET6"); - #endif -@@ -2109,7 +2120,11 @@ int main - printf(_("netstat: No statistics support for specified address family: %s\n"), afname); - exit(1); - } -- exit(0); -+ if(i || !flag_cnt) -+ break; -+ sleep(reptimer); -+ } -+ return (i); - } - - if (flag_rou) { -@@ -2131,7 +2146,7 @@ int main - i = route_info(afname, options); - if (i || !flag_cnt) - break; -- wait_continous(); -+ wait_continous(reptimer); - } - return (i); - } -@@ -2140,7 +2155,7 @@ int main - i = iface_info(); - if (!flag_cnt || i) - break; -- wait_continous(); -+ wait_continous(reptimer); - } - return (i); - } -@@ -2327,7 +2342,7 @@ int main - - if (!flag_cnt || i) - break; -- wait_continous(); -+ wait_continous(reptimer); - prg_cache_clear(); - } - return (i); -diff -up net-tools-2.0/statistics.c.cycle net-tools-2.0/statistics.c ---- net-tools-2.0/statistics.c.cycle 2014-11-11 14:38:03.000000000 +0100 -+++ net-tools-2.0/statistics.c 2014-11-24 14:44:24.949614431 +0100 -@@ -502,7 +502,7 @@ void process6_fd(FILE *f) - - } - --void parsesnmp(int flag_raw, int flag_tcp, int flag_udp) -+int parsesnmp(int flag_raw, int flag_tcp, int flag_udp) - { - FILE *f; - -@@ -511,14 +511,17 @@ void parsesnmp(int flag_raw, int flag_tc - f = proc_fopen("/proc/net/snmp"); - if (!f) { - perror(_("cannot open /proc/net/snmp")); -- return; -+ return(1); - } - - if (process_fd(f, 1, NULL) < 0) - fprintf(stderr, _("Problem while parsing /proc/net/snmp\n")); - -- if (ferror(f)) -+ if (ferror(f)) { - perror("/proc/net/snmp"); -+ fclose(f); -+ return(1); -+ } - - fclose(f); - -@@ -528,15 +531,18 @@ void parsesnmp(int flag_raw, int flag_tc - if (process_fd(f, 1, NULL) <0) - fprintf(stderr, _("Problem while parsing /proc/net/netstat\n")); - -- if (ferror(f)) -- perror("/proc/net/netstat"); -+ if (ferror(f)) { -+ perror("/proc/net/netstat"); -+ fclose(f); -+ return(1); -+ } - - fclose(f); - } -- return; -+ return(0); - } - --void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp) -+int parsesnmp6(int flag_raw, int flag_tcp, int flag_udp) - { - FILE *f; - -@@ -545,7 +551,7 @@ void parsesnmp6(int flag_raw, int flag_t - f = fopen("/proc/net/snmp6", "r"); - if (!f) { - perror(_("cannot open /proc/net/snmp6")); -- return; -+ return(1); - } - process6_fd(f); - if (ferror(f)) -@@ -555,13 +561,16 @@ void parsesnmp6(int flag_raw, int flag_t - f = fopen("/proc/net/snmp", "r"); - if (!f) { - perror(_("cannot open /proc/net/snmp")); -- return; -+ return(1); - } - process_fd(f, 0, "Tcp"); -- if (ferror(f)) -+ if (ferror(f)) { - perror("/proc/net/snmp"); -+ return(1); -+ } - - fclose(f); -+ return(0); - } - - void inittab(void) diff --git a/net-tools/patches/002-net-tools-ipx.patch b/net-tools/patches/002-net-tools-ipx.patch deleted file mode 100644 index ec7814587..000000000 --- a/net-tools/patches/002-net-tools-ipx.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up net-tools-2.0/lib/ipx_gr.c.ipx net-tools-2.0/lib/ipx_gr.c ---- net-tools-2.0/lib/ipx_gr.c.ipx 2013-09-10 12:33:52.494047907 +0200 -+++ net-tools-2.0/lib/ipx_gr.c 2013-09-10 12:34:28.531561603 +0200 -@@ -72,7 +72,7 @@ int IPX_rprint(int options) - continue; - - /* Fetch and resolve the Destination */ -- (void) ap->input(5, net, &sa); -+ (void) ap->input(1, net, &sa); - safe_strncpy(net, ap->sprint(&sa, numeric), sizeof(net)); - - /* Fetch and resolve the Router Net */ -diff -up net-tools-2.0/netstat.c.ipx net-tools-2.0/netstat.c ---- net-tools-2.0/netstat.c.ipx 2013-09-10 12:33:52.491047948 +0200 -+++ net-tools-2.0/netstat.c 2013-09-10 12:33:52.495047894 +0200 -@@ -1643,13 +1643,13 @@ static int ipx_info(void) - } - - /* Fetch and resolve the Source */ -- (void) ap->input(4, sad, &sa); -+ (void) ap->input(0, sad, &sa); - safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof(buf)); - snprintf(sad, sizeof(sad), "%s:%04X", buf, sport); - - if (!nc) { - /* Fetch and resolve the Destination */ -- (void) ap->input(4, dad, &sa); -+ (void) ap->input(0, dad, &sa); - safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof(buf)); - snprintf(dad, sizeof(dad), "%s:%04X", buf, dport); - } else diff --git a/net-tools/patches/003-net-tools-man.patch b/net-tools/patches/003-net-tools-man.patch deleted file mode 100644 index 1a33a1e3a..000000000 --- a/net-tools/patches/003-net-tools-man.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff -up net-tools-2.0/man/en_US/arp.8.man net-tools-2.0/man/en_US/arp.8 ---- net-tools-2.0/man/en_US/arp.8.man 2014-04-26 02:45:16.000000000 +0200 -+++ net-tools-2.0/man/en_US/arp.8 2014-07-07 14:51:31.378459439 +0200 -@@ -63,6 +63,10 @@ arp \- manipulate the system ARP cache - .B \-f - .RI [ filename ] - -+.SH NOTE -+.P -+This program is obsolete. For replacement check \fBip neigh\fR. -+ - .SH DESCRIPTION - .B Arp - manipulates or displays the kernel's IPv4 network neighbour cache. It can add -@@ -219,6 +223,6 @@ published proxy ARP entries and permanen - .br - .I /etc/ethers - .SH SEE ALSO --rarp(8), route(8), ifconfig(8), netstat(8) -+.BR ip(8) - .SH AUTHORS - Fred N. van Kempen <waltje(a)uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools(a)lina.inka.de>. -diff -up net-tools-2.0/man/en_US/ethers.5.man net-tools-2.0/man/en_US/ethers.5 ---- net-tools-2.0/man/en_US/ethers.5.man 2014-04-26 02:45:16.000000000 +0200 -+++ net-tools-2.0/man/en_US/ethers.5 2014-07-07 14:51:31.378459439 +0200 -@@ -26,6 +26,3 @@ can be resolved by DNS or a dot separate - .SH FILES \"{{{ - /etc/ethers - .\"}}} --.SH "SEE ALSO" \"{{{ --rarp(8) --.\"}}} -diff -up net-tools-2.0/man/en_US/ifconfig.8.man net-tools-2.0/man/en_US/ifconfig.8 ---- net-tools-2.0/man/en_US/ifconfig.8.man 2014-04-26 02:45:16.000000000 +0200 -+++ net-tools-2.0/man/en_US/ifconfig.8 2014-07-07 14:51:31.379459422 +0200 -@@ -5,6 +5,13 @@ ifconfig \- configure a network interfac - .B "ifconfig [-v] [-a] [-s] [interface]" - .br - .B "ifconfig [-v] interface [aftype] options | address ..." -+ -+.SH NOTE -+.P -+This program is obsolete! -+For replacement check \fBip addr\fR and \fBip link\fR. -+For statistics use \fBip -s link\fR. -+ - .SH DESCRIPTION - .B Ifconfig - is used to configure the kernel-resident network interfaces. It is -@@ -222,7 +229,8 @@ package to display link layer informatio - While appletalk DDP and IPX addresses will be displayed they cannot be - altered by this command. - .SH SEE ALSO --route(8), netstat(8), arp(8), rarp(8), iptables(8), ifup(8), interfaces(5). -+.BR ip(8), -+.BR iptables(8) - .br - http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples - .SH AUTHORS -diff -up net-tools-2.0/man/en_US/mii-tool.8.man net-tools-2.0/man/en_US/mii-tool.8 ---- net-tools-2.0/man/en_US/mii-tool.8.man 2014-04-26 02:45:16.000000000 +0200 -+++ net-tools-2.0/man/en_US/mii-tool.8 2014-07-07 14:51:31.379459422 +0200 -@@ -18,6 +18,10 @@ mii\-tool \- view, manipulate media-inde - [\fB\-p\fR, \fB\-\-phy=\fIaddr\fR] - .RI "interface\ ..." - -+.SH NOTE -+.P -+This program is obsolete. For replacement check \fBethtool\fB. -+ - .SH DESCRIPTION - This utility checks or sets the status of a network interface's Media - Independent Interface (MII) unit. Most fast ethernet adapters use an -@@ -93,6 +97,9 @@ SIOCGMIIPHY on 'eth?' failed: Operation - The interface in question does not support MII queries. Most likely, it does not have - MII transceivers, at all. - -+.SH SEE ALSO -+ethtool(8) -+ - .SH AUTHORS - David Hinds \- dhinds(a)pcmcia.sourceforge.org - .br -diff -up net-tools-2.0/man/en_US/nameif.8.man net-tools-2.0/man/en_US/nameif.8 ---- net-tools-2.0/man/en_US/nameif.8.man 2014-04-26 02:45:16.000000000 +0200 -+++ net-tools-2.0/man/en_US/nameif.8 2014-07-07 14:51:31.379459422 +0200 -@@ -5,6 +5,12 @@ nameif \- name network interfaces based - .B "nameif [\-c configfile] [\-s]" - .br - .B "nameif [\-c configfile] [\-s] {interface macaddress}" -+ -+.SH NOTE -+.P -+This program is obsolete. For replacement check \fBip link\fR. -+This functionality is also much better provided by udev methods. -+ - .SH DESCRIPTION - .B nameif - renames network interfaces based on mac addresses. When no arguments are -@@ -31,5 +37,10 @@ should be run before the interface is up - - .SH FILES - /etc/mactab -+ -+.SH SEE ALSO -+.BR ip(8), -+.BR udev(7) -+ - .SH BUGS - Only works for Ethernet currently. -diff -up net-tools-2.0/man/en_US/netstat.8.man net-tools-2.0/man/en_US/netstat.8 ---- net-tools-2.0/man/en_US/netstat.8.man 2014-07-07 14:51:31.370459575 +0200 -+++ net-tools-2.0/man/en_US/netstat.8 2014-07-07 14:51:31.380459405 +0200 -@@ -198,7 +198,8 @@ Show the PID and name of the program to - .SS "\-l, \-\-listening" - Show only listening sockets. (These are omitted by default.) - .SS "\-a, \-\-all" --Show both listening and non-listening sockets. With the -+Show both listening and non-listening (for TCP this means established -+connections) sockets. With the - .B \-\-interfaces - option, show interfaces that are not up - .SS "\-F" -diff -up net-tools-2.0/man/en_US/route.8.man net-tools-2.0/man/en_US/route.8 ---- net-tools-2.0/man/en_US/route.8.man 2014-04-26 02:45:16.000000000 +0200 -+++ net-tools-2.0/man/en_US/route.8 2014-07-07 14:52:58.766977905 +0200 -@@ -57,6 +57,11 @@ family - .RB [ \-\-version ] - .RB [ \-h ] - .RB [ \-\-help ] -+ -+.SH NOTE -+.P -+This program is obsolete. For replacement check \fBip route\fR. -+ - .SH DESCRIPTION - .B Route - manipulates the kernel's IP routing tables. Its primary use is to set -@@ -330,10 +335,6 @@ Whether or not the hardware address for - .I /proc/net/rt_cache - .LP - .SH "SEE ALSO" --.IR ifconfig (8), --.IR netstat (8), --.IR arp (8), --.IR rarp (8), - .IR ip (8) - .LP - .SH HISTORY diff --git a/net-tools/patches/004-net-tools-interface.patch b/net-tools/patches/004-net-tools-interface.patch deleted file mode 100644 index abbc0ba3c..000000000 --- a/net-tools/patches/004-net-tools-interface.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -up net-tools-2.0/man/en_US/netstat.8.interface net-tools-2.0/man/en_US/netstat.8 ---- net-tools-2.0/man/en_US/netstat.8.interface 2014-11-24 14:52:45.648623478 +0100 -+++ net-tools-2.0/man/en_US/netstat.8 2014-11-24 14:53:32.294972184 +0100 -@@ -49,9 +49,9 @@ netstat \- Print network connections, ro - .RB [delay] - .P - .B netstat --.RB { \-\-interfaces | \-i } -+.RB { \-\-interfaces | \-I | \-i } - .RB [ \-\-all | \-a ] --.RB [ \-\-extend | \-e [ \-\-extend | \-e] ] -+.RB [ \-\-extend | \-e ] - .RB [ \-\-verbose | \-v ] - .RB [ \-\-program | \-p ] - .RB [ \-\-numeric | \-n ] -@@ -134,8 +134,8 @@ and - produce the same output. - .SS "\-\-groups, \-g" - Display multicast group membership information for IPv4 and IPv6. --.SS "\-\-interfaces, \-i" --Display a table of all network interfaces. -+.SS "\-\-interfaces=\fIiface \fR, \fB\-I=\fIiface \fR, \fB\-i" -+Display a table of all network interfaces, or the specified \fIiface\fR. - .SS "\-\-masquerade, \-M" - Display a list of masqueraded connections. - .SS "\-\-statistics, \-s" -diff -up net-tools-2.0/netstat.c.interface net-tools-2.0/netstat.c ---- net-tools-2.0/netstat.c.interface 2014-11-24 14:52:45.644623534 +0100 -+++ net-tools-2.0/netstat.c 2014-11-24 14:52:45.652623422 +0100 -@@ -144,6 +144,7 @@ static char *Release = RELEASE, *Signatu - #define E_IOCTL -3 - - int flag_int = 0; -+char *flag_int_name = NULL; - int flag_rou = 0; - int flag_mas = 0; - int flag_sta = 0; -@@ -1788,6 +1789,7 @@ static int rfcomm_info(void) - static int iface_info(void) - { - static int count=0; -+ struct interface *ife = NULL; - - if (skfd < 0) { - if ((skfd = sockets_open(0)) < 0) { -@@ -1802,7 +1804,11 @@ static int iface_info(void) - printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); - } - -- if (for_all_interfaces(do_if_print, &flag_all) < 0) { -+ if (flag_int_name) { -+ ife = lookup_interface(flag_int_name); -+ do_if_print(ife, &flag_all); -+ } -+ else if (for_all_interfaces(do_if_print, &flag_all) < 0) { - perror(_("missing interface information")); - exit(1); - } -@@ -1828,9 +1834,10 @@ static void usage(void) - { - fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n")); - fprintf(stderr, _(" netstat [-vWnNcaeol] [<Socket> ...]\n")); -- fprintf(stderr, _(" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] } [delay]\n\n")); -+ fprintf(stderr, _(" netstat { [-vWeenNac] -I[<Iface>] | [-veenNac] -i | [-cnNe] -M | -s [-6tuw] } [delay]\n\n")); - - fprintf(stderr, _(" -r, --route display routing table\n")); -+ fprintf(stderr, _(" -I, --interfaces=<Iface> display interface table for <Iface>\n")); - fprintf(stderr, _(" -i, --interfaces display interface table\n")); - fprintf(stderr, _(" -g, --groups display multicast group memberships\n")); - fprintf(stderr, _(" -s, --statistics display networking statistics (like SNMP)\n")); -@@ -1875,7 +1882,7 @@ int main - { - AFTRANS_OPTS, - {"version", 0, 0, 'V'}, -- {"interfaces", 0, 0, 'i'}, -+ {"interfaces", 2, 0, 'I'}, - {"help", 0, 0, 'h'}, - {"route", 0, 0, 'r'}, - #if HAVE_FW_MASQUERADE -@@ -1919,7 +1926,7 @@ int main - getroute_init(); /* Set up AF routing support */ - - afname[0] = '\0'; -- while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF) - switch (i) { - case -1: - break; -@@ -1960,6 +1967,13 @@ int main - case 'p': - flag_prg++; - break; -+ case 'I': -+ if (optarg && strcmp(optarg, "(null)")) -+ if (optarg[0] == '=') optarg++; -+ if (optarg && strcmp(optarg, "(null)")) -+ flag_int_name = strdup(optarg); -+ flag_int++; -+ break; - case 'i': - flag_int++; - break; diff --git a/net-tools/patches/005-net-tools-duplicate-tcp.patch b/net-tools/patches/005-net-tools-duplicate-tcp.patch deleted file mode 100644 index 393d27235..000000000 --- a/net-tools/patches/005-net-tools-duplicate-tcp.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff -up net-tools-2.0/netstat.c.dup-tcp net-tools-2.0/netstat.c ---- net-tools-2.0/netstat.c.dup-tcp 2012-10-04 11:32:01.437729086 +0200 -+++ net-tools-2.0/netstat.c 2012-10-04 11:32:01.441729032 +0200 -@@ -502,6 +502,121 @@ static void prg_cache_load(void) - " will not be shown, you would have to be root to see it all.)\n")); - } - -+#define TCP_HASH_SIZE 1009 -+ -+static struct tcp_node { -+ struct tcp_node *next; -+ char *socket_pair; -+} *tcp_node_hash[TCP_HASH_SIZE]; -+ -+static unsigned int tcp_node_compute_string_hash(const char *p) -+{ -+ unsigned int h = *p; -+ -+ if (h) -+ for (p += 1; *p != '\0'; p++) -+ h = (h << 5) - h + *p; -+ -+ return h; -+} -+ -+#define TCP_NODE_HASH_STRING(x) \ -+ (tcp_node_compute_string_hash(x) % TCP_HASH_SIZE) -+ -+static void tcp_node_hash_clear(void) -+{ -+ int i; -+ struct tcp_node *next_node; -+ struct tcp_node *tmp_node; -+ for (i=0; i < TCP_HASH_SIZE; i++) { -+ if (tcp_node_hash[i]) { -+ /* free the children of this hash bucket */ -+ next_node = tcp_node_hash[i]->next; -+ while (next_node) { -+ tmp_node = next_node; -+ next_node = next_node->next; -+ free(tmp_node->socket_pair); -+ free(tmp_node); -+ } -+ -+ /* free the bucket itself */ -+ free(tcp_node_hash[i]->socket_pair); -+ free(tcp_node_hash[i]); -+ tcp_node_hash[i] = NULL; -+ } -+ } -+} -+ -+/* This function takes a socket pair string. If it already exists in -+ the hash it returns -1, otherwise it returns 0. */ -+ -+static int tcp_node_hash_check_and_append(const char *local_addr, -+ int local_port, -+ const char *rem_addr, -+ int rem_port) -+{ -+ unsigned int hash_val; -+ struct tcp_node *tmp_node; -+ int tmp_string_len; -+ char *tmp_string;; -+ -+ /* Size of the string is the size of the two lengths of the address -+ strings plus enough sizes for the colons and the ports. */ -+ tmp_string_len = strlen(local_addr) + strlen(rem_addr) + 32; -+ tmp_string = malloc(tmp_string_len); -+ if (!tmp_string) -+ return 0; -+ -+ if (snprintf(tmp_string, tmp_string_len - 1, "%s:%d:%s:%d", -+ local_addr, local_port, rem_addr, rem_port) < 0) { -+ free(tmp_string); -+ return 0; -+ } -+ -+ hash_val = TCP_NODE_HASH_STRING(tmp_string); -+ -+ /* See if we have to allocate this node */ -+ if (!tcp_node_hash[hash_val]) { -+ tcp_node_hash[hash_val] = malloc(sizeof(struct tcp_node)); -+ if (!tcp_node_hash[hash_val]) { -+ free(tmp_string); -+ return 0; -+ } -+ -+ memset(tcp_node_hash[hash_val], 0, sizeof(struct tcp_node)); -+ -+ /* Stuff this new value into the hash bucket and return early */ -+ tcp_node_hash[hash_val]->socket_pair = tmp_string; -+ return 0; -+ } -+ -+ /* Try to find the value in the hash bucket. */ -+ tmp_node = tcp_node_hash[hash_val]; -+ while (tmp_node) { -+ if (!strcmp(tmp_node->socket_pair, tmp_string)) { -+ free(tmp_string); -+ return -1; -+ } -+ tmp_node = tmp_node->next; -+ } -+ -+ /* If we got this far it means that it isn't in the hash bucket. -+ Add it to the front since it's faster that way. */ -+ tmp_node = tcp_node_hash[hash_val]; -+ -+ tcp_node_hash[hash_val] = malloc(sizeof(struct tcp_node)); -+ if (!tcp_node_hash[hash_val]) { -+ free(tmp_string); -+ tcp_node_hash[hash_val] = tmp_node; -+ return 0; -+ } -+ -+ tcp_node_hash[hash_val]->socket_pair = tmp_string; -+ tcp_node_hash[hash_val]->next = tmp_node; -+ -+ return 0; -+} -+ - #if HAVE_AFNETROM - static const char *netrom_state[] = - { -@@ -1018,6 +1133,12 @@ static void tcp_do_one(int lnr, const ch - return; - } - -+ /* make sure that we haven't seen this socket pair before */ -+ if (tcp_node_hash_check_and_append(local_addr, local_port, rem_addr, rem_port) < 0) { -+ /* fprintf(stderr, _("warning, got duplicate tcp line.\n")); */ -+ return; -+ } -+ - addr_do_one(local_addr, sizeof(local_addr), 22, ap, &localaddr, local_port, "tcp"); - addr_do_one(rem_addr, sizeof(rem_addr), 22, ap, &remaddr, rem_port, "tcp"); - -@@ -2355,6 +2476,7 @@ int main - break; - wait_continous(reptimer); - prg_cache_clear(); -+ tcp_node_hash_clear(); - } - return (i); - } diff --git a/net-tools/patches/006-net-tools-statalias.patch b/net-tools/patches/006-net-tools-statalias.patch deleted file mode 100644 index b544ff409..000000000 --- a/net-tools/patches/006-net-tools-statalias.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up net-tools-2.0/lib/interface.c.statalias net-tools-2.0/lib/interface.c ---- net-tools-2.0/lib/interface.c.statalias 2012-10-04 11:33:05.490889090 +0200 -+++ net-tools-2.0/lib/interface.c 2012-10-04 11:33:05.513888785 +0200 -@@ -405,9 +405,11 @@ static int if_readlist_rep(char *target, - char *s, name[IFNAMSIZ]; - s = get_name(name, buf); - get_dev_fields(s, ife); -- ife->statistics_valid = 1; - if (target && !strcmp(target,name)) -+ { -+ ife->statistics_valid = 1; - break; -+ } - } - if (ferror(fh)) { - perror(_PATH_PROCNET_DEV); diff --git a/net-tools/patches/007-net-tools-interface_stack.patch b/net-tools/patches/007-net-tools-interface_stack.patch deleted file mode 100644 index 6a93e6741..000000000 --- a/net-tools/patches/007-net-tools-interface_stack.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -up net-tools-2.0/include/interface.h.stack net-tools-2.0/include/interface.h -diff -up net-tools-2.0/lib/interface.c.stack net-tools-2.0/lib/interface.c ---- net-tools-2.0/lib/interface.c.stack 2014-11-24 14:54:32.293134466 +0100 -+++ net-tools-2.0/lib/interface.c 2014-11-24 15:07:58.434764441 +0100 -@@ -214,10 +214,11 @@ out: - return err; - } - --static const char *get_name(char *name, const char *p) -+static const char *get_name(char **namep, const char *p) - { - while (isspace(*p)) - p++; -+ char *name = *namep = p; - while (*p) { - if (isspace(*p)) - break; -@@ -320,9 +321,10 @@ static int get_dev_fields(const char *bp - static int if_readlist_proc(const char *target) - { - FILE *fh; -- char buf[512]; - struct interface *ife; - int err; -+ char *line = NULL; -+ size_t linelen = 0; - - fh = fopen(_PATH_PROCNET_DEV, "r"); - if (!fh) { -@@ -330,10 +332,11 @@ static int if_readlist_proc(const char * - _PATH_PROCNET_DEV, strerror(errno)); - return -2; - } -- if (fgets(buf, sizeof buf, fh)) -- /* eat line */; -- if (fgets(buf, sizeof buf, fh)) -- /* eat line */; -+ if (getline(&line, &linelen, fh) == -1 /* eat line */ -+ || getline(&line, &linelen, fh) == -1) { /* eat line */ -+ err = -1; -+ goto out; -+ } - - #if 0 /* pretty, but can't cope with missing fields */ - fmt = proc_gen_fmt(_PATH_PROCNET_DEV, 1, fh, -@@ -358,14 +361,14 @@ static int if_readlist_proc(const char * - if (!fmt) - return -1; - #else -- procnetdev_vsn = procnetdev_version(buf); -+ procnetdev_vsn = procnetdev_version(line); - #endif - - err = 0; -- while (fgets(buf, sizeof buf, fh)) { -+ while (getline(&line, &linelen, fh) != -1) { - const char *s; -- char name[IFNAMSIZ]; -- s = get_name(name, buf); -+ char *name; -+ s = get_name(&name, line); - ife = if_cache_add(name); - get_dev_fields(s, ife); - ife->statistics_valid = 1; -@@ -380,6 +383,8 @@ static int if_readlist_proc(const char * - #if 0 - free(fmt); - #endif -+ out: -+ free(line); - fclose(fh); - return err; - } -@@ -387,24 +392,28 @@ static int if_readlist_proc(const char * - static int if_readlist_rep(const char *target, struct interface *ife) - { - FILE *fh; -- char buf[512]; - int err; -+ char *line = NULL; -+ size_t linelen = 0; - - fh = fopen(_PATH_PROCNET_DEV, "r"); - if (!fh) { - fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"), - _PATH_PROCNET_DEV, strerror(errno)); - return if_readconf(); -- } -- fgets(buf, sizeof buf, fh); /* eat line */ -- fgets(buf, sizeof buf, fh); -+ } -+ if (getline(&line, &linelen, fh) == -1 /* eat line */ -+ || getline(&line, &linelen, fh) == -1) { /* eat line */ -+ err = -1; -+ goto out; -+ } - -- procnetdev_vsn = procnetdev_version(buf); -+ procnetdev_vsn = procnetdev_version(line); - - err = 0; -- while (fgets(buf, sizeof buf, fh)) { -- char *s, name[IFNAMSIZ]; -- s = get_name(name, buf); -+ while (getline(&line, &linelen, fh) != -1) { -+ char *s, *name; -+ s = get_name(&name, line); - get_dev_fields(s, ife); - if (target && !strcmp(target,name)) - { -@@ -417,6 +426,8 @@ static int if_readlist_rep(const char *t - err = -1; - } - -+ out: -+ free(line); - fclose(fh); - return err; - } diff --git a/net-tools/patches/008-net-tools-sctp-statistics.patch b/net-tools/patches/008-net-tools-sctp-statistics.patch deleted file mode 100644 index b84b8aa18..000000000 --- a/net-tools/patches/008-net-tools-sctp-statistics.patch +++ /dev/null @@ -1,534 +0,0 @@ -diff -up net-tools-2.0/netstat.c.sctp net-tools-2.0/netstat.c ---- net-tools-2.0/netstat.c.sctp 2013-09-23 15:14:59.524866201 +0200 -+++ net-tools-2.0/netstat.c 2013-09-23 15:24:20.259143969 +0200 -@@ -115,7 +115,7 @@ - #endif - - /* prototypes for statistics.c */ --int parsesnmp(int, int, int); -+int parsesnmp(int, int, int, int); - void inittab(void); - int parsesnmp6(int, int, int); - void inittab6(void); -@@ -888,159 +888,269 @@ static int igmp_info(void) - igmp_do_one, "igmp", "igmp6"); - } - --static int ip_parse_dots(uint32_t *addr, char const *src) { -- unsigned a, b, c, d; -- unsigned ret = 4-sscanf(src, "%u.%u.%u.%u", &a, &b, &c, &d); -- *addr = htonl((a << 24)|(b << 16)|(c << 8)|d); -- return ret; --} -- --static void print_ip_service(struct sockaddr_in *addr, char const *protname, -- char *buf, unsigned size) { -- struct aftype *ap; -- -- if(size == 0) return; -- -- /* print host */ -- if((ap = get_afntype(addr->sin_family)) == NULL) { -- fprintf(stderr, _("netstat: unsupported address family %d !\n"), -- addr->sin_family); -- return; -- } -- safe_strncpy(buf, ap->sprint((struct sockaddr*)addr, flag_not), size); -- -- /* print service */ -- if(flag_all || (flag_lst && !addr->sin_port) || (!flag_lst && addr->sin_port)) { -- char bfs[32]; -- -- snprintf(bfs, sizeof(bfs), "%s", -- get_sname(addr->sin_port, (char*)protname, flag_not & FLAG_NUM_PORT)); -- -- /* check if we must cut on host and/or service name */ -- { -- unsigned const bufl = strlen(buf); -- unsigned const bfsl = strlen(bfs); -- -- if(bufl+bfsl+2 > size) { -- unsigned const half = (size-2)>>1; -- if(bufl > half) { -- if(bfsl > half) { -- buf[size-2-half] = '\0'; -- bfs[half+1] = '\0'; -- } -- else buf[size-2-bfsl] = '\0'; -- } -- else bfs[size-2-bufl] = '\0'; -- } -+static const char *sctp_socket_state_str(int state) -+{ -+ if(state>=0 && state<=10) -+ return tcp_state[state]; -+ else { -+ static char state_str_buf[64]; -+ sprintf(state_str_buf,"UNKNOWN(%d)",state); -+ return state_str_buf; - } -- strcat(buf, ":"); -- strcat(buf, bfs); -- } - } - --/* process single SCTP endpoint */ --static void sctp_do_ept(int lnr, char const *line, const char *prot) -+static struct aftype *process_sctp_addr_str(const char *addr_str, struct sockaddr *sa) - { -- struct sockaddr_in laddr, raddr; -- unsigned uid, inode; -- -- char l_addr[23], r_addr[23]; -- -- /* fill sockaddr_in structures */ -- { -- unsigned lport; -- unsigned ate; -- -- if(lnr == 0) return; -- if(sscanf(line, "%*X %*X %*u %*u %*u %u %u %u %n", -- &lport, &uid, &inode, &ate) < 3) goto err; -- -- /* decode IP address */ -- if(ip_parse_dots(&laddr.sin_addr.s_addr, line+ate)) goto err; -- raddr.sin_addr.s_addr = htonl(0); -- laddr.sin_family = raddr.sin_family = AF_INET; -- laddr.sin_port = htons(lport); -- raddr.sin_port = htons(0); -- } -+ if (strchr(addr_str,':')) { -+#if HAVE_AFINET6 -+ extern struct aftype inet6_aftype; -+ /* Demangle what the kernel gives us */ -+ struct in6_addr in6; -+ char addr6_str[INET6_ADDRSTRLEN]; -+ unsigned u0,u1,u2,u3,u4,u5,u6,u7; -+ sscanf(addr_str, "%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X", -+ &u0, &u1, &u2, &u3, &u4, &u5, &u6, &u7); -+ in6.s6_addr16[0] = htons(u0); -+ in6.s6_addr16[1] = htons(u1); -+ in6.s6_addr16[2] = htons(u2); -+ in6.s6_addr16[3] = htons(u3); -+ in6.s6_addr16[4] = htons(u4); -+ in6.s6_addr16[5] = htons(u5); -+ in6.s6_addr16[6] = htons(u6); -+ in6.s6_addr16[7] = htons(u7); -+ -+ inet_ntop(AF_INET6, &in6, addr6_str, sizeof(addr6_str)); -+ inet6_aftype.input(1, addr6_str, sa); -+ sa->sa_family = AF_INET6; -+#endif -+ } else { -+ ((struct sockaddr_in*)sa)->sin_addr.s_addr = inet_addr(addr_str); -+ sa->sa_family = AF_INET; -+ } -+ return get_afntype(sa->sa_family); -+} - -- /* print IP:service to l_addr and r_addr */ -- print_ip_service(&laddr, prot, l_addr, sizeof(l_addr)); -- print_ip_service(&raddr, prot, r_addr, sizeof(r_addr)); -- -- /* Print line */ -- printf("%-4s %6d %6d %-*s %-*s %-11s", -- prot, 0, 0, -- (int)netmax(23,strlen(l_addr)), l_addr, -- (int)netmax(23,strlen(r_addr)), r_addr, -- _(tcp_state[TCP_LISTEN])); -- finish_this_one(uid, inode, ""); -- return; -- err: -- fprintf(stderr, "SCTP error in line: %d\n", lnr); --} -- --/* process single SCTP association */ --static void sctp_do_assoc(int lnr, char const *line, const char *prot) --{ -- struct sockaddr_in laddr, raddr; -- unsigned long rxq, txq; -- unsigned uid, inode; -- -- char l_addr[23], r_addr[23]; -- -- /* fill sockaddr_in structures */ -- { -- unsigned lport, rport; -- unsigned ate; -- char const *addr; -- -- if(lnr == 0) return; -- if(sscanf(line, "%*X %*X %*u %*u %*u %*u %*u %lu %lu %u %u %u %u %n", -- &txq, &rxq, &uid, &inode, &lport, &rport, &ate) < 6) goto err; -- -- /* decode IP addresses */ -- addr = strchr(line+ate, '*'); -- if(addr == 0) goto err; -- if(ip_parse_dots(&laddr.sin_addr.s_addr, ++addr)) goto err; -- addr = strchr(addr, '*'); -- if(addr == 0) goto err; -- if(ip_parse_dots(&raddr.sin_addr.s_addr, ++addr)) goto err; -- -- /* complete sockaddr_in structures */ -- laddr.sin_family = raddr.sin_family = AF_INET; -- laddr.sin_port = htons(lport); -- raddr.sin_port = htons(rport); -- } -+static void sctp_eps_do_one(int lnr, char *line, const char *proto) -+{ -+ char buffer[1024]; -+ int state, port; -+ int uid; -+ unsigned long inode; -+ struct aftype *ap; -+#if HAVE_AFINET6 -+ struct sockaddr_in6 localaddr; -+#else -+ struct sockaddr_in localaddr; -+#endif -+ const char *sst_str; -+ const char *lport_str; -+ const char *uid_str; -+ const char *inode_str; -+ char *laddrs_str; -+ -+ if(lnr == 0) { -+ /* ENDPT SOCK STY SST HBKT LPORT UID INODE LADDRS */ -+ return; -+ } -+ strtok(line," \t\n"); /*skip endpt*/ -+ strtok(0," \t\n"); /*skip sock*/ -+ strtok(0," \t\n"); /*skp sty*/ -+ sst_str = strtok(0," \t\n"); -+ strtok(0," \t\n"); /*skip hash bucket*/ -+ lport_str=strtok(0," \t\n"); -+ uid_str = strtok(0," \t\n"); -+ inode_str = strtok(0," \t\n"); -+ laddrs_str=strtok(0,"\t\n"); -+ -+ if (!sst_str || !lport_str || !uid_str || !inode_str) { -+ fprintf(stderr, _("warning, got bogus sctp eps line.\n")); -+ return; -+ } -+ state = atoi(sst_str); -+ port = atoi(lport_str); -+ uid = atoi(uid_str); -+ inode = strtoul(inode_str,0,0); -+ -+ const char *this_local_addr; -+ int first=1; -+ char local_port[16]; -+ snprintf(local_port, sizeof(local_port), "%s", -+ get_sname(htons(port), proto, flag_not & FLAG_NUM_PORT)); -+ for(this_local_addr=strtok(laddrs_str," \t\n"); -+ this_local_addr; -+ this_local_addr=strtok(0," \t\n")) -+ { -+ char local_addr[64]; -+ ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); -+ if(ap) -+ safe_strncpy(local_addr, -+ ap->sprint((struct sockaddr *) &localaddr, flag_not), -+ sizeof(local_addr)); -+ else -+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -+ -+ if(!first) printf("\n"); -+ if(first) -+ printf("sctp "); -+ else -+ printf(" "); -+ sprintf(buffer,"%s:%s", local_addr, local_port); -+ printf("%-47s", buffer); -+ printf(" %-11s", first?sctp_socket_state_str(state):""); -+ first = 0; -+ } -+ finish_this_one(uid,inode,""); -+} -+ -+static void sctp_assoc_do_one(int lnr, char *line, const char *proto) -+{ -+ char buffer[1024]; -+ int state, lport,rport; -+ int uid; -+ unsigned rxqueue,txqueue; -+ unsigned long inode; -+ -+ struct aftype *ap; -+#if HAVE_AFINET6 -+ struct sockaddr_in6 localaddr,remoteaddr; -+#else -+ struct sockaddr_in localaddr,remoteaddr; -+#endif -+ const char *sst_str; -+ const char *txqueue_str; -+ const char *rxqueue_str; -+ const char *lport_str,*rport_str; -+ const char *uid_str; -+ const char *inode_str; -+ char *laddrs_str; -+ char *raddrs_str; -+ -+ if(lnr == 0) { -+ /* ASSOC SOCK STY SST ST HBKT ASSOC-ID TX_QUEUE RX_QUEUE UID INODE LPORT RPORT LADDRS <-> RADDRS */ -+ return; -+ } -+ -+ strtok(line," \t\n"); /*skip assoc*/ -+ strtok(0," \t\n"); /*skip sock*/ -+ strtok(0," \t\n"); /*skp sty*/ -+ sst_str = strtok(0," \t\n"); -+ strtok(0," \t\n"); -+ strtok(0," \t\n"); /*skip hash bucket*/ -+ strtok(0," \t\n"); /*skip hash assoc-id*/ -+ txqueue_str = strtok(0," \t\n"); -+ rxqueue_str = strtok(0," \t\n"); -+ uid_str = strtok(0," \t\n"); -+ inode_str = strtok(0," \t\n"); -+ lport_str=strtok(0," \t\n"); -+ rport_str=strtok(0," \t\n"); -+ laddrs_str = strtok(0,"<->\t\n"); -+ raddrs_str = strtok(0,"<->\t\n"); -+ -+ if (!sst_str || !txqueue_str || !rxqueue_str || !uid_str || -+ !inode_str || !lport_str || !rport_str) { -+ fprintf(stderr, _("warning, got bogus sctp assoc line.\n")); -+ return; -+ } -+ -+ state = atoi(sst_str); -+ txqueue = atoi(txqueue_str); -+ rxqueue = atoi(rxqueue_str); -+ uid = atoi(uid_str); -+ inode = strtoul(inode_str,0,0); -+ lport = atoi(lport_str); -+ rport = atoi(rport_str); -+ -+ /*print all addresses*/ -+ const char *this_local_addr; -+ const char *this_remote_addr; -+ char *ss1,*ss2; -+ int first=1; -+ char local_port[16]; -+ char remote_port[16]; -+ snprintf(local_port, sizeof(local_port), "%s", -+ get_sname(htons(lport), proto, -+ flag_not & FLAG_NUM_PORT)); -+ snprintf(remote_port, sizeof(remote_port), "%s", -+ get_sname(htons(rport), proto, -+ flag_not & FLAG_NUM_PORT)); -+ -+ this_local_addr=strtok_r(laddrs_str," \t\n",&ss1); -+ this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2); -+ while(this_local_addr || this_remote_addr) { -+ char local_addr[64]; -+ char remote_addr[64]; -+ -+ if(this_local_addr) { -+ if (this_local_addr[0] == '*') { -+ /* skip * */ -+ this_local_addr++; -+ } -+ ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); -+ if(ap) -+ safe_strncpy(local_addr, -+ ap->sprint((struct sockaddr *) &localaddr, flag_not), sizeof(local_addr)); -+ else -+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -+ } -+ if(this_remote_addr) { -+ if (this_remote_addr[0] == '*') { -+ /* skip * */ -+ this_remote_addr++; -+ } -+ ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr); -+ if(ap) -+ safe_strncpy(remote_addr, -+ ap->sprint((struct sockaddr *) &remoteaddr, flag_not), sizeof(remote_addr)); -+ else -+ sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family); -+ } - -- /* print IP:service to l_addr and r_addr */ -- print_ip_service(&laddr, prot, l_addr, sizeof(l_addr)); -- print_ip_service(&raddr, prot, r_addr, sizeof(r_addr)); -- -- /* Print line */ -- printf("%-4s %6ld %6ld %-*s %-*s %-11s", -- prot, rxq, txq, -- (int)netmax(23,strlen(l_addr)), l_addr, -- (int)netmax(23,strlen(r_addr)), r_addr, -- _(tcp_state[TCP_ESTABLISHED])); -- finish_this_one(uid, inode, ""); -- return; -- err: -- fprintf(stderr, "SCTP error in line: %d\n", lnr); -+ if(!first) printf("\n"); -+ if(first) -+ printf("sctp %6u %6u ", rxqueue, txqueue); -+ else -+ printf(" "); -+ if(this_local_addr) { -+ if(first) -+ sprintf(buffer,"%s:%s", local_addr, local_port); -+ else -+ sprintf(buffer,"%s", local_addr); -+ printf("%-23s", buffer); -+ } else -+ printf("%-23s", ""); -+ printf(" "); -+ if(this_remote_addr) { -+ if(first) -+ sprintf(buffer,"%s:%s", remote_addr, remote_port); -+ else -+ sprintf(buffer,"%s", remote_addr); -+ printf("%-23s", buffer); -+ } else -+ printf("%-23s", ""); -+ -+ printf(" %-11s", first?sctp_socket_state_str(state):""); -+ -+ first = 0; -+ this_local_addr=strtok_r(0," \t\n",&ss1); -+ this_remote_addr=strtok_r(0," \t\n",&ss2); -+ } -+ finish_this_one(uid,inode,""); - } - --static int sctp_info_epts(void) { -+static int sctp_info_eps(void) -+{ - INFO_GUTS6(_PATH_PROCNET_SCTPEPTS, _PATH_PROCNET_SCTP6EPTS, "AF INET (sctp)", -- sctp_do_ept, "sctp", "sctp6"); -+ sctp_eps_do_one, "sctp", "sctp6"); - } - - static int sctp_info_assocs(void) { - INFO_GUTS6(_PATH_PROCNET_SCTPASSOCS, _PATH_PROCNET_SCTP6ASSOCS, "AF INET (sctp)", -- sctp_do_assoc, "sctp", "sctp6"); -+ sctp_assoc_do_one, "sctp", "sctp6"); - } - - static int sctp_info(void) { - int res; -- res = sctp_info_epts(); -+ res = sctp_info_eps(); - if(res) return res; - return sctp_info_assocs(); - } -@@ -2234,7 +2344,7 @@ int main - if (!strcmp(afname, "inet")) { - #if HAVE_AFINET - inittab(); -- i = parsesnmp(flag_raw, flag_tcp, flag_udp); -+ i = parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp); - #else - ENOSUPP("netstat", "AF INET"); - #endif -diff -up net-tools-2.0/statistics.c.sctp net-tools-2.0/statistics.c ---- net-tools-2.0/statistics.c.sctp 2013-09-23 15:14:59.501866518 +0200 -+++ net-tools-2.0/statistics.c 2013-09-23 15:14:59.534866063 +0200 -@@ -21,7 +21,7 @@ - #define UFWARN(x) - #endif - --int print_static,f_raw,f_tcp,f_udp,f_unknown = 1; -+int print_static,f_raw,f_tcp,f_udp,f_sctp,f_unknown = 1; - - enum State { - number = 0, opt_number, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg, -@@ -299,6 +299,27 @@ struct entry Tcpexttab[] = - { "TCPRenoRecoveryFail", N_("%llu classic Reno fast retransmits failed"), opt_number }, - }; - -+struct entry Sctptab[] = -+{ -+ {"SctpCurrEstab", N_("%llu Current Associations"), number}, -+ {"SctpActiveEstabs", N_("%llu Active Associations"), number}, -+ {"SctpPassiveEstabs", N_("%llu Passive Associations"), number}, -+ {"SctpAborteds", N_("%llu Number of Aborteds "), number}, -+ {"SctpShutdowns", N_("%llu Number of Graceful Terminations"), number}, -+ {"SctpOutOfBlues", N_("%llu Number of Out of Blue packets"), number}, -+ {"SctpChecksumErrors", N_("%llu Number of Packets with invalid Checksum"), number}, -+ {"SctpOutCtrlChunks", N_("%llu Number of control chunks sent"), number}, -+ {"SctpOutOrderChunks", N_("%llu Number of ordered chunks sent"), number}, -+ {"SctpOutUnorderChunks", N_("%llu Number of Unordered chunks sent"), number}, -+ {"SctpInCtrlChunks", N_("%llu Number of control chunks received"), number}, -+ {"SctpInOrderChunks", N_("%llu Number of ordered chunks received"), number}, -+ {"SctpInUnorderChunks", N_("%llu Number of Unordered chunks received"), number}, -+ {"SctpFragUsrMsgs", N_("%llu Number of messages fragmented"), number}, -+ {"SctpReasmUsrMsgs", N_("%llu Number of messages reassembled "), number}, -+ {"SctpOutSCTPPacks", N_("%llu Number of SCTP packets sent"), number}, -+ {"SctpInSCTPPacks", N_("%llu Number of SCTP packets received"), number}, -+}; -+ - struct tabtab { - char *title; - struct entry *tab; -@@ -312,6 +333,7 @@ struct tabtab snmptabs[] = - {"Icmp", Icmptab, sizeof(Icmptab), &f_raw}, - {"Tcp", Tcptab, sizeof(Tcptab), &f_tcp}, - {"Udp", Udptab, sizeof(Udptab), &f_udp}, -+ {"Sctp", Sctptab, sizeof(Sctptab), &f_sctp}, - {"TcpExt", Tcpexttab, sizeof(Tcpexttab), &f_tcp}, - {NULL} - }; -@@ -502,11 +524,38 @@ void process6_fd(FILE *f) - - } - --int parsesnmp(int flag_raw, int flag_tcp, int flag_udp) -+/* Process a file with name-value lines (like /proc/net/sctp/snmp) */ -+void process_fd2(FILE *f, const char *filename) -+{ -+ char buf1[1024]; -+ char *sp; -+ struct tabtab *tab; -+ -+ tab = newtable(snmptabs, "Sctp"); -+ -+ while (fgets(buf1, sizeof buf1, f)) { -+ sp = buf1 + strcspn(buf1, " \t\n"); -+ if (!sp) { -+ fprintf(stderr,_("error parsing %s\n"), filename); -+ return; -+ } -+ *sp = '\0'; -+ sp++; -+ -+ sp += strspn(sp, " \t\n"); -+ -+ if (*sp != '\0' && *(tab->flag)) -+ printval(tab, buf1, strtoul(sp, 0, 10)); -+ } -+ return; -+} -+ -+int parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp) -+ - { - FILE *f; - -- f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; -+ f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; f_sctp = flag_sctp; - - f = proc_fopen("/proc/net/snmp"); - if (!f) { -@@ -539,6 +588,17 @@ int parsesnmp(int flag_raw, int flag_tcp - - fclose(f); - } -+ -+ f = proc_fopen("/proc/net/sctp/snmp"); -+ if (f) { -+ process_fd2(f,"/proc/net/sctp/snmp"); -+ if (ferror(f)) { -+ perror("/proc/net/sctp/snmp"); -+ fclose(f); -+ return(1); -+ } -+ } -+ - return(0); - } - diff --git a/net-tools/patches/009-net-tools-ifconfig-long-iface-crasher.patch b/net-tools/patches/009-net-tools-ifconfig-long-iface-crasher.patch deleted file mode 100644 index d1ba07720..000000000 --- a/net-tools/patches/009-net-tools-ifconfig-long-iface-crasher.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up net-tools-2.0/lib/interface.c.long_iface net-tools-2.0/lib/interface.c ---- net-tools-2.0/lib/interface.c.long_iface 2014-11-24 15:09:45.130254503 +0100 -+++ net-tools-2.0/lib/interface.c 2014-11-24 15:10:54.662270496 +0100 -@@ -216,6 +216,7 @@ out: - - static const char *get_name(char **namep, const char *p) - { -+ int count = 0; - while (isspace(*p)) - p++; - char *name = *namep = p; -@@ -224,7 +225,13 @@ static const char *get_name(char **namep - break; - if (*p == ':') { /* could be an alias */ - const char *dot = p++; -- while (*p && isdigit(*p)) p++; -+ count++; -+ while (*p && isdigit(*p)) { -+ p++; -+ count++; -+ if (count == (IFNAMSIZ-1)) -+ break; -+ } - if (*p == ':') { - /* Yes it is, backup and copy it. */ - p = dot; -@@ -240,6 +247,9 @@ static const char *get_name(char **namep - break; - } - *name++ = *p++; -+ count++; -+ if (count == (IFNAMSIZ-1)) -+ break; - } - *name++ = '\0'; - return p; -- 2.30.2

1 0

[PATCH 1/2] mail.cgi: Fixes bug#13040 - Change multipart/mixed to multipart/alternative
by Adolf Belka 20 Feb '23

20 Feb '23

- Thunderbird and Roundcube mail clients presume that any mail with Content Type of multipart/mixed has an attachment included rather than actually checking for disposition attachment. This means that any mail with multipart/mixed gets the attachment icon marked up even though there is no attachment. - Although this is a problem of the clients involved, in this case the simplest solution is to change multipart/mixed to multipart/alternative as the Mail Service test mail only sends text without any attachment or other part. - Confirmed on my vm testbed Fixes: Bug#13040 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- html/cgi-bin/mail.cgi | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index 34f52ae01..0ed3dfeca 100644 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -297,7 +297,7 @@ sub testmail { To => $mail{'RECIPIENT'}, #Cc => 'some(a)other.com, some(a)more.com', Subject => 'IPFire Testmail', - Type => 'multipart/mixed' + Type => 'multipart/alternative' ); ### Add parts (each "attach" has same arguments as "new"): @@ -306,15 +306,6 @@ sub testmail { Data => "This is the IPFire test mail." ); - ### Add attachment for testing - #$msg->attach( - # Type => 'application/txt', - # Encoding => 'base64', - # Path => '/var/ipfire/dma/dma.conf', - # Filename => 'dma.conf', - # Disposition => 'attachment' - #); - $msg->send_by_sendmail; } -- 2.39.2

2 2

[PATCH] net-snmp: Update to 5.9.1
by Stefan Schantl 20 Feb '23

20 Feb '23

* Drop patchset * Drop perl modules * Drop additional script which are related on the SNMP perl modules or depricated ones. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- net-snmp/net-snmp.nm | 48 +- .../patches/net-snmp-5.5-apsl-copying.patch | 354 ---- net-snmp/patches/net-snmp-5.5-dir-fix.patch | 14 - .../patches/net-snmp-5.5-perl-linking.patch | 16 - net-snmp/patches/net-snmp-5.6-multilib.patch | 45 - .../patches/net-snmp-5.6-test-debug.patch | 29 - net-snmp/patches/net-snmp-5.7.2-pie.patch | 24 - net-snmp/patches/net-snmp-5.7.2-systemd.patch | 1650 ----------------- 8 files changed, 21 insertions(+), 2159 deletions(-) delete mode 100644 net-snmp/patches/net-snmp-5.5-apsl-copying.patch delete mode 100644 net-snmp/patches/net-snmp-5.5-dir-fix.patch delete mode 100644 net-snmp/patches/net-snmp-5.5-perl-linking.patch delete mode 100644 net-snmp/patches/net-snmp-5.6-multilib.patch delete mode 100644 net-snmp/patches/net-snmp-5.6-test-debug.patch delete mode 100644 net-snmp/patches/net-snmp-5.7.2-pie.patch delete mode 100644 net-snmp/patches/net-snmp-5.7.2-systemd.patch diff --git a/net-snmp/net-snmp.nm b/net-snmp/net-snmp.nm index 9e86e355d..cd32f28cc 100644 --- a/net-snmp/net-snmp.nm +++ b/net-snmp/net-snmp.nm @@ -4,7 +4,7 @@ ############################################################################### name = net-snmp -version = 5.7.3 +version = 5.9.1 release = 1 groups = Networking/Daemons @@ -28,19 +28,15 @@ build chrpath elfutils-devel lm-sensors-devel >= 3 - openssl-devel - perl(ExtUtils::Embed) + openssl-devel < 3.0.0 procps - python-setuptools - python-devel + python3-devel + python3-setuptools systemd-devel - systemd-units end - PARALLELISMFLAGS = # No parallel build - prepare_cmds - autoreconf -vfi + #autoreconf -vfi end MIBS = host agentx smux \ @@ -64,25 +60,17 @@ build --enable-ucd-snmp-compatibility \ --with-openssl \ --with-pic \ - --enable-embedded-perl \ --enable-as-needed \ - --with-perl-modules="INSTALLDIRS=vendor" \ --enable-mfd-rewrites \ --enable-local-smux \ --with-temp-file-pattern=/var/run/net-snmp/snmp-tmp-XXXXXX \ --with-transports="DTLSUDP TLSTCP" \ --with-security-modules=tsm \ - --with-systemd - - build_cmds - # Remove rpath from compiled perl libs - find perl/blib -type f -name "*.so" -print -exec chrpath --delete {} \; - - # Compile python module - pushd python - %{python} setup.py --basedir=".." build - popd - end + --with-systemd \ + --with-default-snmp-version="3" \ + --without-perl-modules \ + --disable-embedded-perl \ + --with-python-modules install_cmds # Remove stuff we don't want to distribute. @@ -95,11 +83,6 @@ build # Copy missing mib2c.conf files. install -v -m 644 local/mib2c.*.conf %{BUILDROOT}%{datadir}/snmp - # Install python module. - pushd python - %{python} setup.py --basedir=".." install -O1 --skip-build --root %{BUILDROOT} - popd - # Make libs executable. find %{BUILDROOT} -name "*.so" | xargs chmod -v 755 @@ -113,6 +96,17 @@ build # Prepare runtime directories. mkdir -pv %{BUILDROOT}%{localstatedir}/{lib,run}/net-snmp + # Remove scripts in /bin which requires the SNMP + # perl bindings. + rm -rvf %{BUILDROOT}%{bindir}/net-snmp-cert + rm -rvf %{BUILDROOT}%{bindir}/tkmib + rm -rvf %{BUILDROOT}%{bindir}/mib2c + rm -rvf %{BUILDROOT}%{bindir}/snmp-bridge-mib + + # Remove checkbandwidth script + # This uses a deprecated perl module (Mail::Sender) + rm -rvf %{BUILDROOT}%{bindir}/checkbandwidth + # Remove more RPATHs. find %{BUILDROOT}%{bindir} -type f -print \ -exec chrpath --delete {} \; diff --git a/net-snmp/patches/net-snmp-5.5-apsl-copying.patch b/net-snmp/patches/net-snmp-5.5-apsl-copying.patch deleted file mode 100644 index 5ae7ca30c..000000000 --- a/net-snmp/patches/net-snmp-5.5-apsl-copying.patch +++ /dev/null @@ -1,354 +0,0 @@ -Add APSL 2.0 license to the COPYING file. - -There is only one file covered by this license: -net-snmp-5.5/agent/mibgroup/host/data_access/swrun_darwin.c - -This file is not used on Linux at all, it's only present in source -tarball and net-snmp.src.rpm. - -In addition, it's licensed under APSL 1.1, but it allows to relicense -the code to 'any subsequent version of this License published by Apple'. -According to http://fedoraproject.org/wiki/Licensing, APSL ver. 2.0 is -better for us. - -diff -up net-snmp-5.7.3/COPYING.skiFvk net-snmp-5.7.3/COPYING ---- net-snmp-5.7.3/COPYING.skiFvk 2015-02-17 13:33:15.963257594 +0100 -+++ net-snmp-5.7.3/COPYING 2015-02-17 13:33:37.931241818 +0100 -@@ -325,3 +325,337 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEV - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+---- Part 11: APPLE PUBLIC SOURCE LICENSE (APSL 2.0) ---- -+ -+Version 2.0 - August 6, 2003 -+ -+Please read this License carefully before downloading this software. By -+downloading or using this software, you are agreeing to be bound by the terms -+of this License. If you do not or cannot agree to the terms of this License, -+please do not download or use the software. -+ -+Apple Note: In January 2007, Apple changed its corporate name from "Apple -+Computer, Inc." to "Apple Inc." This change has been reflected below and -+copyright years updated, but no other changes have been made to the APSL 2.0. -+ -+1. General; Definitions. This License applies to any program or other -+work which Apple Inc. ("Apple") makes publicly available and which contains a -+notice placed by Apple identifying such program or work as "Original Code" and -+stating that it is subject to the terms of this Apple Public Source License -+version 2.0 ("License"). As used in this License: -+ -+1.1 "Applicable Patent Rights" mean: (a) in the case where Apple is the -+grantor of rights, (i) claims of patents that are now or hereafter acquired, -+owned by or assigned to Apple and (ii) that cover subject matter contained in -+the Original Code, but only to the extent necessary to use, reproduce and/or -+distribute the Original Code without infringement; and (b) in the case where -+You are the grantor of rights, (i) claims of patents that are now or hereafter -+acquired, owned by or assigned to You and (ii) that cover subject matter in -+Your Modifications, taken alone or in combination with Original Code. -+ -+1.2 "Contributor" means any person or entity that creates or contributes to -+the creation of Modifications. -+ -+1.3 "Covered Code" means the Original Code, Modifications, the combination -+of Original Code and any Modifications, and/or any respective portions thereof. -+ -+1.4 "Externally Deploy" means: (a) to sublicense, distribute or otherwise -+make Covered Code available, directly or indirectly, to anyone other than You; -+and/or (b) to use Covered Code, alone or as part of a Larger Work, in any way -+to provide a service, including but not limited to delivery of content, through -+electronic communication with a client other than You. -+ -+1.5 "Larger Work" means a work which combines Covered Code or portions -+thereof with code not governed by the terms of this License. -+ -+1.6 "Modifications" mean any addition to, deletion from, and/or change to, -+the substance and/or structure of the Original Code, any previous -+Modifications, the combination of Original Code and any previous Modifications, -+and/or any respective portions thereof. When code is released as a series of -+files, a Modification is: (a) any addition to or deletion from the contents of -+a file containing Covered Code; and/or (b) any new file or other representation -+of computer program statements that contains any part of Covered Code. -+ -+1.7 "Original Code" means (a) the Source Code of a program or other work as -+originally made available by Apple under this License, including the Source -+Code of any updates or upgrades to such programs or works made available by -+Apple under this License, and that has been expressly identified by Apple as -+such in the header file(s) of such work; and (b) the object code compiled from -+such Source Code and originally made available by Apple under this License -+ -+1.8 "Source Code" means the human readable form of a program or other work -+that is suitable for making modifications to it, including all modules it -+contains, plus any associated interface definition files, scripts used to -+control compilation and installation of an executable (object code). -+ -+1.9 "You" or "Your" means an individual or a legal entity exercising rights -+under this License. For legal entities, "You" or "Your" includes any entity -+which controls, is controlled by, or is under common control with, You, where -+"control" means (a) the power, direct or indirect, to cause the direction or -+management of such entity, whether by contract or otherwise, or (b) ownership -+of fifty percent (50%) or more of the outstanding shares or beneficial -+ownership of such entity. -+ -+2. Permitted Uses; Conditions & Restrictions. Subject to the terms and -+conditions of this License, Apple hereby grants You, effective on the date You -+accept this License and download the Original Code, a world-wide, royalty-free, -+non-exclusive license, to the extent of Apple's Applicable Patent Rights and -+copyrights covering the Original Code, to do the following: -+ -+2.1 Unmodified Code. You may use, reproduce, display, perform, internally -+distribute within Your organization, and Externally Deploy verbatim, unmodified -+copies of the Original Code, for commercial or non-commercial purposes, -+provided that in each instance: -+ -+(a) You must retain and reproduce in all copies of Original Code the -+copyright and other proprietary notices and disclaimers of Apple as they appear -+in the Original Code, and keep intact all notices in the Original Code that -+refer to this License; and -+ -+(b) You must include a copy of this License with every copy of Source Code -+of Covered Code and documentation You distribute or Externally Deploy, and You -+may not offer or impose any terms on such Source Code that alter or restrict -+this License or the recipients' rights hereunder, except as permitted under -+Section 6. -+ -+2.2 Modified Code. You may modify Covered Code and use, reproduce, -+display, perform, internally distribute within Your organization, and -+Externally Deploy Your Modifications and Covered Code, for commercial or -+non-commercial purposes, provided that in each instance You also meet all of -+these conditions: -+ -+(a) You must satisfy all the conditions of Section 2.1 with respect to the -+Source Code of the Covered Code; -+ -+(b) You must duplicate, to the extent it does not already exist, the notice -+in Exhibit A in each file of the Source Code of all Your Modifications, and -+cause the modified files to carry prominent notices stating that You changed -+the files and the date of any change; and -+ -+(c) If You Externally Deploy Your Modifications, You must make Source Code -+of all Your Externally Deployed Modifications either available to those to whom -+You have Externally Deployed Your Modifications, or publicly available. Source -+Code of Your Externally Deployed Modifications must be released under the terms -+set forth in this License, including the license grants set forth in Section 3 -+below, for as long as you Externally Deploy the Covered Code or twelve (12) -+months from the date of initial External Deployment, whichever is longer. You -+should preferably distribute the Source Code of Your Externally Deployed -+Modifications electronically (e.g. download from a web site). -+ -+2.3 Distribution of Executable Versions. In addition, if You Externally -+Deploy Covered Code (Original Code and/or Modifications) in object code, -+executable form only, You must include a prominent notice, in the code itself -+as well as in related documentation, stating that Source Code of the Covered -+Code is available under the terms of this License with information on how and -+where to obtain such Source Code. -+ -+2.4 Third Party Rights. You expressly acknowledge and agree that although -+Apple and each Contributor grants the licenses to their respective portions of -+the Covered Code set forth herein, no assurances are provided by Apple or any -+Contributor that the Covered Code does not infringe the patent or other -+intellectual property rights of any other entity. Apple and each Contributor -+disclaim any liability to You for claims brought by any other entity based on -+infringement of intellectual property rights or otherwise. As a condition to -+exercising the rights and licenses granted hereunder, You hereby assume sole -+responsibility to secure any other intellectual property rights needed, if any. -+For example, if a third party patent license is required to allow You to -+distribute the Covered Code, it is Your responsibility to acquire that license -+before distributing the Covered Code. -+ -+3. Your Grants. In consideration of, and as a condition to, the licenses -+granted to You under this License, You hereby grant to any person or entity -+receiving or distributing Covered Code under this License a non-exclusive, -+royalty-free, perpetual, irrevocable license, under Your Applicable Patent -+Rights and other intellectual property rights (other than patent) owned or -+controlled by You, to use, reproduce, display, perform, modify, sublicense, -+distribute and Externally Deploy Your Modifications of the same scope and -+extent as Apple's licenses under Sections 2.1 and 2.2 above. -+ -+4. Larger Works. You may create a Larger Work by combining Covered Code -+with other code not governed by the terms of this License and distribute the -+Larger Work as a single product. In each such instance, You must make sure the -+requirements of this License are fulfilled for the Covered Code or any portion -+thereof. -+ -+5. Limitations on Patent License. Except as expressly stated in Section -+2, no other patent rights, express or implied, are granted by Apple herein. -+Modifications and/or Larger Works may require additional patent licenses from -+Apple which Apple may grant in its sole discretion. -+ -+6. Additional Terms. You may choose to offer, and to charge a fee for, -+warranty, support, indemnity or liability obligations and/or other rights -+consistent with the scope of the license granted herein ("Additional Terms") to -+one or more recipients of Covered Code. However, You may do so only on Your own -+behalf and as Your sole responsibility, and not on behalf of Apple or any -+Contributor. You must obtain the recipient's agreement that any such Additional -+Terms are offered by You alone, and You hereby agree to indemnify, defend and -+hold Apple and every Contributor harmless for any liability incurred by or -+claims asserted against Apple or such Contributor by reason of any such -+Additional Terms. -+ -+7. Versions of the License. Apple may publish revised and/or new versions -+of this License from time to time. Each version will be given a distinguishing -+version number. Once Original Code has been published under a particular -+version of this License, You may continue to use it under the terms of that -+version. You may also choose to use such Original Code under the terms of any -+subsequent version of this License published by Apple. No one other than Apple -+has the right to modify the terms applicable to Covered Code created under this -+License. -+ -+8. NO WARRANTY OR SUPPORT. The Covered Code may contain in whole or in -+part pre-release, untested, or not fully tested works. The Covered Code may -+contain errors that could cause failures or loss of data, and may be incomplete -+or contain inaccuracies. You expressly acknowledge and agree that use of the -+Covered Code, or any portion thereof, is at Your sole and entire risk. THE -+COVERED CODE IS PROVIDED "AS IS" AND WITHOUT WARRANTY, UPGRADES OR SUPPORT OF -+ANY KIND AND APPLE AND APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS "APPLE" -+FOR THE PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY DISCLAIM -+ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING, BUT NOT -+LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY, OF -+SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY, OF -+QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. APPLE AND EACH -+CONTRIBUTOR DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE -+COVERED CODE, THAT THE FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET YOUR -+REQUIREMENTS, THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED OR -+ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED. NO ORAL OR -+WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE AUTHORIZED -+REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY. You acknowledge -+that the Covered Code is not intended for use in the operation of nuclear -+facilities, aircraft navigation, communication systems, or air traffic control -+machines in which case the failure of the Covered Code could lead to death, -+personal injury, or severe physical or environmental damage. -+ -+9. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO -+EVENT SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL, SPECIAL, -+INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO THIS LICENSE OR -+YOUR USE OR INABILITY TO USE THE COVERED CODE, OR ANY PORTION THEREOF, WHETHER -+UNDER A THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), PRODUCTS -+LIABILITY OR OTHERWISE, EVEN IF APPLE OR SUCH CONTRIBUTOR HAS BEEN ADVISED OF -+THE POSSIBILITY OF SUCH DAMAGES AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL -+PURPOSE OF ANY REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF -+LIABILITY OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT -+APPLY TO YOU. In no event shall Apple's total liability to You for all damages -+(other than as may be required by applicable law) under this License exceed the -+amount of fifty dollars ($50.00). -+ -+10. Trademarks. This License does not grant any rights to use the -+trademarks or trade names "Apple", "Mac", "Mac OS", "QuickTime", "QuickTime -+Streaming Server" or any other trademarks, service marks, logos or trade names -+belonging to Apple (collectively "Apple Marks") or to any trademark, service -+mark, logo or trade name belonging to any Contributor. You agree not to use -+any Apple Marks in or as part of the name of products derived from the Original -+Code or to endorse or promote products derived from the Original Code other -+than as expressly permitted by and in strict compliance at all times with -+Apple's third party trademark usage guidelines which are posted at -+http://www.apple.com/legal/guidelinesfor3rdparties.html. -+ -+11. Ownership. Subject to the licenses granted under this License, each -+Contributor retains all rights, title and interest in and to any Modifications -+made by such Contributor. Apple retains all rights, title and interest in and -+to the Original Code and any Modifications made by or on behalf of Apple -+("Apple Modifications"), and such Apple Modifications will not be automatically -+subject to this License. Apple may, at its sole discretion, choose to license -+such Apple Modifications under this License, or on different terms from those -+contained in this License or may choose not to license them at all. -+ -+12. Termination. -+ -+12.1 Termination. This License and the rights granted hereunder will -+terminate: -+ -+(a) automatically without notice from Apple if You fail to comply with any -+term(s) of this License and fail to cure such breach within 30 days of becoming -+aware of such breach; (b) immediately in the event of the circumstances -+described in Section 13.5(b); or (c) automatically without notice from Apple -+if You, at any time during the term of this License, commence an action for -+patent infringement against Apple; provided that Apple did not first commence -+an action for patent infringement against You in that instance. -+ -+12.2 Effect of Termination. Upon termination, You agree to immediately stop -+any further use, reproduction, modification, sublicensing and distribution of -+the Covered Code. All sublicenses to the Covered Code which have been properly -+granted prior to termination shall survive any termination of this License. -+Provisions which, by their nature, should remain in effect beyond the -+termination of this License shall survive, including but not limited to -+Sections 3, 5, 8, 9, 10, 11, 12.2 and 13. No party will be liable to any other -+for compensation, indemnity or damages of any sort solely as a result of -+terminating this License in accordance with its terms, and termination of this -+License will be without prejudice to any other right or remedy of any party. -+ -+13. Miscellaneous. -+ -+13.1 Government End Users. The Covered Code is a "commercial item" as -+defined in FAR 2.101. Government software and technical data rights in the -+Covered Code include only those rights customarily provided to the public as -+defined in this License. This customary commercial license in technical data -+and software is provided in accordance with FAR 12.211 (Technical Data) and -+12.212 (Computer Software) and, for Department of Defense purchases, DFAR -+252.227-7015 (Technical Data -- Commercial Items) and 227.7202-3 (Rights in -+Commercial Computer Software or Computer Software Documentation). Accordingly, -+all U.S. Government End Users acquire Covered Code with only those rights set -+forth herein. -+ -+13.2 Relationship of Parties. This License will not be construed as -+creating an agency, partnership, joint venture or any other form of legal -+association between or among You, Apple or any Contributor, and You will not -+represent to the contrary, whether expressly, by implication, appearance or -+otherwise. -+ -+13.3 Independent Development. Nothing in this License will impair Apple's -+right to acquire, license, develop, have others develop for it, market and/or -+distribute technology or products that perform the same or similar functions -+as, or otherwise compete with, Modifications, Larger Works, technology or -+products that You may develop, produce, market or distribute. -+ -+13.4 Waiver; Construction. Failure by Apple or any Contributor to enforce -+any provision of this License will not be deemed a waiver of future enforcement -+of that or any other provision. Any law or regulation which provides that the -+language of a contract shall be construed against the drafter will not apply to -+this License. -+ -+13.5 Severability. (a) If for any reason a court of competent jurisdiction -+finds any provision of this License, or portion thereof, to be unenforceable, -+that provision of the License will be enforced to the maximum extent -+permissible so as to effect the economic benefits and intent of the parties, -+and the remainder of this License will continue in full force and effect. (b) -+Notwithstanding the foregoing, if applicable law prohibits or restricts You -+from fully and/or specifically complying with Sections 2 and/or 3 or prevents -+the enforceability of either of those Sections, this License will immediately -+terminate and You must immediately discontinue any use of the Covered Code and -+destroy all copies of it that are in your possession or control. -+ -+13.6 Dispute Resolution. Any litigation or other dispute resolution between -+You and Apple relating to this License shall take place in the Northern -+District of California, and You and Apple hereby consent to the personal -+jurisdiction of, and venue in, the state and federal courts within that -+District with respect to this License. The application of the United Nations -+Convention on Contracts for the International Sale of Goods is expressly -+excluded. -+ -+13.7 Entire Agreement; Governing Law. This License constitutes the entire -+agreement between the parties with respect to the subject matter hereof. This -+License shall be governed by the laws of the United States and the State of -+California, except that body of California law concerning conflicts of law. -+ -+Where You are located in the province of Quebec, Canada, the following clause -+applies: The parties hereby confirm that they have requested that this License -+and all related documents be drafted in English. Les parties ont exige que le -+present contrat et tous les documents connexes soient rediges en anglais. -+ -+EXHIBIT A. -+ -+"Portions Copyright (c) 1999-2007 Apple Inc. All Rights Reserved. -+ -+This file contains Original Code and/or Modifications of Original Code as -+defined in and that are subject to the Apple Public Source License Version 2.0 -+(the 'License'). You may not use this file except in compliance with the -+License. Please obtain a copy of the License at -+http://www.opensource.apple.com/apsl/ and read it before using this file. -+ -+The Original Code and all software distributed under the License are -+distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS -+OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT -+LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -+PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. Please see the License for the -+specific language governing rights and limitations under the License." diff --git a/net-snmp/patches/net-snmp-5.5-dir-fix.patch b/net-snmp/patches/net-snmp-5.5-dir-fix.patch deleted file mode 100644 index b726c4713..000000000 --- a/net-snmp/patches/net-snmp-5.5-dir-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -Let net-snmp-create-v3-user save settings into /etc/ instead of /usr/ - -diff -up net-snmp-5.5/net-snmp-create-v3-user.in.orig net-snmp-5.5/net-snmp-create-v3-user.in ---- net-snmp-5.5/net-snmp-create-v3-user.in.orig 2008-07-22 16:33:25.000000000 +0200 -+++ net-snmp-5.5/net-snmp-create-v3-user.in 2009-09-29 16:30:36.000000000 +0200 -@@ -158,7 +158,7 @@ if test ! -d $outfile ; then - touch $outfile - fi - echo $line >> $outfile --outfile="@datadir@/snmp/snmpd.conf" -+outfile="/etc/snmp/snmpd.conf" - line="$token $user" - echo "adding the following line to $outfile:" - echo " " $line diff --git a/net-snmp/patches/net-snmp-5.5-perl-linking.patch b/net-snmp/patches/net-snmp-5.5-perl-linking.patch deleted file mode 100644 index ceb63630a..000000000 --- a/net-snmp/patches/net-snmp-5.5-perl-linking.patch +++ /dev/null @@ -1,16 +0,0 @@ -554747 - net-snmp-config should not contain perl options - -Remove rpath from net-snmp-config --agent-libs output. - -diff -up net-snmp-5.7/net-snmp-config.in.perl-linking net-snmp-5.7/net-snmp-config.in ---- net-snmp-5.7/net-snmp-config.in.perl-linking 2011-07-02 00:35:46.000000000 +0200 -+++ net-snmp-5.7/net-snmp-config.in 2011-07-07 13:30:01.635798817 +0200 -@@ -50,7 +50,7 @@ NSC_LDFLAGS="@LDFLAGS@" - - NSC_LIBS="@LIBS@" - NSC_LNETSNMPLIBS="@LNETSNMPLIBS@" --NSC_LAGENTLIBS="@LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@" -+NSC_LAGENTLIBS="@LAGENTLIBS@" - NSC_LMIBLIBS="@LMIBLIBS@" - - NSC_INCLUDEDIR=${includedir} diff --git a/net-snmp/patches/net-snmp-5.6-multilib.patch b/net-snmp/patches/net-snmp-5.6-multilib.patch deleted file mode 100644 index 9c12385a1..000000000 --- a/net-snmp/patches/net-snmp-5.6-multilib.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up net-snmp-5.7.3/man/netsnmp_config_api.3.def.oSBcEB net-snmp-5.7.3/man/netsnmp_config_api.3.def ---- net-snmp-5.7.3/man/netsnmp_config_api.3.def.oSBcEB 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/man/netsnmp_config_api.3.def 2015-02-17 13:32:38.903284207 +0100 -@@ -295,7 +295,7 @@ for one particular machine. - .PP - The default list of directories to search is \fC SYSCONFDIR/snmp\fP, - followed by \fC DATADIR/snmp\fP, --followed by \fC LIBDIR/snmp\fP, -+followed by \fC /usr/lib(64)/snmp\fP, - followed by \fC $HOME/.snmp\fP. - This list can be changed by setting the environmental variable - .I SNMPCONFPATH -@@ -365,7 +365,7 @@ function that it should abort the operat - SNMPCONFPATH - A colon separated list of directories to search for configuration - files in. --Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp -+Default: SYSCONFDIR/snmp:DATADIR/snmp:/usr/lib(64)/snmp:$HOME/.snmp - .SH "SEE ALSO" - netsnmp_mib_api(3), snmp_api(3) - .\" Local Variables: -diff -up net-snmp-5.7.3/man/snmp_config.5.def.oSBcEB net-snmp-5.7.3/man/snmp_config.5.def ---- net-snmp-5.7.3/man/snmp_config.5.def.oSBcEB 2015-02-17 13:32:04.251309092 +0100 -+++ net-snmp-5.7.3/man/snmp_config.5.def 2015-02-17 13:33:09.217262438 +0100 -@@ -10,7 +10,7 @@ First off, there are numerous places tha - found and read from. By default, the applications look for - configuration files in the following 4 directories, in order: - SYSCONFDIR/snmp, --DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp. In each of these -+DATADIR/snmp, /usr/lib(64)/snmp, and $HOME/.snmp. In each of these - directories, it looks for files snmp.conf, snmpd.conf and/or - snmptrapd.conf, as well as snmp.local.conf, snmpd.local.conf - and/or snmptrapd.local.conf. *.local.conf are always -diff -up net-snmp-5.7.3/man/snmpd.conf.5.def.oSBcEB net-snmp-5.7.3/man/snmpd.conf.5.def ---- net-snmp-5.7.3/man/snmpd.conf.5.def.oSBcEB 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/man/snmpd.conf.5.def 2015-02-17 13:32:04.251309092 +0100 -@@ -1502,7 +1502,7 @@ filename), and call the initialisation r - .RS - .IP "Note:" - If the specified PATH is not a fully qualified filename, it will --be interpreted relative to LIBDIR/snmp/dlmod, and \fC.so\fR -+be interpreted relative to /usr/lib(64)/snmp/dlmod, and \fC.so\fR - will be appended to the filename. - .RE - .PP diff --git a/net-snmp/patches/net-snmp-5.6-test-debug.patch b/net-snmp/patches/net-snmp-5.6-test-debug.patch deleted file mode 100644 index 4ae97fbee..000000000 --- a/net-snmp/patches/net-snmp-5.6-test-debug.patch +++ /dev/null @@ -1,29 +0,0 @@ -Don't check tests which depend on DNS - it's disabled in Koji - -diff -up net-snmp-5.7.2/testing/fulltests/default/T070com2sec_simple.debug net-snmp-5.7.2/testing/fulltests/default/T070com2sec_simple ---- net-snmp-5.7.2/testing/fulltests/default/T070com2sec_simple.debug 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/testing/fulltests/default/T070com2sec_simple 2012-10-18 10:16:39.276416510 +0200 -@@ -134,6 +134,10 @@ SAVECHECKAGENT '<"c406a", 255.255.255.25 - SAVECHECKAGENT 'line 30: Error:' # msg from h_strerror so it varies - SAVECHECKAGENT 'line 31: Error:' # msg from h_strerror so it varies - -+FINISHED -+ -+# don't test the later, it depends on DNS, which is not available in Koji -+ - CHECKAGENT '<"c408a"' - if [ "$snmp_last_test_result" -eq 0 ] ; then - CHECKAGENT 'line 32: Error:' -diff -up net-snmp-5.7.2/testing/fulltests/default/T071com2sec6_simple.debug net-snmp-5.7.2/testing/fulltests/default/T071com2sec6_simple ---- net-snmp-5.7.2/testing/fulltests/default/T071com2sec6_simple.debug 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/testing/fulltests/default/T071com2sec6_simple 2012-10-18 10:16:39.276416510 +0200 -@@ -132,6 +132,9 @@ SAVECHECKAGENT '<"c606a", ffff:ffff:ffff - SAVECHECKAGENT 'line 27: Error:' - SAVECHECKAGENT 'line 28: Error:' - -+FINISHED -+ -+# don't test the later, it depends on DNS, which is not available in Koji - # 608 - CHECKAGENT '<"c608a"' - if [ "$snmp_last_test_result" -eq 0 ] ; then diff --git a/net-snmp/patches/net-snmp-5.7.2-pie.patch b/net-snmp/patches/net-snmp-5.7.2-pie.patch deleted file mode 100644 index ee02001b3..000000000 --- a/net-snmp/patches/net-snmp-5.7.2-pie.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up net-snmp-5.7.2/agent/Makefile.in.pie net-snmp-5.7.2/agent/Makefile.in ---- net-snmp-5.7.2/agent/Makefile.in.pie 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/agent/Makefile.in 2012-10-18 09:45:13.298613099 +0200 -@@ -294,7 +294,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c - $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? - - snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) -- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} -+ $(LINK) $(CFLAGS) -o $@ -pie ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} - - libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) - $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@ -diff -up net-snmp-5.7.2/apps/Makefile.in.pie net-snmp-5.7.2/apps/Makefile.in ---- net-snmp-5.7.2/apps/Makefile.in.pie 2012-10-10 00:28:58.000000000 +0200 -+++ net-snmp-5.7.2/apps/Makefile.in 2012-10-18 09:44:27.827774580 +0200 -@@ -170,7 +170,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX - $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS} - - snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) -- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS} -+ $(LINK) ${CFLAGS} -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS} - - snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) - $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS} diff --git a/net-snmp/patches/net-snmp-5.7.2-systemd.patch b/net-snmp/patches/net-snmp-5.7.2-systemd.patch deleted file mode 100644 index 4c89d608e..000000000 --- a/net-snmp/patches/net-snmp-5.7.2-systemd.patch +++ /dev/null @@ -1,1650 +0,0 @@ -718183 - Provide native systemd unit file - -Gathered from following upstream git commits and backported to 5.7. - -commit 19499c3c90bf9d7b2b9e5d08baa26cc6bba28a11 -Author: Jan Safranek <jsafranek(a)users.sourceforge.net> -Date: Mon Aug 8 15:48:54 2011 +0200 - - CHANGES: snmpd: integrated with systemd, see README.systemd for details. - - It brings sd-daemon.c and .h directly downloaded from systemd. I've made very - few changes to it to match our NETSNMP_NO_SYSTEMD and include paths. - -commit fef6cddfdb94da1a6b1fb768af62918b80f11fd3 -Author: Jan Safranek <jsafranek(a)users.sourceforge.net> -Date: Mon Aug 8 15:48:54 2011 +0200 - - CHANGES: snmptrapd: integrate systemd notification support. - -commit 0641e43c694c485cbbffef0556efc4641bd3ff50 -Author: Jan Safranek <jsafranek(a)users.sourceforge.net> -Date: Mon Aug 8 15:48:54 2011 +0200 - - Add sd_find_inet_socket() and sd_find_inet_unisx() helpers into - system-specific code. This will help us to find various sockets - created by systemd much easier. - -commit 76530a89f1c8bbd0b63acce63e10d5d4812a1a16 -Author: Jan Safranek <jsafranek(a)users.sourceforge.net> -Date: Mon Aug 8 15:48:54 2011 +0200 - - Check sockets created by systemd when opening new server sockets. - - systemd can pass sockets to our daemons during startup using LISTEN_FDS - environment variable. So check this variable when opening new listening - socket - maybe system has already opened the socket for us. - -commit bf108d7f1354f6276fc43c129963f2c49b9fc242 -Author: Jan Safranek <jsafranek(a)users.sourceforge.net> -Date: Mon Aug 8 15:48:54 2011 +0200 - - Added sample systemd service files. - -commit 884ec488a6596380ba283d707827dd926a52e0b2 -Author: Jan Safranek <jsafranek(a)users.sourceforge.net> -Date: Mon Aug 8 15:48:55 2011 +0200 - - Run autoheader+autoconf. - -commit 86132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0 -Author: Jan Safranek <jsafranek(a)users.sourceforge.net> -Date: Tue Aug 9 10:53:43 2011 +0200 - - Update systemd documentation and samples. - - - add socket unit for snmpd to paralelize boot - - update WantedBy in socket units as recommended by http://0pointer.de/blog/projects/socket-activation.html - - rephrase README.systemd - -diff -up net-snmp-5.7.3/agent/snmpd.c.MPGqYh net-snmp-5.7.3/agent/snmpd.c ---- net-snmp-5.7.3/agent/snmpd.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/agent/snmpd.c 2015-02-17 13:34:05.736221851 +0100 -@@ -164,6 +164,10 @@ typedef long fd_mask; - - #endif - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - netsnmp_feature_want(logging_file) - netsnmp_feature_want(logging_stdio) - netsnmp_feature_want(logging_syslog) -@@ -443,18 +447,26 @@ main(int argc, char *argv[]) - int agent_mode = -1; - char *pid_file = NULL; - char option_compatability[] = "-Le"; -+ int prepared_sockets = 0; - #if HAVE_GETPID - int fd; - FILE *PID; - #endif - - #ifndef WIN32 -+#ifndef NETSNMP_NO_SYSYSTEMD -+ /* check if systemd has sockets for us and don't close them */ -+ prepared_sockets = netsnmp_sd_listen_fds(0); -+#endif /* NETSNMP_NO_SYSYSTEMD */ -+ - /* - * close all non-standard file descriptors we may have - * inherited from the shell. - */ -- for (i = getdtablesize() - 1; i > 2; --i) { -- (void) close(i); -+ if (!prepared_sockets) { -+ for (i = getdtablesize() - 1; i > 2; --i) { -+ (void) close(i); -+ } - } - #endif /* #WIN32 */ - -@@ -1107,6 +1119,19 @@ main(int argc, char *argv[]) - netsnmp_addrcache_initialise(); - - /* -+ * Let systemd know we're up. -+ */ -+#ifndef NETSNMP_NO_SYSTEMD -+ netsnmp_sd_notify(1, "READY=1\n"); -+ if (prepared_sockets) -+ /* -+ * Clear the environment variable, we already processed all the sockets -+ * by now. -+ */ -+ netsnmp_sd_listen_fds(1); -+#endif -+ -+ /* - * Forever monitor the dest_port for incoming PDUs. - */ - DEBUGMSGTL(("snmpd/main", "We're up. Starting to process data.\n")); -diff -up net-snmp-5.7.3/apps/snmptrapd.c.MPGqYh net-snmp-5.7.3/apps/snmptrapd.c ---- net-snmp-5.7.3/apps/snmptrapd.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/apps/snmptrapd.c 2015-02-17 13:34:05.736221851 +0100 -@@ -125,6 +125,10 @@ SOFTWARE. - - #include <net-snmp/net-snmp-features.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - #ifndef BSD4_3 - #define BSD4_2 - #endif -@@ -657,15 +661,22 @@ main(int argc, char *argv[]) - int agentx_subagent = 1; - #endif - netsnmp_trapd_handler *traph; -+ int prepared_sockets = 0; - - - #ifndef WIN32 -+#ifndef NETSNMP_NO_SYSTEMD -+ /* check if systemd has sockets for us and don't close them */ -+ prepared_sockets = netsnmp_sd_listen_fds(0); -+#endif - /* - * close all non-standard file descriptors we may have - * inherited from the shell. - */ -- for (i = getdtablesize() - 1; i > 2; --i) { -- (void) close(i); -+ if (!prepared_sockets) { -+ for (i = getdtablesize() - 1; i > 2; --i) { -+ (void) close(i); -+ } - } - #endif /* #WIN32 */ - -@@ -1318,6 +1329,19 @@ main(int argc, char *argv[]) - #endif - #endif - -+ /* -+ * Let systemd know we're up. -+ */ -+#ifndef NETSNMP_NO_SYSTEMD -+ netsnmp_sd_notify(1, "READY=1\n"); -+ if (prepared_sockets) -+ /* -+ * Clear the environment variable, we already processed all the sockets -+ * by now. -+ */ -+ netsnmp_sd_listen_fds(1); -+#endif -+ - #ifdef WIN32SERVICE - trapd_status = SNMPTRAPD_RUNNING; - #endif -diff -up net-snmp-5.7.3/configure.d/config_modules_lib.MPGqYh net-snmp-5.7.3/configure.d/config_modules_lib ---- net-snmp-5.7.3/configure.d/config_modules_lib.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/configure.d/config_modules_lib 2015-02-17 13:34:05.737221850 +0100 -@@ -53,6 +53,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" - other_ftobjs_list="$other_ftobjs_list winpipe.ft" - fi - -+# Linux systemd -+if test "x$with_systemd" == "xyes"; then -+ other_src_list="$other_src_list sd-daemon.c" -+ other_objs_list="$other_objs_list sd-daemon.o" -+ other_lobjs_list="$other_lobjs_list sd-daemon.lo" -+ other_ftobjs_list="$other_ftobjs_list sd-daemon.ft" -+fi -+ - AC_SUBST(other_src_list) - AC_SUBST(other_objs_list) - AC_SUBST(other_lobjs_list) -diff -up net-snmp-5.7.3/configure.d/config_project_with_enable.MPGqYh net-snmp-5.7.3/configure.d/config_project_with_enable ---- net-snmp-5.7.3/configure.d/config_project_with_enable.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/configure.d/config_project_with_enable 2015-02-17 13:34:05.737221850 +0100 -@@ -690,6 +690,15 @@ if test "x$with_dummy_values" != "xyes"; - data for]) - fi - -+NETSNMP_ARG_WITH(systemd, -+[ --with-systemd Provide systemd support. See README.systemd -+ for details.]) -+# Define unless specifically suppressed (i.e., option defaults to false). -+if test "x$with_systemd" != "xyes"; then -+ AC_DEFINE(NETSNMP_NO_SYSTEMD, 1, -+ [If you don't want to integrate with systemd.]) -+fi -+ - NETSNMP_ARG_ENABLE(set-support, - [ --disable-set-support Do not allow SNMP set requests.]) - if test "x$enable_set_support" = "xno"; then -diff -up net-snmp-5.7.3/configure.MPGqYh net-snmp-5.7.3/configure ---- net-snmp-5.7.3/configure.MPGqYh 2014-12-08 21:23:37.000000000 +0100 -+++ net-snmp-5.7.3/configure 2015-02-17 13:34:05.744221845 +0100 -@@ -951,6 +951,8 @@ with_kmem_usage - enable_kmem_usage - with_dummy_values - enable_dummy_values -+with_systemd -+enable_systemd - enable_set_support - with_set_support - with_sys_contact -@@ -1867,6 +1869,8 @@ Configuring the agent: - This is technically not compliant with the - SNMP specifications, but was how the agent - operated for versions < 4.0. -+ --with-systemd Provide systemd support. See README.systemd -+ for details. - --with-sys-contact="who@where" Default system contact. - (Default: LOGIN@DOMAINNAME) - --with-sys-location="location" Default system location. -@@ -4398,6 +4402,24 @@ $as_echo "#define NETSNMP_NO_DUMMY_VALUE - - fi - -+ -+# Check whether --with-systemd was given. -+if test "${with_systemd+set}" = set; then : -+ withval=$with_systemd; -+fi -+ -+ # Check whether --enable-systemd was given. -+if test "${enable_systemd+set}" = set; then : -+ enableval=$enable_systemd; as_fn_error $? "Invalid option. Use --with-systemd/--without-systemd instead" "$LINENO" 5 -+fi -+ -+# Define unless specifically suppressed (i.e., option defaults to false). -+if test "x$with_systemd" != "xyes"; then -+ -+$as_echo "#define NETSNMP_NO_SYSTEMD 1" >>confdefs.h -+ -+fi -+ - # Check whether --enable-set-support was given. - if test "${enable_set_support+set}" = set; then : - enableval=$enable_set_support; -@@ -18639,6 +18661,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32" - other_ftobjs_list="$other_ftobjs_list winpipe.ft" - fi - -+# Linux systemd -+if test "x$with_systemd" == "xyes"; then -+ other_src_list="$other_src_list sd-daemon.c" -+ other_objs_list="$other_objs_list sd-daemon.o" -+ other_lobjs_list="$other_lobjs_list sd-daemon.lo" -+ other_ftobjs_list="$other_ftobjs_list sd-daemon.ft" -+fi -+ - - - -diff -up net-snmp-5.7.3/dist/snmpd.service.MPGqYh net-snmp-5.7.3/dist/snmpd.service ---- net-snmp-5.7.3/dist/snmpd.service.MPGqYh 2015-02-17 13:34:05.745221844 +0100 -+++ net-snmp-5.7.3/dist/snmpd.service 2015-02-17 13:34:05.745221844 +0100 -@@ -0,0 +1,18 @@ -+# -+# SNMP agent service file for systemd -+# -+# -+# The service should be enabled, i.e. snmpd should start during machine boot. -+# Socket activation shall not be used. See README.systemd for details. -+ -+[Unit] -+Description=Simple Network Management Protocol (SNMP) daemon. -+After=syslog.target network.target -+ -+[Service] -+# Type=notify is also supported. It should be set when snmpd.socket is not used. -+Type=simple -+ExecStart=/usr/sbin/snmpd -f -+ -+[Install] -+WantedBy=multi-user.target -diff -up net-snmp-5.7.3/dist/snmpd.socket.MPGqYh net-snmp-5.7.3/dist/snmpd.socket ---- net-snmp-5.7.3/dist/snmpd.socket.MPGqYh 2015-02-17 13:34:05.745221844 +0100 -+++ net-snmp-5.7.3/dist/snmpd.socket 2015-02-17 13:34:05.745221844 +0100 -@@ -0,0 +1,17 @@ -+[Unit] -+Description=Socket listening for SNMP and AgentX messages -+ -+[Socket] -+ListenDatagram=0.0.0.0:161 -+# Uncomment other listening addresses as needed - TCP, UDP6, TCP6. -+# It must match listening addresses/ports defined in snmpd.service -+# or snmpd.conf. -+# ListenStream=0.0.0.0:161 -+# ListenDatagram=[::]:161 -+# ListenStream=[::]:161 -+# -+# Uncomment AgentX socket if snmpd.conf enables AgentX protocol. -+# ListenStream=/var/agentx/master -+ -+[Install] -+WantedBy=sockets.target -diff -up net-snmp-5.7.3/dist/snmptrapd.service.MPGqYh net-snmp-5.7.3/dist/snmptrapd.service ---- net-snmp-5.7.3/dist/snmptrapd.service.MPGqYh 2015-02-17 13:34:05.745221844 +0100 -+++ net-snmp-5.7.3/dist/snmptrapd.service 2015-02-17 13:34:05.745221844 +0100 -@@ -0,0 +1,16 @@ -+# -+# SNMP trap-processing service file for systemd -+# -+ -+[Unit] -+Description=Simple Network Management Protocol (SNMP) Trap daemon. -+After=syslog.target network.target -+ -+[Service] -+# Type=notify is also supported. It should be set when snmptrapd.socket is not -+# used. -+Type=simple -+ExecStart=/usr/sbin/snmptrapd -f -+ -+[Install] -+WantedBy=multi-user.target -diff -up net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh net-snmp-5.7.3/dist/snmptrapd.socket ---- net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh 2015-02-17 13:34:05.745221844 +0100 -+++ net-snmp-5.7.3/dist/snmptrapd.socket 2015-02-17 13:34:05.745221844 +0100 -@@ -0,0 +1,14 @@ -+[Unit] -+Description=Socket listening for SNMP trap messages -+ -+[Socket] -+ListenDatagram=0.0.0.0:162 -+# Uncomment other listening addresses as needed - TCP, UDP6, TCP6. -+# It must match listening addresses/ports defined in snmptrapd.service -+# or snmptrapd.conf. -+# ListenStream=0.0.0.0:162 -+# ListenDatagram=[::]:162 -+# ListenStream=[::]:162 -+ -+[Install] -+WantedBy=sockets.target -diff -up net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h.MPGqYh net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h ---- net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h.MPGqYh 2015-02-17 13:34:05.746221843 +0100 -+++ net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h 2015-02-17 13:34:05.746221843 +0100 -@@ -0,0 +1,286 @@ -+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -+ -+#ifndef SNMPD_SD_DAEMON_H -+#define SNMPD_SD_DAEMON_H -+ -+/*** -+ Copyright 2010 Lennart Poettering -+ -+ Permission is hereby granted, free of charge, to any person -+ obtaining a copy of this software and associated documentation files -+ (the "Software"), to deal in the Software without restriction, -+ including without limitation the rights to use, copy, modify, merge, -+ publish, distribute, sublicense, and/or sell copies of the Software, -+ and to permit persons to whom the Software is furnished to do so, -+ subject to the following conditions: -+ -+ The above copyright notice and this permission notice shall be -+ included in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ SOFTWARE. -+***/ -+ -+#include <sys/types.h> -+#include <inttypes.h> -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ Reference implementation of a few systemd related interfaces for -+ writing daemons. These interfaces are trivial to implement. To -+ simplify porting we provide this reference implementation. -+ Applications are welcome to reimplement the algorithms described -+ here if they do not want to include these two source files. -+ -+ The following functionality is provided: -+ -+ - Support for logging with log levels on stderr -+ - File descriptor passing for socket-based activation -+ - Daemon startup and status notification -+ - Detection of systemd boots -+ -+ You may compile this with -DDISABLE_SYSTEMD to disable systemd -+ support. This makes all those calls NOPs that are directly related to -+ systemd (i.e. only sd_is_xxx() will stay useful). -+ -+ Since this is drop-in code we don't want any of our symbols to be -+ exported in any case. Hence we declare hidden visibility for all of -+ them. -+ -+ You may find an up-to-date version of these source files online: -+ -+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h -+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c -+ -+ This should compile on non-Linux systems, too, but with the -+ exception of the sd_is_xxx() calls all functions will become NOPs. -+ -+ See sd-daemon(7) for more information. -+*/ -+ -+#ifndef _sd_printf_attr_ -+#if __GNUC__ >= 4 -+#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b))) -+#else -+#define _sd_printf_attr_(a,b) -+#endif -+#endif -+ -+/* -+ Log levels for usage on stderr: -+ -+ fprintf(stderr, SD_NOTICE "Hello World!\n"); -+ -+ This is similar to printk() usage in the kernel. -+*/ -+#define SD_EMERG "<0>" /* system is unusable */ -+#define SD_ALERT "<1>" /* action must be taken immediately */ -+#define SD_CRIT "<2>" /* critical conditions */ -+#define SD_ERR "<3>" /* error conditions */ -+#define SD_WARNING "<4>" /* warning conditions */ -+#define SD_NOTICE "<5>" /* normal but significant condition */ -+#define SD_INFO "<6>" /* informational */ -+#define SD_DEBUG "<7>" /* debug-level messages */ -+ -+/* The first passed file descriptor is fd 3 */ -+#define SD_LISTEN_FDS_START 3 -+ -+/* -+ Returns how many file descriptors have been passed, or a negative -+ errno code on failure. Optionally, removes the $LISTEN_FDS and -+ $LISTEN_PID file descriptors from the environment (recommended, but -+ problematic in threaded environments). If r is the return value of -+ this function you'll find the file descriptors passed as fds -+ SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative -+ errno style error code on failure. This function call ensures that -+ the FD_CLOEXEC flag is set for the passed file descriptors, to make -+ sure they are not passed on to child processes. If FD_CLOEXEC shall -+ not be set, the caller needs to unset it after this call for all file -+ descriptors that are used. -+ -+ See sd_listen_fds(3) for more information. -+*/ -+int netsnmp_sd_listen_fds(int unset_environment); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is a FIFO in the file system stored under the -+ specified path, 0 otherwise. If path is NULL a path name check will -+ not be done and the call only verifies if the file descriptor -+ refers to a FIFO. Returns a negative errno style error code on -+ failure. -+ -+ See sd_is_fifo(3) for more information. -+*/ -+int netsnmp_sd_is_fifo(int fd, const char *path); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is a special character device on the file -+ system stored under the specified path, 0 otherwise. -+ If path is NULL a path name check will not be done and the call -+ only verifies if the file descriptor refers to a special character. -+ Returns a negative errno style error code on failure. -+ -+ See sd_is_special(3) for more information. -+*/ -+int netsnmp_sd_is_special(int fd, const char *path); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is a socket of the specified family (AF_INET, -+ ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If -+ family is 0 a socket family check will not be done. If type is 0 a -+ socket type check will not be done and the call only verifies if -+ the file descriptor refers to a socket. If listening is > 0 it is -+ verified that the socket is in listening mode. (i.e. listen() has -+ been called) If listening is == 0 it is verified that the socket is -+ not in listening mode. If listening is < 0 no listening mode check -+ is done. Returns a negative errno style error code on failure. -+ -+ See sd_is_socket(3) for more information. -+*/ -+int netsnmp_sd_is_socket(int fd, int family, int type, int listening); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is an Internet socket, of the specified family -+ (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM, -+ SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version -+ check is not done. If type is 0 a socket type check will not be -+ done. If port is 0 a socket port check will not be done. The -+ listening flag is used the same way as in sd_is_socket(). Returns a -+ negative errno style error code on failure. -+ -+ See sd_is_socket_inet(3) for more information. -+*/ -+int netsnmp_sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port); -+ -+/* -+ Helper call for identifying a passed file descriptor. Returns 1 if -+ the file descriptor is an AF_UNIX socket of the specified type -+ (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0 -+ a socket type check will not be done. If path is NULL a socket path -+ check will not be done. For normal AF_UNIX sockets set length to -+ 0. For abstract namespace sockets set length to the length of the -+ socket name (including the initial 0 byte), and pass the full -+ socket path in path (including the initial 0 byte). The listening -+ flag is used the same way as in sd_is_socket(). Returns a negative -+ errno style error code on failure. -+ -+ See sd_is_socket_unix(3) for more information. -+*/ -+int netsnmp_sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length); -+ -+/* -+ Informs systemd about changed daemon state. This takes a number of -+ newline separated environment-style variable assignments in a -+ string. The following variables are known: -+ -+ READY=1 Tells systemd that daemon startup is finished (only -+ relevant for services of Type=notify). The passed -+ argument is a boolean "1" or "0". Since there is -+ little value in signaling non-readiness the only -+ value daemons should send is "READY=1". -+ -+ STATUS=... Passes a single-line status string back to systemd -+ that describes the daemon state. This is free-from -+ and can be used for various purposes: general state -+ feedback, fsck-like programs could pass completion -+ percentages and failing programs could pass a human -+ readable error message. Example: "STATUS=Completed -+ 66% of file system check..." -+ -+ ERRNO=... If a daemon fails, the errno-style error code, -+ formatted as string. Example: "ERRNO=2" for ENOENT. -+ -+ BUSERROR=... If a daemon fails, the D-Bus error-style error -+ code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut" -+ -+ MAINPID=... The main pid of a daemon, in case systemd did not -+ fork off the process itself. Example: "MAINPID=4711" -+ -+ Daemons can choose to send additional variables. However, it is -+ recommended to prefix variable names not listed above with X_. -+ -+ Returns a negative errno-style error code on failure. Returns > 0 -+ if systemd could be notified, 0 if it couldn't possibly because -+ systemd is not running. -+ -+ Example: When a daemon finished starting up, it could issue this -+ call to notify systemd about it: -+ -+ sd_notify(0, "READY=1"); -+ -+ See sd_notifyf() for more complete examples. -+ -+ See sd_notify(3) for more information. -+*/ -+int netsnmp_sd_notify(int unset_environment, const char *state); -+ -+/* -+ Similar to sd_notify() but takes a format string. -+ -+ Example 1: A daemon could send the following after initialization: -+ -+ sd_notifyf(0, "READY=1\n" -+ "STATUS=Processing requests...\n" -+ "MAINPID=%lu", -+ (unsigned long) getpid()); -+ -+ Example 2: A daemon could send the following shortly before -+ exiting, on failure: -+ -+ sd_notifyf(0, "STATUS=Failed to start up: %s\n" -+ "ERRNO=%i", -+ strerror(errno), -+ errno); -+ -+ See sd_notifyf(3) for more information. -+*/ -+int netsnmp_sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3); -+ -+/* -+ Returns > 0 if the system was booted with systemd. Returns < 0 on -+ error. Returns 0 if the system was not booted with systemd. Note -+ that all of the functions above handle non-systemd boots just -+ fine. You should NOT protect them with a call to this function. Also -+ note that this function checks whether the system, not the user -+ session is controlled by systemd. However the functions above work -+ for both user and system services. -+ -+ See sd_booted(3) for more information. -+*/ -+int netsnmp_sd_booted(void); -+ -+/** -+ * Find an socket with given parameters. See man sd_is_socket_inet for -+ * description of the arguments. -+ * -+ * Returns the file descriptor if it is found, 0 otherwise. -+ */ -+int netsnmp_sd_find_inet_socket(int family, int type, int listening, int port); -+ -+/** -+ * Find an unix socket with given parameters. See man sd_is_socket_unix for -+ * description of the arguments. -+ * -+ * Returns the file descriptor if it is found, 0 otherwise. -+ */ -+int -+netsnmp_sd_find_unix_socket(int type, int listening, const char *path); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* SNMPD_SD_DAEMON_H */ -diff -up net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in.MPGqYh net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in ---- net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in 2015-02-17 13:34:05.746221843 +0100 -@@ -1410,6 +1410,9 @@ - /* If you don't have root access don't exit upon kmem errors */ - #undef NETSNMP_NO_ROOT_ACCESS - -+/* If you don't want to integrate with systemd. */ -+#undef NETSNMP_NO_SYSTEMD -+ - /* Define if you want to remove all SET/write access from the code */ - #undef NETSNMP_NO_WRITE_SUPPORT - -diff -up net-snmp-5.7.3/README.systemd.MPGqYh net-snmp-5.7.3/README.systemd ---- net-snmp-5.7.3/README.systemd.MPGqYh 2015-02-17 13:34:05.747221843 +0100 -+++ net-snmp-5.7.3/README.systemd 2015-02-17 13:34:05.747221843 +0100 -@@ -0,0 +1,41 @@ -+README.systemd -+-------------- -+Net-SNMP provides two daemons, which support systemd system manager. -+See http://www.freedesktop.org/wiki/Software/systemd to learn how -+systemd works. Both socket activation and notification is supported by these -+daemons. -+ -+To enable systemd support, the sources must be compiled with -+--with-systemd configure option. -+ -+snmpd - The SNMP agent -+---------------------- -+Socket activation od snmpd daemon is implemented, but it's discouraged. -+The reason is simple - snmpd not only listens and processes SNMP requests -+from network, but also gathers system statistics counters, sends traps and -+communicates with subagents. It even opens few netlink sockets. -+ -+In other words, snmpd should run from system start to properly work. -+This can be done in two ways: -+1) either as snmpd service unit with 'Type=notification' and without a socket -+ unit -+2) or as snmpd service unit with 'Type=simple', appropriate socket socket unit -+ and the snmpd service enabled. This way systemd creates the snmpd listening -+ socket early during boot and passes the sockets to snmpd slightly later -+ (but still during machine boot). This way systemd can paralelize start of -+ services, which depend on snmpd. Admins must adjust the socket file manually, -+ depending if the snmpd support AgentX, IPv6, SMUX etc. -+ -+snmpd should be started with '-f' command line parameter to disable forking - -+systemd does that for us automatically. -+ -+ -+snmptrapd - The trap processing daemon -+-------------------------------------- -+snmptrapd supports full socket activation and also notification (if needed). -+Both 'Type=simple' (with appropriate socket unit) and 'Type=notify' services -+will work. Again, '-f' parameter should be provided on snmptrapd command line. -+ -+If integration with SNMP agent using AgentX protocol is enabled, snmptrapd should -+start during boot and not after first SNMP trap arrives. Same rules as for snmpd -+applies then. -\ No newline at end of file -diff -up net-snmp-5.7.3/snmplib/sd-daemon.c.MPGqYh net-snmp-5.7.3/snmplib/sd-daemon.c ---- net-snmp-5.7.3/snmplib/sd-daemon.c.MPGqYh 2015-02-17 13:34:05.747221843 +0100 -+++ net-snmp-5.7.3/snmplib/sd-daemon.c 2015-02-17 13:34:05.747221843 +0100 -@@ -0,0 +1,532 @@ -+/* -+ * Systemd integration parts. -+ * -+ * Most of this file is directly copied from systemd sources. -+ * Changes: -+ * - all functions were renamed to have netsnmp_ prefix -+ * - includes were changed to match Net-SNMP style. -+ * - removed gcc export macros -+ * - removed POSIX message queues -+ */ -+ -+#include <net-snmp/net-snmp-config.h> -+#include <net-snmp/net-snmp-features.h> -+#include <net-snmp/types.h> -+#include <net-snmp/library/snmp_debug.h> -+ -+#ifndef NETSNMP_NO_SYSTEMD -+ -+/*** -+ Copyright 2010 Lennart Poettering -+ -+ Permission is hereby granted, free of charge, to any person -+ obtaining a copy of this software and associated documentation files -+ (the "Software"), to deal in the Software without restriction, -+ including without limitation the rights to use, copy, modify, merge, -+ publish, distribute, sublicense, and/or sell copies of the Software, -+ and to permit persons to whom the Software is furnished to do so, -+ subject to the following conditions: -+ -+ The above copyright notice and this permission notice shall be -+ included in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ SOFTWARE. -+***/ -+ -+#ifndef _GNU_SOURCE -+#define _GNU_SOURCE -+#endif -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <sys/socket.h> -+#include <sys/un.h> -+#include <sys/fcntl.h> -+#include <netinet/in.h> -+#include <stdlib.h> -+#include <errno.h> -+#include <unistd.h> -+#include <string.h> -+#include <stdarg.h> -+#include <stdio.h> -+#include <stddef.h> -+#include <limits.h> -+ -+#include <net-snmp/library/sd-daemon.h> -+ -+int netsnmp_sd_listen_fds(int unset_environment) { -+ -+ int r, fd; -+ const char *e; -+ char *p = NULL; -+ unsigned long l; -+ -+ if (!(e = getenv("LISTEN_PID"))) { -+ r = 0; -+ goto finish; -+ } -+ -+ errno = 0; -+ l = strtoul(e, &p, 10); -+ -+ if (errno != 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ if (!p || *p || l <= 0) { -+ r = -EINVAL; -+ goto finish; -+ } -+ -+ /* Is this for us? */ -+ if (getpid() != (pid_t) l) { -+ r = 0; -+ goto finish; -+ } -+ -+ if (!(e = getenv("LISTEN_FDS"))) { -+ r = 0; -+ goto finish; -+ } -+ -+ errno = 0; -+ l = strtoul(e, &p, 10); -+ -+ if (errno != 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ if (!p || *p) { -+ r = -EINVAL; -+ goto finish; -+ } -+ -+ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) { -+ int flags; -+ -+ if ((flags = fcntl(fd, F_GETFD)) < 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ if (flags & FD_CLOEXEC) -+ continue; -+ -+ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) { -+ r = -errno; -+ goto finish; -+ } -+ } -+ -+ r = (int) l; -+ -+finish: -+ if (unset_environment) { -+ unsetenv("LISTEN_PID"); -+ unsetenv("LISTEN_FDS"); -+ } -+ -+ return r; -+} -+ -+int netsnmp_sd_is_fifo(int fd, const char *path) { -+ struct stat st_fd; -+ -+ if (fd < 0) -+ return -EINVAL; -+ -+ memset(&st_fd, 0, sizeof(st_fd)); -+ if (fstat(fd, &st_fd) < 0) -+ return -errno; -+ -+ if (!S_ISFIFO(st_fd.st_mode)) -+ return 0; -+ -+ if (path) { -+ struct stat st_path; -+ -+ memset(&st_path, 0, sizeof(st_path)); -+ if (stat(path, &st_path) < 0) { -+ -+ if (errno == ENOENT || errno == ENOTDIR) -+ return 0; -+ -+ return -errno; -+ } -+ -+ return -+ st_path.st_dev == st_fd.st_dev && -+ st_path.st_ino == st_fd.st_ino; -+ } -+ -+ return 1; -+} -+ -+int netsnmp_sd_is_special(int fd, const char *path) { -+ struct stat st_fd; -+ -+ if (fd < 0) -+ return -EINVAL; -+ -+ if (fstat(fd, &st_fd) < 0) -+ return -errno; -+ -+ if (!S_ISREG(st_fd.st_mode) && !S_ISCHR(st_fd.st_mode)) -+ return 0; -+ -+ if (path) { -+ struct stat st_path; -+ -+ if (stat(path, &st_path) < 0) { -+ -+ if (errno == ENOENT || errno == ENOTDIR) -+ return 0; -+ -+ return -errno; -+ } -+ -+ if (S_ISREG(st_fd.st_mode) && S_ISREG(st_path.st_mode)) -+ return -+ st_path.st_dev == st_fd.st_dev && -+ st_path.st_ino == st_fd.st_ino; -+ else if (S_ISCHR(st_fd.st_mode) && S_ISCHR(st_path.st_mode)) -+ return st_path.st_rdev == st_fd.st_rdev; -+ else -+ return 0; -+ } -+ -+ return 1; -+} -+ -+static int sd_is_socket_internal(int fd, int type, int listening) { -+ struct stat st_fd; -+ -+ if (fd < 0 || type < 0) -+ return -EINVAL; -+ -+ if (fstat(fd, &st_fd) < 0) -+ return -errno; -+ -+ if (!S_ISSOCK(st_fd.st_mode)) -+ return 0; -+ -+ if (type != 0) { -+ int other_type = 0; -+ socklen_t l = sizeof(other_type); -+ -+ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0) -+ return -errno; -+ -+ if (l != sizeof(other_type)) -+ return -EINVAL; -+ -+ if (other_type != type) -+ return 0; -+ } -+ -+ if (listening >= 0) { -+ int accepting = 0; -+ socklen_t l = sizeof(accepting); -+ -+ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0) -+ return -errno; -+ -+ if (l != sizeof(accepting)) -+ return -EINVAL; -+ -+ if (!accepting != !listening) -+ return 0; -+ } -+ -+ return 1; -+} -+ -+union sockaddr_union { -+ struct sockaddr sa; -+ struct sockaddr_in in4; -+ struct sockaddr_in6 in6; -+ struct sockaddr_un un; -+ struct sockaddr_storage storage; -+}; -+ -+int netsnmp_sd_is_socket(int fd, int family, int type, int listening) { -+ int r; -+ -+ if (family < 0) -+ return -EINVAL; -+ -+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) -+ return r; -+ -+ if (family > 0) { -+ union sockaddr_union sockaddr; -+ socklen_t l; -+ -+ memset(&sockaddr, 0, sizeof(sockaddr)); -+ l = sizeof(sockaddr); -+ -+ if (getsockname(fd, &sockaddr.sa, &l) < 0) -+ return -errno; -+ -+ if (l < sizeof(sa_family_t)) -+ return -EINVAL; -+ -+ return sockaddr.sa.sa_family == family; -+ } -+ -+ return 1; -+} -+ -+int netsnmp_sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) { -+ union sockaddr_union sockaddr; -+ socklen_t l; -+ int r; -+ -+ if (family != 0 && family != AF_INET && family != AF_INET6) -+ return -EINVAL; -+ -+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) -+ return r; -+ -+ memset(&sockaddr, 0, sizeof(sockaddr)); -+ l = sizeof(sockaddr); -+ -+ if (getsockname(fd, &sockaddr.sa, &l) < 0) -+ return -errno; -+ -+ if (l < sizeof(sa_family_t)) -+ return -EINVAL; -+ -+ if (sockaddr.sa.sa_family != AF_INET && -+ sockaddr.sa.sa_family != AF_INET6) -+ return 0; -+ -+ if (family > 0) -+ if (sockaddr.sa.sa_family != family) -+ return 0; -+ -+ if (port > 0) { -+ if (sockaddr.sa.sa_family == AF_INET) { -+ if (l < sizeof(struct sockaddr_in)) -+ return -EINVAL; -+ -+ return htons(port) == sockaddr.in4.sin_port; -+ } else { -+ if (l < sizeof(struct sockaddr_in6)) -+ return -EINVAL; -+ -+ return htons(port) == sockaddr.in6.sin6_port; -+ } -+ } -+ -+ return 1; -+} -+ -+int netsnmp_sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) { -+ union sockaddr_union sockaddr; -+ socklen_t l; -+ int r; -+ -+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) -+ return r; -+ -+ memset(&sockaddr, 0, sizeof(sockaddr)); -+ l = sizeof(sockaddr); -+ -+ if (getsockname(fd, &sockaddr.sa, &l) < 0) -+ return -errno; -+ -+ if (l < sizeof(sa_family_t)) -+ return -EINVAL; -+ -+ if (sockaddr.sa.sa_family != AF_UNIX) -+ return 0; -+ -+ if (path) { -+ if (length <= 0) -+ length = strlen(path); -+ -+ if (length <= 0) -+ /* Unnamed socket */ -+ return l == offsetof(struct sockaddr_un, sun_path); -+ -+ if (path[0]) -+ /* Normal path socket */ -+ return -+ (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) && -+ memcmp(path, sockaddr.un.sun_path, length+1) == 0; -+ else -+ /* Abstract namespace socket */ -+ return -+ (l == offsetof(struct sockaddr_un, sun_path) + length) && -+ memcmp(path, sockaddr.un.sun_path, length) == 0; -+ } -+ -+ return 1; -+} -+ -+int netsnmp_sd_notify(int unset_environment, const char *state) { -+ int fd = -1, r; -+ struct msghdr msghdr; -+ struct iovec iovec; -+ union sockaddr_union sockaddr; -+ const char *e; -+ -+ if (!state) { -+ r = -EINVAL; -+ goto finish; -+ } -+ -+ if (!(e = getenv("NOTIFY_SOCKET"))) -+ return 0; -+ -+ /* Must be an abstract socket, or an absolute path */ -+ if ((e[0] != '@' && e[0] != '/') || e[1] == 0) { -+ r = -EINVAL; -+ goto finish; -+ } -+ -+ if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ memset(&sockaddr, 0, sizeof(sockaddr)); -+ sockaddr.sa.sa_family = AF_UNIX; -+ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path)); -+ -+ if (sockaddr.un.sun_path[0] == '@') -+ sockaddr.un.sun_path[0] = 0; -+ -+ memset(&iovec, 0, sizeof(iovec)); -+ iovec.iov_base = (char *)state; -+ iovec.iov_len = strlen(state); -+ -+ memset(&msghdr, 0, sizeof(msghdr)); -+ msghdr.msg_name = &sockaddr; -+ msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e); -+ -+ if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) -+ msghdr.msg_namelen = sizeof(struct sockaddr_un); -+ -+ msghdr.msg_iov = &iovec; -+ msghdr.msg_iovlen = 1; -+ -+ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { -+ r = -errno; -+ goto finish; -+ } -+ -+ r = 1; -+ -+finish: -+ if (unset_environment) -+ unsetenv("NOTIFY_SOCKET"); -+ -+ if (fd >= 0) -+ close(fd); -+ -+ return r; -+} -+ -+int netsnmp_sd_notifyf(int unset_environment, const char *format, ...) { -+ va_list ap; -+ char *p = NULL; -+ int r; -+ -+ va_start(ap, format); -+ r = vasprintf(&p, format, ap); -+ va_end(ap); -+ -+ if (r < 0 || !p) -+ return -ENOMEM; -+ -+ r = netsnmp_sd_notify(unset_environment, p); -+ free(p); -+ -+ return r; -+} -+ -+int netsnmp_sd_booted(void) { -+ struct stat a, b; -+ -+ /* We simply test whether the systemd cgroup hierarchy is -+ * mounted */ -+ -+ if (lstat("/sys/fs/cgroup", &a) < 0) -+ return 0; -+ -+ if (lstat("/sys/fs/cgroup/systemd", &b) < 0) -+ return 0; -+ -+ return a.st_dev != b.st_dev; -+} -+ -+/* End of original sd-daemon.c from systemd sources */ -+ -+int -+netsnmp_sd_find_inet_socket(int family, int type, int listening, int port) -+{ -+ int count, fd; -+ -+ count = netsnmp_sd_listen_fds(0); -+ if (count <= 0) { -+ DEBUGMSGTL(("systemd:find_inet_socket", "No LISTEN_FDS found.\n")); -+ return 0; -+ } -+ DEBUGMSGTL(("systemd:find_inet_socket", "LISTEN_FDS reports %d sockets.\n", -+ count)); -+ -+ for (fd = 3; fd < 3+count; fd++) { -+ int rc = netsnmp_sd_is_socket_inet(fd, family, type, listening, port); -+ if (rc < 0) -+ DEBUGMSGTL(("systemd:find_inet_socket", -+ "sd_is_socket_inet error: %d\n", rc)); -+ if (rc > 0) { -+ DEBUGMSGTL(("systemd:find_inet_socket", -+ "Found the socket in LISTEN_FDS\n")); -+ return fd; -+ } -+ } -+ DEBUGMSGTL(("systemd:find_inet_socket", "Socket not found in LISTEN_FDS\n")); -+ return 0; -+} -+ -+int -+netsnmp_sd_find_unix_socket(int type, int listening, const char *path) -+{ -+ int count, fd; -+ -+ count = netsnmp_sd_listen_fds(0); -+ if (count <= 0) { -+ DEBUGMSGTL(("systemd:find_unix_socket", "No LISTEN_FDS found.\n")); -+ return 0; -+ } -+ DEBUGMSGTL(("systemd:find_unix_socket", "LISTEN_FDS reports %d sockets.\n", -+ count)); -+ -+ for (fd = 3; fd < 3+count; fd++) { -+ int rc = netsnmp_sd_is_socket_unix(fd, type, listening, path, 0); -+ if (rc < 0) -+ DEBUGMSGTL(("systemd:find_unix_socket", -+ "netsnmp_sd_is_socket_unix error: %d\n", rc)); -+ if (rc > 0) { -+ DEBUGMSGTL(("systemd:find_unix_socket", -+ "Found the socket in LISTEN_FDS\n")); -+ return fd; -+ } -+ } -+ DEBUGMSGTL(("systemd:find_unix_socket", "Socket not found in LISTEN_FDS\n")); -+ return 0; -+} -+ -+#endif /* ! NETSNMP_NO_SYSTEMD */ -diff -up net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c ---- net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c 2015-02-17 13:34:05.748221842 +0100 -@@ -43,6 +43,10 @@ - #include <net-snmp/library/snmpTCPBaseDomain.h> - #include <net-snmp/library/tools.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - /* - * needs to be in sync with the definitions in snmplib/snmpUDPDomain.c - * and perl/agent/agent.xs -@@ -149,6 +153,7 @@ netsnmp_tcp_transport(struct sockaddr_in - netsnmp_transport *t = NULL; - netsnmp_udp_addr_pair *addr_pair = NULL; - int rc = 0; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - if (local) -@@ -178,7 +183,19 @@ netsnmp_tcp_transport(struct sockaddr_in - t->domain_length = - sizeof(netsnmp_snmpTCPDomain) / sizeof(netsnmp_snmpTCPDomain[0]); - -- t->sock = socket(PF_INET, SOCK_STREAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_inet_socket(PF_INET, SOCK_STREAM, 1, -+ ntohs(addr->sin_port)); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_INET, SOCK_STREAM, 0); - if (t->sock < 0) { - netsnmp_transport_free(t); - return NULL; -@@ -215,11 +232,13 @@ netsnmp_tcp_transport(struct sockaddr_in - setsockopt(t->sock, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, - sizeof(opt)); - -- rc = bind(t->sock, (struct sockaddr *)addr, sizeof(struct sockaddr)); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = bind(t->sock, (struct sockaddr *)addr, sizeof(struct sockaddr)); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - - /* -@@ -235,12 +254,13 @@ netsnmp_tcp_transport(struct sockaddr_in - /* - * Now sit here and wait for connections to arrive. - */ -- -- rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - - /* -diff -up net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c ---- net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c 2015-02-17 13:34:05.748221842 +0100 -@@ -49,6 +49,10 @@ - #include <net-snmp/library/snmpTCPBaseDomain.h> - #include <net-snmp/library/tools.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - #include "inet_ntop.h" - - oid netsnmp_TCPIPv6Domain[] = { TRANSPORT_DOMAIN_TCP_IPV6 }; -@@ -140,6 +144,7 @@ netsnmp_tcp6_transport(struct sockaddr_i - { - netsnmp_transport *t = NULL; - int rc = 0; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - if (local) -@@ -174,7 +179,19 @@ netsnmp_tcp6_transport(struct sockaddr_i - t->domain = netsnmp_TCPIPv6Domain; - t->domain_length = sizeof(netsnmp_TCPIPv6Domain) / sizeof(oid); - -- t->sock = socket(PF_INET6, SOCK_STREAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_inet_socket(PF_INET6, SOCK_STREAM, 1, -+ ntohs(addr->sin6_port)); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_INET6, SOCK_STREAM, 0); - if (t->sock < 0) { - netsnmp_transport_free(t); - return NULL; -@@ -220,12 +237,14 @@ netsnmp_tcp6_transport(struct sockaddr_i - - setsockopt(t->sock, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeof(opt)); - -- rc = bind(t->sock, (struct sockaddr *) addr, -- sizeof(struct sockaddr_in6)); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = bind(t->sock, (struct sockaddr *) addr, -+ sizeof(struct sockaddr_in6)); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - - /* -@@ -242,11 +261,13 @@ netsnmp_tcp6_transport(struct sockaddr_i - * Now sit here and wait for connections to arrive. - */ - -- rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - - /* -diff -up net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c ---- net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c 2015-02-17 13:36:22.744123462 +0100 -@@ -40,6 +40,10 @@ - - #include <net-snmp/library/snmpSocketBaseDomain.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - #if defined(HAVE_IP_PKTINFO) || defined(HAVE_IP_RECVDSTADDR) - int netsnmp_udpipv4_recvfrom(int s, void *buf, int len, struct sockaddr *from, - socklen_t *fromlen, struct sockaddr *dstip, -@@ -64,6 +68,7 @@ netsnmp_udpipv4base_transport(struct soc - char *client_socket = NULL; - netsnmp_indexed_addr_pair addr_pair; - socklen_t local_addr_len; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - if (local) -@@ -88,7 +93,20 @@ netsnmp_udpipv4base_transport(struct soc - free(str); - } - -- t->sock = socket(PF_INET, SOCK_DGRAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_inet_socket(PF_INET, SOCK_DGRAM, -1, -+ ntohs(addr->sin_port)); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_INET, SOCK_DGRAM, 0); -+ - DEBUGMSGTL(("UDPBase", "openned socket %d as local=%d\n", t->sock, local)); - if (t->sock < 0) { - netsnmp_transport_free(t); -@@ -151,12 +169,14 @@ netsnmp_udpipv4base_transport(struct soc - } - } - #endif /* !defined(WIN32) */ -- rc = bind(t->sock, (struct sockaddr *) addr, -- sizeof(struct sockaddr)); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = bind(t->sock, (struct sockaddr *) addr, -+ sizeof(struct sockaddr)); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - t->data = NULL; - t->data_length = 0; -diff -up net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c ---- net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c 2015-02-17 13:37:16.256087147 +0100 -@@ -67,6 +67,10 @@ static const struct in6_addr in6addr_any - #include <net-snmp/library/snmpSocketBaseDomain.h> - #include <net-snmp/library/tools.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - #include "inet_ntop.h" - #include "inet_pton.h" - -@@ -190,6 +194,7 @@ netsnmp_udp6_transport(struct sockaddr_i - { - netsnmp_transport *t = NULL; - int rc = 0; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - if (local) -@@ -217,7 +222,19 @@ netsnmp_udp6_transport(struct sockaddr_i - t->domain_length = - sizeof(netsnmp_UDPIPv6Domain) / sizeof(netsnmp_UDPIPv6Domain[0]); - -- t->sock = socket(PF_INET6, SOCK_DGRAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_inet_socket(PF_INET6, SOCK_DGRAM, -1, -+ ntohs(addr->sin6_port)); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_INET6, SOCK_DGRAM, 0); - if (t->sock < 0) { - netsnmp_transport_free(t); - return NULL; -@@ -242,13 +259,14 @@ netsnmp_udp6_transport(struct sockaddr_i - } - } - #endif -- -- rc = bind(t->sock, (struct sockaddr *) addr, -- sizeof(struct sockaddr_in6)); -- if (rc != 0) { -- netsnmp_socketbase_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = bind(t->sock, (struct sockaddr *) addr, -+ sizeof(struct sockaddr_in6)); -+ if (rc != 0) { -+ netsnmp_socketbase_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } - t->local = (unsigned char*)malloc(18); - if (t->local == NULL) { -diff -up net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c.MPGqYh net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c ---- net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c.MPGqYh 2014-12-08 21:23:22.000000000 +0100 -+++ net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c 2015-02-17 13:34:05.749221841 +0100 -@@ -37,6 +37,10 @@ - #include <net-snmp/library/system.h> /* mkdirhier */ - #include <net-snmp/library/tools.h> - -+#ifndef NETSNMP_NO_SYSTEMD -+#include <net-snmp/library/sd-daemon.h> -+#endif -+ - netsnmp_feature_child_of(transport_unix_socket_all, transport_all) - netsnmp_feature_child_of(unix_socket_paths, transport_unix_socket_all) - -@@ -295,6 +299,7 @@ netsnmp_unix_transport(struct sockaddr_u - netsnmp_transport *t = NULL; - sockaddr_un_pair *sup = NULL; - int rc = 0; -+ int socket_initialized = 0; - - #ifdef NETSNMP_NO_LISTEN_SUPPORT - /* SPECIAL CIRCUMSTANCE: We still want AgentX to be able to operate, -@@ -333,7 +338,18 @@ netsnmp_unix_transport(struct sockaddr_u - t->data_length = sizeof(sockaddr_un_pair); - sup = (sockaddr_un_pair *) t->data; - -- t->sock = socket(PF_UNIX, SOCK_STREAM, 0); -+#ifndef NETSNMP_NO_SYSTEMD -+ /* -+ * Maybe the socket was already provided by systemd... -+ */ -+ if (local) { -+ t->sock = netsnmp_sd_find_unix_socket(SOCK_STREAM, 1, addr->sun_path); -+ if (t->sock) -+ socket_initialized = 1; -+ } -+#endif -+ if (!socket_initialized) -+ t->sock = socket(PF_UNIX, SOCK_STREAM, 0); - if (t->sock < 0) { - netsnmp_transport_free(t); - return NULL; -@@ -357,25 +373,26 @@ netsnmp_unix_transport(struct sockaddr_u - - t->flags |= NETSNMP_TRANSPORT_FLAG_LISTEN; - -- unlink(addr->sun_path); -- rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); -- -- if (rc != 0 && errno == ENOENT && create_path) { -- rc = mkdirhier(addr->sun_path, create_mode, 1); -+ if (!socket_initialized) { -+ unlink(addr->sun_path); -+ rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); -+ if (rc != 0 && errno == ENOENT && create_path) { -+ rc = mkdirhier(addr->sun_path, create_mode, 1); -+ if (rc != 0) { -+ netsnmp_unix_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } -+ rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); -+ } - if (rc != 0) { -+ DEBUGMSGTL(("netsnmp_unix_transport", -+ "couldn't bind \"%s\", errno %d (%s)\n", -+ addr->sun_path, errno, strerror(errno))); - netsnmp_unix_close(t); - netsnmp_transport_free(t); - return NULL; - } -- rc = bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); -- } -- if (rc != 0) { -- DEBUGMSGTL(("netsnmp_unix_transport", -- "couldn't bind \"%s\", errno %d (%s)\n", -- addr->sun_path, errno, strerror(errno))); -- netsnmp_unix_close(t); -- netsnmp_transport_free(t); -- return NULL; - } - - /* -@@ -391,16 +408,17 @@ netsnmp_unix_transport(struct sockaddr_u - * Now sit here and listen for connections to arrive. - */ - -- rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -- if (rc != 0) { -- DEBUGMSGTL(("netsnmp_unix_transport", -- "couldn't listen to \"%s\", errno %d (%s)\n", -- addr->sun_path, errno, strerror(errno))); -- netsnmp_unix_close(t); -- netsnmp_transport_free(t); -- return NULL; -+ if (!socket_initialized) { -+ rc = listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); -+ if (rc != 0) { -+ DEBUGMSGTL(("netsnmp_unix_transport", -+ "couldn't listen to \"%s\", errno %d (%s)\n", -+ addr->sun_path, errno, strerror(errno))); -+ netsnmp_unix_close(t); -+ netsnmp_transport_free(t); -+ return NULL; -+ } - } -- - } else { - t->remote = (u_char *)malloc(strlen(addr->sun_path)); - if (t->remote == NULL) { -- 2.30.2

3 5

[PATCH] pam: Update to 1.5.2
by Stefan Schantl 20 Feb '23

20 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- pam/pam.nm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pam/pam.nm b/pam/pam.nm index facedb378..de24a97fb 100644 --- a/pam/pam.nm +++ b/pam/pam.nm @@ -4,8 +4,8 @@ ############################################################################### name = pam -version = 1.3.0 -release = 2 +version = 1.5.2 +release = 1 thisapp = Linux-PAM-%{version} groups = System/Base @@ -19,10 +19,8 @@ description having to recompile programs that handle authentication. end -# This is the old location that might be revived in future -# source_dl = http://ftp.us.kernel.org/pub/linux/libs/pam/library/ - -source_dl = http://www.linux-pam.org/library/ +source_dl = https://github.com/linux-pam/linux-pam/releases/download/v%{version}/ +sources = %{thisapp}.tar.xz build requires -- 2.30.2

1 0

[PATCH] clamav: Update to 1.0.1
by Matthias Fischer 20 Feb '23

20 Feb '23

For details see: https://blog.clamav.net/2023/02/clamav-01038-01052-and-101-patch.html "ClamAV 1.0.1 is a critical patch release with the following fixes: CVE-2023-20032: Fixed a possible remote code execution vulnerability in the HFS+ file parser. The issue affects versions 1.0.0 and earlier, 0.105.1 and earlier, and 0.103.7 and earlier. Thank you to Simon Scannell for reporting this issue. CVE-2023-20052: Fixed a possible remote information leak vulnerability in the DMG file parser. The issue affects versions 1.0.0 and earlier, 0.105.1 and earlier, and 0.103.7 and earlier. Thank you to Simon Scannell for reporting this issue. Fix an allmatch detection issue with the preclass bytecode hook." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/clamav | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/clamav b/lfs/clamav index 24c13f00b..426321c05 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -26,7 +26,7 @@ include Config SUMMARY = Antivirus Toolkit -VER = 1.0.0 +VER = 1.0.1 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 64 +PAK_VER = 65 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 62d00a9ceb1849d1517f34194daaa3bb8bbc904e81e3a20791cf0b5f557587cc497e23feb38cdfbb8b152446821eb20d9a4bce18a0c83d1c31474bfed9944c69 +$(DL_FILE)_BLAKE2 = 8f216051eeb94a9196849c9edff2fe0c73e4aa3ca242cf72d91c1692eb2a4688f8e525f638b6870a2f934976435a4272a1f116c1cf3a7cfd194efa91f11fd135 install : $(TARGET) -- 2.34.1

2 1

[PATCH] jose: New package
by Stefan Schantl 20 Feb '23

20 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- jose/jose.nm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 jose/jose.nm diff --git a/jose/jose.nm b/jose/jose.nm new file mode 100644 index 000000000..d5eea5194 --- /dev/null +++ b/jose/jose.nm @@ -0,0 +1,63 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = jose +version = 11 +release = 1 + +groups = System/Libraries +url = https://github.com/latchset/jose +license = ASL 2.0 +summary = Tools for JSON Object Signing and Encryption (JOSE). + +description + Jose is a command line utility for performing various tasks on JSON + Object Signing and Encryption (JOSE) objects. Jose provides a full + crypto stack including key generation, signing and encryption. +end + +source_dl = https://github.com/latchset/%{name}/releases/download/v%{version}/ +sources = %{thisapp}.tar.xz + +build + requires + ninja + meson + asciidoc + jansson-devel + openssl-devel + zlib-devel + end + + build + %{meson} + + %{meson_build} + end + + test + %{meson_test} + end + + install + %{meson_install} + end +end + +packages + package %{name} + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end -- 2.30.2

1 0

[PATCH] chrony: Update to 4.3
by Stefan Schantl 20 Feb '23

20 Feb '23

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- chrony/chrony.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrony/chrony.nm b/chrony/chrony.nm index a0e073db7..10d6a4942 100644 --- a/chrony/chrony.nm +++ b/chrony/chrony.nm @@ -4,7 +4,7 @@ ############################################################################### name = chrony -version = 3.4 +version = 4.3 release = 1 groups = System/Daemons -- 2.30.2

1 0

[PATCH] QMI: Disable raw_ip mode before assigning the new MAC.
by Stefan Schantl 20 Feb '23

20 Feb '23

To assign a MAC address, the device must not be in the raw_ip mode. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/initscripts/networking/functions.network | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/initscripts/networking/functions.network b/src/initscripts/networking/functions.network index 36541eb13..0e2e5009e 100644 --- a/src/initscripts/networking/functions.network +++ b/src/initscripts/networking/functions.network @@ -273,6 +273,10 @@ qmi_assign_address() { # Find the device local device="$(qmi_find_device "${intf}")" + # Switch off the raw_ip mode to be able to proper + # assign the generated MAC address. + echo "N" > "/sys/class/net/${intf}/qmi/raw_ip" + local address # Generate a "random" MAC address using the device number -- 2.30.2

1 0

[PATCH] monit: Update to 5.33.0
by Matthias Fischer 18 Feb '23

18 Feb '23

For details see: https://mmonit.com/monit/changes/ "New: Added click-jacking protection headers to Monit HTTP GUI (the SAMEORIGIN iframe is allowed). Fixed: Issue #1035: If the start, stop or restart program statement contains the equal sign, which is not followed by a space character, the configuration is not parsed correctly. Fixed: Issue #1047: If the MariaDB server doesn't allow access to the host, from which Monit test is running, Monit reported: Invalid handshake packet sequence id -- not MySQL protocol. Fixed: Add the missing responsetime option to the ping test." For more details see: https://bitbucket.org/tildeslash/monit/commits/tag/release-5-33-0 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/monit | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lfs/monit b/lfs/monit index 4793129e4..d243be460 100644 --- a/lfs/monit +++ b/lfs/monit @@ -24,7 +24,7 @@ include Config -VER = 5.32.0 +VER = 5.33.0 SUMMARY = Utility for monitoring services on a Unix system THISAPP = monit-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 20 +PAK_VER = 21 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 48b824365dca349914ffc066a19758f23fee122fb29b1aed5cecad6f97799a987752e3e59cbed488282738c755fdf4d7c95dbe85069f2e070c28f03a324e0a7f +$(DL_FILE)_BLAKE2 = 770474f010067fe6388622e764a0d032495589dad24873dabd87ab0aa8edcff34d7a014a72c1c05aaa47104b12daf3dc542aa1d2d823d267814c9b5fd139e747 install : $(TARGET) @@ -90,6 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -p /var/lib/monit + # Install backup include file install -v -m 644 $(DIR_SRC)/config/backup/includes/monit \ /var/ipfire/backup/addons/includes/monit @@ -99,7 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #install initscripts $(call INSTALL_INITSCRIPTS,$(SERVICES)) - # Install start links and backup include file. + # Install start links ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit ln -sf ../init.d/monit /etc/rc.d/rc0.d/K40monit ln -sf ../init.d/monit /etc/rc.d/rc6.d/K40monit -- 2.34.1

1 0

[PATCH] bind: Update to 9.16.38
by Matthias Fischer 17 Feb '23

17 Feb '23

For details see: https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html#notes-f… "Notes for BIND 9.16.38 Bug Fixes A constant stream of zone additions and deletions via rndc reconfig could cause increased memory consumption due to delayed cleaning of view memory. This has been fixed. [GL #3801] The speed of the message digest algorithms (MD5, SHA-1, SHA-2), and of NSEC3 hashing, has been improved. [GL #3795] Building BIND 9 failed when the --enable-dnsrps switch for ./configure was used. This has been fixed. [GL #3827]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/bind | 14 +++++++------- lfs/bind | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index b926495d3..49a56107e 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -271,24 +271,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.37.so +usr/lib/libbind9-9.16.38.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.37.so +usr/lib/libdns-9.16.38.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.37.so +usr/lib/libirs-9.16.38.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.37.so +usr/lib/libisc-9.16.38.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.37.so +usr/lib/libisccc-9.16.38.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.37.so +usr/lib/libisccfg-9.16.38.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.37.so +usr/lib/libns-9.16.38.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/lfs/bind b/lfs/bind index 4ecceda97..6782ab24a 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.37 +VER = 9.16.38 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb +$(DL_FILE)_BLAKE2 = af74f3867837741102f9e1b9eb0fa44948131fc2122a5ea6a707b92408604d62f95350ff561ec98787ce516c96ef971b1a03d775aaba99ebc4ea334cd9800ed2 install : $(TARGET) -- 2.34.1

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development February 2023