updated 2 packages

libcgroup-0.42.2-1

ppp-2.4.8-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12341 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libc/libcgroup/libcgroup-vl.spec

@@ -1,11 +1,11 @@
-%define soversion 1.0.41
+%define soversion 1.0.42
 %define soversion_major 1
 
 Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Summary(ja): CGROUPS を管理・監視するためのツールおよびライブラリ
-Version: 0.41
-Release: 2%{?_dist_release}
+Version: 0.42.2
+Release: 1%{?_dist_release}
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -13,28 +13,15 @@ Vendor: Project Vine
 Distribution: Vine Linux
 
 URL: http://libcg.sourceforge.net/
-Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
+Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-v%{version}.tar.gz
 
 Patch1: libcgroup-0.37-chmod.patch
 Patch2: libcgroup-0.40.rc1-coverity.patch
 Patch3: libcgroup-0.40.rc1-fread.patch
 Patch4: libcgroup-0.40.rc1-templates-fix.patch
-Patch5: libcgroup-0.41-lex.patch
-Patch6: libcgroup-0.41-api.c-support-for-setting-multiline-values-in-contro.patch
-# resolves #1348874
-Patch7: libcgroup-0.41-api.c-fix-order-of-memory-subsystem-parameters.patch
-# resolves #1384504
-Patch8: libcgroup-0.41-api.c-preserve-dirty-flag.patch
-Patch9: libcgroup-0.41-change-cgroup-of-threads.patch
-Patch10: libcgroup-0.41-fix-infinite-loop.patch
-Patch11: libcgroup-0.41-prevent-buffer-overflow.patch
-Patch12: libcgroup-0.41-tasks-file-warning.patch
-Patch13: libcgroup-0.41-fix-log-level.patch
-Patch14: libcgroup-0.41-size-of-controller-values.patch
-Patch15: libcgroup-0.41-CVE-2018-14348.patch
 
 Patch1000: 0001-modify-configurations.patch
-Patch1001: 0002-fixed-initscripts.patch
+Patch1001: 0002-fix-initscripts.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pam-devel
@@ -71,7 +58,10 @@ future allow creation of persistent configuration for control groups and
 provide scripts to manage that configuration.
 
 %prep
-%autosetup -p1
+%setup -q -n %{name}-%{version}
+%autopatch -p1
+
+autoreconf -vif
 
 %build
 %configure --bindir=/bin --sbindir=/sbin --libdir=%{_libdir} --enable-initscript-install --enable-pam-module-dir=/%{_lib}/security
@@ -101,7 +91,9 @@ mv -f $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_li
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so.%{soversion_major}
 ln -sf libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_lib}/libcgroup.so.%{soversion_major}
 ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libcgroupfortesting.*
+rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.a
 
 # pre-create /cgroup directory
 mkdir $RPM_BUILD_ROOT/cgroup
@@ -170,6 +162,12 @@ fi
 %license COPYING
 
 %changelog
+* Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.42.2-1
+- new upstream release.
+- dropped Patch1-15.
+- imported Patch1-4 from rawhide.
+- updated Patch1001.
+
 * Thu May 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.41-2
 - updated Patch1000: add line for systemd-container.
 

p/ppp/ppp-vl.spec

@@ -5,13 +5,18 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Summary(ja): PPP (Point-to-Point Protocol) デーモン
 Name: ppp
-Version: 2.4.7
-Release: 4%{?_dist_release}
-License: BSD and LGPLv2+ and GPLv2+ and Public Domain
+Version: 2.4.8
+Release: 1%{?_dist_release}
 Group: System Environment/Daemons
-URL: http://www.samba.org/ppp
 
-Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
+License: BSD and LGPLv2+ and GPLv2+ and Public Domain
+URL: https://github.com/paulusmack/ppp
+
+Source0: https://github.com/paulusmack/ppp/archive/ppp-%{version}.tar.gz
 Source1: ppp-pam.conf
 Source2: ppp-logrotate.conf
 Source3: ppp-tmpfiles.conf
@@ -26,37 +31,34 @@ Source11: ifdown-ppp
 Source12: ppp-watch.tar.xz
 
 # Fedora-specific
-Patch0001: 0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
-Patch0002: 0002-build-sys-enable-PAM-support.patch
-Patch0003: 0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
-Patch0004: 0004-doc-add-configuration-samples.patch
-Patch0005: 0005-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
-Patch0006: 0006-scritps-use-change_resolv_conf-function.patch
-Patch0007: 0007-build-sys-don-t-strip-binaries-during-installation.patch
-Patch0008: 0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
-Patch0009: 0009-pppd-introduce-ipv6-accept-remote.patch
-Patch0010: 0010-build-sys-enable-CBCP.patch
-Patch0011: 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
-Patch0012: 0012-pppd-we-don-t-want-to-accidentally-leak-fds.patch
-Patch0013: 0013-everywhere-O_CLOEXEC-harder.patch
-Patch0014: 0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
-Patch0015: 0015-pppd-move-pppd-database-to-var-run-ppp.patch
-Patch0016: 0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
-Patch0018: 0018-scritps-fix-ip-up.local-sample.patch
-Patch0019: 0019-sys-linux-rework-get_first_ethernet.patch
-Patch0020: 0020-pppd-put-lock-files-in-var-lock-ppp.patch
-Patch0021: 0021-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
-Patch0022: 0022-build-sys-compile-pppol2tp-with-multilink-support.patch
-Patch0023: 0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
-Patch0024: 0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
-Patch0025: 0025-pppd-install-pppd-binary-using-standard-perms-755.patch
-Patch0026: ppp-2.4.7-eaptls-mppe-1.102.patch
-Patch0028: 0028-pppoe-include-netinet-in.h-before-linux-in.h.patch
-
-# rhbz#1556132
-Patch0029: ppp-2.4.7-DES-openssl.patch
-# https://github.com/paulusmack/ppp/pull/95
-Patch0030: ppp-2.4.7-honor-ldflags.patch
+Patch0001:      0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
+Patch0002:      ppp-2.4.8-build-sys-enable-PAM-support.patch
+Patch0003:      ppp-2.4.8-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
+Patch0004:      0004-doc-add-configuration-samples.patch
+Patch0005:      ppp-2.4.8-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
+Patch0006:      0006-scritps-use-change_resolv_conf-function.patch
+Patch0007:      0007-build-sys-don-t-strip-binaries-during-installation.patch
+Patch0008:      0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
+Patch0009:      ppp-2.4.8-pppd-introduce-ipv6-accept-remote.patch
+Patch0010:      0010-build-sys-enable-CBCP.patch
+Patch0011:      0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
+Patch0012:      ppp-2.4.8-pppd-we-don-t-want-to-accidentally-leak-fds.patch
+Patch0013:      ppp-2.4.8-everywhere-O_CLOEXEC-harder.patch
+Patch0014:      0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
+Patch0015:      0015-pppd-move-pppd-database-to-var-run-ppp.patch
+Patch0016:      0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
+Patch0018:      0018-scritps-fix-ip-up.local-sample.patch
+Patch0019:      ppp-2.4.8-sys-linux-rework-get_first_ethernet.patch
+Patch0020:      0020-pppd-put-lock-files-in-var-lock-ppp.patch
+Patch0021:      ppp-2.4.8-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
+Patch0022:      ppp-2.4.8-build-sys-compile-pppol2tp-with-multilink-support.patch
+Patch0023:      0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
+Patch0024:      0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
+Patch0025:      ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch
+Patch0026:      ppp-2.4.8-eaptls-mppe-1.102.patch
+
+Patch0032:      ppp-2.4.8-CVE-2020-8597.patch
+
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel, libpcap >= 0.8.3, eudev-libudev-devel, openssl-devel, pam-devel
@@ -64,9 +66,6 @@ BuildRequires: glib2-devel, libpcap >= 0.8.3, eudev-libudev-devel, openssl-devel
 Requires: glibc >= 2.0.6, pam >= 1.0
 Requires(pre): shadow-utils
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
 
 %description
 The ppp package contains the PPP (Point-to-Point Protocol) daemon and
@@ -96,13 +95,13 @@ This package contains the header files for building plugins for ppp.
 含まれています。
 
 %prep
-%setup  -q
+%setup  -q -n ppp-ppp-%{version}
 %autopatch -p1
 
 tar -xJf %{SOURCE12}
 
 %build
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall"
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing"
 %configure
 make %{?_smp_mflags}
 make -C ppp-watch %{?_smp_mflags}
@@ -195,6 +194,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.8-1
+- new upstream release.
+- updated patches.
+
 * Sun Nov 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.7-4
 - rebuilt with openssl-1.1.1.
 - dropped Patch17.