Hello community,
here is the log from the commit of package rp-pppoe for openSUSE:Factory checked in at 2019-06-26 16:01:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rp-pppoe (Old)
and /work/SRC/openSUSE:Factory/.rp-pppoe.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rp-pppoe"
Wed Jun 26 16:01:36 2019 rev:25 rq:710299 version:3.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/rp-pppoe/rp-pppoe.changes 2018-03-13 10:22:42.884616100 +0100
+++ /work/SRC/openSUSE:Factory/.rp-pppoe.new.4615/rp-pppoe.changes 2019-06-26 16:01:37.715428585 +0200
@@ -1,0 +2,16 @@
+Mon Jun 17 07:50:57 UTC 2019 - Илья Индиго
+
+- Refresh spec-file via spec-cleaner and manual optimisations.
+ * New URL and Source project.
+ * Add pkgconfig for BuildRequires.
+- Update rp-pppoe to version 3.13.
+ * Fix potential use-after-free bug.
+ * Properly detecte kernel-mode PPPoE.
+
+-------------------------------------------------------------------
+Wed Jun 12 14:56:41 UTC 2019 - Dominique Leuenberger
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+ shortcut the build queues by allowing usage of systemd-mini
+
+-------------------------------------------------------------------
Old:
----
rp-pppoe-3.12.tar.gz
New:
----
rp-pppoe-3.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rp-pppoe.spec ++++++
--- /var/tmp/diff_new_pack.LlZBiP/_old 2019-06-26 16:01:39.987431730 +0200
+++ /var/tmp/diff_new_pack.LlZBiP/_new 2019-06-26 16:01:40.019431775 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rp-pppoe
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,20 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%define _name pppoe
%define _group dialout
Name: rp-%{_name}
-Version: 3.12
+Version: 3.13
Release: 0
Summary: A PPP Over Ethernet Redirector for PPPD
License: GPL-2.0-or-later
Group: Productivity/Networking/PPP
-URL: https://www.roaringpenguin.com/products/pppoe
-Source0: https://www.roaringpenguin.com/files/download/%{name}-%{version}.tar.gz
+URL: https://dianne.skoll.ca/projects/%{name}
+Source0: https://dianne.skoll.ca/projects/%{name}/download/%{name}-%{version}.tar.gz
Source1: %{_name}-connect
Source2: %{_name}-setup
Source3: %{_name}-start
@@ -40,8 +41,9 @@
Patch5: %{name}-3.10-init.patch
Patch6: %{name}-pie.patch
Patch7: strip.diff
+BuildRequires: pkgconfig
BuildRequires: ppp
-BuildRequires: systemd
+BuildRequires: pkgconfig(systemd)
Requires: net-tools
Requires: ppp
Requires(post): permissions
++++++ rp-pppoe-3.12.tar.gz -> rp-pppoe-3.13.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/doc/CHANGES new/rp-pppoe-3.13/doc/CHANGES
--- old/rp-pppoe-3.12/doc/CHANGES 2015-11-11 16:10:00.000000000 +0100
+++ new/rp-pppoe-3.13/doc/CHANGES 2018-11-25 23:25:28.000000000 +0100
@@ -1,4 +1,14 @@
# LIC: GPL
+
+Changes from version 3.12 to 3.13:
+
+- Release 3.13 (2018-11-25)
+
+- Fix potential use-after-free bug
+
+- Properly detecte kernel-mode PPPoE; fix compilation problems on
+ Debian Jessie and Debian Stretch.
+
Changes from version 3.11 to 3.12:
- Update author's name to "Dianne Skoll"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/rp-pppoe.spec new/rp-pppoe-3.13/rp-pppoe.spec
--- old/rp-pppoe-3.12/rp-pppoe.spec 2015-11-11 16:09:58.000000000 +0100
+++ new/rp-pppoe-3.13/rp-pppoe.spec 2018-11-25 23:25:28.000000000 +0100
@@ -1,6 +1,6 @@
Summary: PPP Over Ethernet (xDSL support)
Name: rp-pppoe
-Version: 3.12
+Version: 3.13
%if %(%{expand:test %{_vendor} != mandrake ; echo $?})
Release: 1mdk
%else
@@ -8,7 +8,7 @@
%endif
License: GPL
Group: System Environment/Daemons
-Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-3.12.tar.gz
+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-3.13.tar.gz
Url: http://www.roaringpenguin.com/pppoe/
Packager: Dianne Skoll
BuildRoot: /tmp/pppoe-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/Makefile.in new/rp-pppoe-3.13/src/Makefile.in
--- old/rp-pppoe-3.12/src/Makefile.in 2015-11-11 16:10:02.000000000 +0100
+++ new/rp-pppoe-3.13/src/Makefile.in 2018-11-25 23:25:28.000000000 +0100
@@ -16,7 +16,7 @@
#***********************************************************************
# Version is set ONLY IN THE MAKEFILE! Don't delete this!
-VERSION=3.12
+VERSION=3.13
DEFINES=
prefix=@prefix@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/common.c new/rp-pppoe-3.13/src/common.c
--- old/rp-pppoe-3.12/src/common.c 2015-11-11 16:10:03.000000000 +0100
+++ new/rp-pppoe-3.13/src/common.c 2018-11-25 23:25:28.000000000 +0100
@@ -15,13 +15,9 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
/* For vsnprintf prototype */
#define _ISOC99_SOURCE 1
-
-/* For seteuid prototype */
-#define _BSD_SOURCE 1
+#define _GNU_SOURCE 1
#include "pppoe.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/configure new/rp-pppoe-3.13/src/configure
--- old/rp-pppoe-3.12/src/configure 2015-11-11 16:10:03.000000000 +0100
+++ new/rp-pppoe-3.13/src/configure 2018-11-25 23:25:28.000000000 +0100
@@ -674,6 +674,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -747,6 +748,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -999,6 +1001,15 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1136,7 +1147,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1289,6 +1300,7 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -4555,8 +4567,6 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include
-#include
-#include
#include
#include
int main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/configure.in new/rp-pppoe-3.13/src/configure.in
--- old/rp-pppoe-3.12/src/configure.in 2015-11-11 16:10:03.000000000 +0100
+++ new/rp-pppoe-3.13/src/configure.in 2018-11-25 23:25:28.000000000 +0100
@@ -166,8 +166,6 @@
modprobe pppoe > /dev/null 2>&1
fi
AC_TRY_RUN([#include
-#include
-#include
#include
#include
int main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/debug.c new/rp-pppoe-3.13/src/debug.c
--- old/rp-pppoe-3.12/src/debug.c 2015-11-11 16:10:03.000000000 +0100
+++ new/rp-pppoe-3.13/src/debug.c 2018-11-25 23:25:28.000000000 +0100
@@ -15,9 +15,6 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#include "pppoe.h"
#ifdef DEBUGGING_ENABLED
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/discovery.c new/rp-pppoe-3.13/src/discovery.c
--- old/rp-pppoe-3.12/src/discovery.c 2015-11-11 16:10:03.000000000 +0100
+++ new/rp-pppoe-3.13/src/discovery.c 2018-11-25 23:25:28.000000000 +0100
@@ -10,8 +10,6 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
#define _GNU_SOURCE 1
#include "pppoe.h"
@@ -472,8 +470,8 @@
if (!packetIsForMe(conn, &packet)) continue;
if (packet.code == CODE_PADO) {
- if (NOT_UNICAST(packet.ethHdr.h_source)) {
- printErr("Ignoring PADO packet from non-unicast MAC address");
+ if (BROADCAST(packet.ethHdr.h_source)) {
+ printErr("Ignoring PADO packet from broadcast MAC address");
continue;
}
#ifdef PLUGIN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/if.c new/rp-pppoe-3.13/src/if.c
--- old/rp-pppoe-3.12/src/if.c 2015-11-11 16:10:03.000000000 +0100
+++ new/rp-pppoe-3.13/src/if.c 2018-11-25 23:25:28.000000000 +0100
@@ -15,10 +15,12 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#include "pppoe.h"
+#if defined(HAVE_LINUX_IF_H)
+#include
+#elif defined(HAVE_NET_IF_H)
+#include
+#endif
#ifdef HAVE_UNISTD_H
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/libevent/event.c new/rp-pppoe-3.13/src/libevent/event.c
--- old/rp-pppoe-3.12/src/libevent/event.c 2015-11-11 16:10:04.000000000 +0100
+++ new/rp-pppoe-3.13/src/libevent/event.c 2018-11-25 23:25:28.000000000 +0100
@@ -14,9 +14,6 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#include "event.h"
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/libevent/event_sig.c new/rp-pppoe-3.13/src/libevent/event_sig.c
--- old/rp-pppoe-3.12/src/libevent/event_sig.c 2015-11-11 16:10:05.000000000 +0100
+++ new/rp-pppoe-3.13/src/libevent/event_sig.c 2018-11-25 23:25:28.000000000 +0100
@@ -14,11 +14,7 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#define _POSIX_SOURCE 1 /* For sigaction defines */
-#define _BSD_SOURCE 1 /* For SA_RESTART */
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/libevent/event_tcp.c new/rp-pppoe-3.13/src/libevent/event_tcp.c
--- old/rp-pppoe-3.12/src/libevent/event_tcp.c 2015-11-11 16:10:05.000000000 +0100
+++ new/rp-pppoe-3.13/src/libevent/event_tcp.c 2018-11-25 23:25:28.000000000 +0100
@@ -11,9 +11,6 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#include "event_tcp.h"
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/libevent/hash.c new/rp-pppoe-3.13/src/libevent/hash.c
--- old/rp-pppoe-3.12/src/libevent/hash.c 2015-11-11 16:10:05.000000000 +0100
+++ new/rp-pppoe-3.13/src/libevent/hash.c 2018-11-25 23:25:28.000000000 +0100
@@ -14,9 +14,6 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#include "hash.h"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/plugin.c new/rp-pppoe-3.13/src/plugin.c
--- old/rp-pppoe-3.12/src/plugin.c 2015-11-11 16:10:04.000000000 +0100
+++ new/rp-pppoe-3.13/src/plugin.c 2018-11-25 23:25:28.000000000 +0100
@@ -24,9 +24,6 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#define _GNU_SOURCE 1
#include "pppoe.h"
@@ -42,6 +39,11 @@
#include
#include
#include
+#if defined(HAVE_LINUX_IF_H)
+#include
+#elif defined(HAVE_NET_IF_H)
+#include
+#endif
#include
#include
#include
@@ -53,6 +55,8 @@
#include
#include
#include
+#if 0
+#endif
#ifndef _ROOT_PATH
#define _ROOT_PATH ""
@@ -322,10 +326,8 @@
}
close(conn->sessionSocket);
close(conn->discoverySocket);
- if (conn->ifName) {
- free(conn->ifName);
- }
- free(conn);
+
+ /* Do NOT free conn; if pppd persist is on, we'll need it again */
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/ppp.c new/rp-pppoe-3.13/src/ppp.c
--- old/rp-pppoe-3.12/src/ppp.c 2015-11-11 16:10:04.000000000 +0100
+++ new/rp-pppoe-3.13/src/ppp.c 2018-11-25 23:25:28.000000000 +0100
@@ -15,9 +15,6 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#include "pppoe.h"
#ifdef HAVE_SYSLOG_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/pppoe-server.c new/rp-pppoe-3.13/src/pppoe-server.c
--- old/rp-pppoe-3.12/src/pppoe-server.c 2015-11-11 16:10:04.000000000 +0100
+++ new/rp-pppoe-3.13/src/pppoe-server.c 2018-11-25 23:25:28.000000000 +0100
@@ -15,17 +15,19 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#include "config.h"
+#include
+#if defined(HAVE_LINUX_IF_H)
+#include
+#elif defined(HAVE_NET_IF_H)
+#include
+#endif
+
#if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H)
#define _POSIX_SOURCE 1 /* For sigaction defines */
#endif
-#define _BSD_SOURCE 1 /* for gethostname */
-
#include "pppoe-server.h"
#include "md5.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/pppoe-sniff.c new/rp-pppoe-3.13/src/pppoe-sniff.c
--- old/rp-pppoe-3.12/src/pppoe-sniff.c 2015-11-11 16:10:04.000000000 +0100
+++ new/rp-pppoe-3.13/src/pppoe-sniff.c 2018-11-25 23:25:28.000000000 +0100
@@ -14,9 +14,6 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#include "pppoe.h"
#ifdef HAVE_GETOPT_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/pppoe.c new/rp-pppoe-3.13/src/pppoe.c
--- old/rp-pppoe-3.12/src/pppoe.c 2015-11-11 16:10:04.000000000 +0100
+++ new/rp-pppoe-3.13/src/pppoe.c 2018-11-25 23:25:28.000000000 +0100
@@ -13,9 +13,6 @@
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#include "pppoe.h"
#ifdef HAVE_SYSLOG_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/pppoe.h new/rp-pppoe-3.13/src/pppoe.h
--- old/rp-pppoe-3.12/src/pppoe.h 2015-11-11 16:10:04.000000000 +0100
+++ new/rp-pppoe-3.13/src/pppoe.h 2018-11-25 23:25:28.000000000 +0100
@@ -51,13 +51,6 @@
#include
#endif
-/* Ugly header files on some Linux boxes... */
-#if defined(HAVE_LINUX_IF_H)
-#include
-#elif defined(HAVE_NET_IF_H)
-#include
-#endif
-
#ifdef HAVE_NET_IF_TYPES_H
#include
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rp-pppoe-3.12/src/relay.c new/rp-pppoe-3.13/src/relay.c
--- old/rp-pppoe-3.12/src/relay.c 2015-11-11 16:10:04.000000000 +0100
+++ new/rp-pppoe-3.13/src/relay.c 2018-11-25 23:25:28.000000000 +0100
@@ -14,14 +14,17 @@
* $Id$
*
***********************************************************************/
-static char const RCSID[] =
-"$Id$";
-
#define _GNU_SOURCE 1 /* For SA_RESTART */
+#include "config.h"
-#include "relay.h"
-
+#include
+#if defined(HAVE_LINUX_IF_H)
+#include
+#elif defined(HAVE_NET_IF_H)
+#include
+#endif
#include
+#include "relay.h"
#ifdef HAVE_SYSLOG_H
#include
@@ -1107,9 +1110,9 @@
acIndex = iface - Interfaces;
/* Source address must be unicast */
- if (NOT_UNICAST(packet->ethHdr.h_source)) {
+ if (BROADCAST(packet->ethHdr.h_source)) {
syslog(LOG_ERR,
- "PADO packet from %02x:%02x:%02x:%02x:%02x:%02x on interface %s not from a unicast address",
+ "PADO packet from %02x:%02x:%02x:%02x:%02x:%02x on interface %s from a broadcast address",
packet->ethHdr.h_source[0],
packet->ethHdr.h_source[1],
packet->ethHdr.h_source[2],