summaryrefslogtreecommitdiff
path: root/source/n
diff options
context:
space:
mode:
Diffstat (limited to 'source/n')
-rw-r--r--source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch100
-rwxr-xr-xsource/n/rp-pppoe/rp-pppoe.SlackBuild7
-rw-r--r--source/n/rp-pppoe/slack-desc2
-rw-r--r--source/n/samba/samba.url4
4 files changed, 6 insertions, 107 deletions
diff --git a/source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch b/source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch
deleted file mode 100644
index 2b26edac..00000000
--- a/source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -up rp-pppoe-3.12/src/if.c.than rp-pppoe-3.12/src/if.c
---- rp-pppoe-3.12/src/if.c.than 2017-07-25 11:04:53.780466912 +0200
-+++ rp-pppoe-3.12/src/if.c 2017-07-25 11:05:35.951885962 +0200
-@@ -20,6 +20,12 @@ static char const RCSID[] =
-
- #include "pppoe.h"
-
-+#if defined(HAVE_LINUX_IF_H)
-+#include <linux/if.h>
-+#elif defined(HAVE_NET_IF_H)
-+#include <net/if.h>
-+#endif
-+
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-diff -up rp-pppoe-3.12/src/plugin.c.than rp-pppoe-3.12/src/plugin.c
---- rp-pppoe-3.12/src/plugin.c.than 2017-07-25 11:05:50.145353868 +0200
-+++ rp-pppoe-3.12/src/plugin.c 2017-07-25 11:07:00.068732535 +0200
-@@ -49,6 +49,11 @@ static char const RCSID[] =
- #include <unistd.h>
- #include <fcntl.h>
- #include <signal.h>
-+#if defined(HAVE_LINUX_IF_H)
-+#include <linux/if.h>
-+#elif defined(HAVE_NET_IF_H)
-+#include <net/if.h>
-+#endif
- #include <net/ethernet.h>
- #include <net/if_arp.h>
- #include <linux/ppp_defs.h>
-diff -up rp-pppoe-3.12/src/pppoe.h.than rp-pppoe-3.12/src/pppoe.h
---- rp-pppoe-3.12/src/pppoe.h.than 2017-07-25 11:07:38.141305245 +0200
-+++ rp-pppoe-3.12/src/pppoe.h 2017-07-25 11:08:34.409195838 +0200
-@@ -51,13 +51,6 @@ extern int IsSetID;
- #include <sys/socket.h>
- #endif
-
--/* Ugly header files on some Linux boxes... */
--#if defined(HAVE_LINUX_IF_H)
--#include <linux/if.h>
--#elif defined(HAVE_NET_IF_H)
--#include <net/if.h>
--#endif
--
- #ifdef HAVE_NET_IF_TYPES_H
- #include <net/if_types.h>
- #endif
-@@ -136,9 +129,6 @@ typedef unsigned long UINT32_t;
- #ifdef HAVE_NETINET_IF_ETHER_H
- #include <sys/types.h>
-
--#ifdef HAVE_SYS_SOCKET_H
--#include <sys/socket.h>
--#endif
- #ifndef HAVE_SYS_DLPI_H
- #include <netinet/if_ether.h>
- #endif
-diff -up rp-pppoe-3.12/src/pppoe-server.c.than rp-pppoe-3.12/src/pppoe-server.c
---- rp-pppoe-3.12/src/pppoe-server.c.than 2017-07-25 11:08:51.505554918 +0200
-+++ rp-pppoe-3.12/src/pppoe-server.c 2017-07-25 11:09:59.230016098 +0200
-@@ -26,6 +26,13 @@ static char const RCSID[] =
-
- #define _BSD_SOURCE 1 /* for gethostname */
-
-+#include <sys/socket.h>
-+#if defined(HAVE_LINUX_IF_H)
-+#include <linux/if.h>
-+#elif defined(HAVE_NET_IF_H)
-+#include <net/if.h>
-+#endif
-+
- #include "pppoe-server.h"
- #include "md5.h"
-
-diff -up rp-pppoe-3.12/src/relay.c.than rp-pppoe-3.12/src/relay.c
---- rp-pppoe-3.12/src/relay.c.than 2017-07-25 11:10:13.863467871 +0200
-+++ rp-pppoe-3.12/src/relay.c 2017-07-25 11:11:17.747074537 +0200
-@@ -18,11 +18,19 @@ static char const RCSID[] =
- "$Id$";
-
- #define _GNU_SOURCE 1 /* For SA_RESTART */
--
--#include "relay.h"
-+#include "config.h"
-
- #include <signal.h>
-
-+#include <sys/socket.h>
-+#if defined(HAVE_LINUX_IF_H)
-+#include <linux/if.h>
-+#elif defined(HAVE_NET_IF_H)
-+#include <net/if.h>
-+#endif
-+
-+#include "relay.h"
-+
- #ifdef HAVE_SYSLOG_H
- #include <syslog.h>
- #endif
diff --git a/source/n/rp-pppoe/rp-pppoe.SlackBuild b/source/n/rp-pppoe/rp-pppoe.SlackBuild
index f3b95e11..81305d79 100755
--- a/source/n/rp-pppoe/rp-pppoe.SlackBuild
+++ b/source/n/rp-pppoe/rp-pppoe.SlackBuild
@@ -23,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rp-pppoe
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -63,7 +63,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf rp-pppoe-$VERSION
-tar xvf $CWD/rp-pppoe-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/rp-pppoe-$VERSION.tar.?z || exit 1
cd rp-pppoe-$VERSION || exit 1
chown -R root:root .
find . \
@@ -76,7 +76,6 @@ zcat $CWD/rp-pppoe-3.12-ip-allocation.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/rp-pppoe-3.12-plugin.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/rp-pppoe-3.12-pluginpath.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/rp-pppoe-manpages.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/rp-pppoe-3.12-bz1469960-new-kernel-header.patch.gz | patch -p1 --verbose || exit 1
cd src
diff --git a/source/n/rp-pppoe/slack-desc b/source/n/rp-pppoe/slack-desc
index 4ae51c3f..92175c00 100644
--- a/source/n/rp-pppoe/slack-desc
+++ b/source/n/rp-pppoe/slack-desc
@@ -16,4 +16,4 @@ rp-pppoe: The client is a user-mode program and does not require any kernel
rp-pppoe: modifications. It is fully compliant with RFC 2516, the official
rp-pppoe: PPPoE specification.
rp-pppoe:
-rp-pppoe:
+rp-pppoe: Homepage: https://www.roaringpenguin.com/products/pppoe
diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url
index 7e3058c8..43840994 100644
--- a/source/n/samba/samba.url
+++ b/source/n/samba/samba.url
@@ -1,2 +1,2 @@
-https://download.samba.org/pub/samba/stable/samba-4.9.2.tar.gz
-https://download.samba.org/pub/samba/stable/samba-4.9.2.tar.asc
+https://download.samba.org/pub/samba/stable/samba-4.9.3.tar.gz
+https://download.samba.org/pub/samba/stable/samba-4.9.3.tar.asc