Browse Source

updated 6 packages

NetworkManager-1.22.10-1

initscripts-8.91.16-2

jitterentropy-2.2.0-3

rng-tools-6.10-4

samba-4.12.0-2

sysfsutils-2.1.0-5

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12363 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
d54fd786f9

+ 127 - 24
N/NetworkManager/NetworkManager-vl.spec

@@ -1,24 +1,37 @@
+%bcond_with systemd
+
 %define _unpackaged_files_terminate_build 1
 %define _unpackaged_files_terminate_build 1
 %define udev_scriptdir /lib/udev
 %define udev_scriptdir /lib/udev
-	
+%global systemd_dir /lib/systemd/system
+%if !%{with systemd}
+%global dbus_sys_dir %{_datadir}/dbus-1/system.d
+%else
+%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
+%endif
+
+%global nm_confdir %{_prefix}/lib/%{name}
+
 %define dbus_version 1.4.20
 %define dbus_version 1.4.20
 %define dbus_glib_version 0.96
 %define dbus_glib_version 0.96
 
 
 %define gtk3_version	3.8.0
 %define gtk3_version	3.8.0
 %define wireless_tools_version 29
 %define wireless_tools_version 29
 %define libnl3_version 3.2.14
 %define libnl3_version 3.2.14
-%define ppp_version 2.4.7
+%define ppp_version 2.4.8
 %define mm_version 1.10.4
 %define mm_version 1.10.4
 
 
 Name: NetworkManager
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: 1.20.2
-Release: 1%{?snapshot}%{?_dist_release}
+Version: 1.22.10
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: System Environment/Base
 Group: System Environment/Base
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPLv2+
 License: GPLv2+
 URL: https://www.gnome.org/projects/NetworkManager/
 URL: https://www.gnome.org/projects/NetworkManager/
-
 %global shortver %(echo "%{version}" | sed -e 's/\.[0-9]*$//')
 %global shortver %(echo "%{version}" | sed -e 's/\.[0-9]*$//')
 Source: https://download.gnome.org/sources/NetworkManager/%{shortver}/%{name}-%{version}.tar.xz
 Source: https://download.gnome.org/sources/NetworkManager/%{shortver}/%{name}-%{version}.tar.xz
 Source2: nm-system-settings.conf
 Source2: nm-system-settings.conf
@@ -40,7 +53,9 @@ Requires: ppp
 Requires: avahi
 Requires: avahi
 Requires: dnsmasq
 Requires: dnsmasq
 Requires: initscripts >= 8.80.0
 Requires: initscripts >= 8.80.0
+%if !%{with systemd}
 Requires: eudev
 Requires: eudev
+%endif
 Requires: ModemManager >= %{mm_version}
 Requires: ModemManager >= %{mm_version}
 Requires: mobile-broadband-provider-info
 Requires: mobile-broadband-provider-info
 Obsoletes: dhcdbd
 Obsoletes: dhcdbd
@@ -56,7 +71,6 @@ BuildRequires: polkit-devel
 BuildRequires: ppp-devel >= %{ppp_version}
 BuildRequires: ppp-devel >= %{ppp_version}
 BuildRequires: libuuid-devel
 BuildRequires: libuuid-devel
 BuildRequires: nss-devel >= 3.11.7
 BuildRequires: nss-devel >= 3.11.7
-BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(gudev-1.0)
 BuildRequires: pkgconfig(gudev-1.0)
 BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(jansson)
 BuildRequires: pkgconfig(jansson)
@@ -67,10 +81,12 @@ BuildRequires: ppp
 BuildRequires: ModemManager-glib-devel >= %{mm_version}
 BuildRequires: ModemManager-glib-devel >= %{mm_version}
 BuildRequires: readline-devel
 BuildRequires: readline-devel
 BuildRequires: libndp-devel
 BuildRequires: libndp-devel
+%if !%{with systemd}
 BuildRequires: elogind-devel
 BuildRequires: elogind-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
+BuildRequires: pkgconfig(libudev)
+%else
+BuildRequires: systemd-devel
+%endif
 
 
 %description
 %description
 NetworkManager attempts to keep an active network connection available at all
 NetworkManager attempts to keep an active network connection available at all
@@ -169,7 +185,8 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-
+%if !%{with systemd}
+%endif
 
 
 %build
 %build
 NOCONFIGURE=1 ./autogen.sh
 NOCONFIGURE=1 ./autogen.sh
@@ -188,11 +205,24 @@ sed -i "s|redhat-release|vine-release|g" configure
         --enable-vala=yes \
         --enable-vala=yes \
         --enable-introspection \
         --enable-introspection \
         --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
         --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
+        --enable-ppp \
         --with-dist-version=%{version}-%{release} \
         --with-dist-version=%{version}-%{release} \
         --with-libnm-glib \
         --with-libnm-glib \
         --with-consolekit=no \
         --with-consolekit=no \
+%if %{with systemd}
+        --with-session-tracking=systemd \
+        --with-suspend-resume=systemd \
+        --with-systemdsystemunitdir=%{systemd_dir} \
+        --with-runstatedir=%{_rundir} \
+%else
         --with-session-tracking=elogind \
         --with-session-tracking=elogind \
-        --with-suspend-resume=elogind
+        --with-suspend-resume=elogind \
+%endif
+        --with-system-ca-path=/etc/pki/tls/cert.pem \
+        --with-dbus-sys-dir=%{dbus_sys_dir} \
+        --enable-polkit=yes \
+        --enable-polkit-agent \
+        %{nil}
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
@@ -221,8 +251,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} \;
 
 
 %find_lang %{name}
 %find_lang %{name}
 
 
+%if !%{with systemd}
 mkdir -p  %{buildroot}%{_sysconfdir}/rc.d/init.d
 mkdir -p  %{buildroot}%{_sysconfdir}/rc.d/init.d
 install -m 0755 %{SOURCE1000} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
 install -m 0755 %{SOURCE1000} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
+%endif
 
 
 mkdir -p %{buildroot}%{_localstatedir}/run/NetworkManager
 mkdir -p %{buildroot}%{_localstatedir}/run/NetworkManager
 
 
@@ -233,18 +265,58 @@ rm -f %{buildroot}%{_libdir}/gnome-bluetooth/plugins/libnma.so
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
+%if %{with systemd}
+%pre
+if [ -f "%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service" ] ; then
+    # older versions used to install this file, effectively always enabling
+    # NetworkManager-wait-online.service. We no longer do that and rely on
+    # preset.
+    # But on package upgrade we must explicitly enable it (rh#1455704).
+    systemctl enable NetworkManager-wait-online.service || :
+fi
+%endif
 
 
 %post
 %post
+%if %{with systemd}
+/bin/udevadm control --reload-rules || :
+/bin/udevadm trigger --subsystem-match=net || :
+%systemd_post %{systemd_units}
+%else
+/sbin/udevadm control --reload-rules || :
+/sbin/udevadm trigger --subsystem-match=net || :
 if [ "$1" == "1" ]; then
 if [ "$1" == "1" ]; then
-	/sbin/chkconfig --add NetworkManager
-	/sbin/chkconfig NetworkManager resetpriorities
+  /sbin/chkconfig --add NetworkManager
+  /sbin/chkconfig NetworkManager resetpriorities
+fi
+%endif
+
+if [ "$1" == "1" ]; then
+  if [ ! -f /sbin/ifup -o -L /sbin/ifup ]; then
+    /usr/sbin/update-alternatives \
+      --install /sbin/ifup ifup %{_libexecdir}/nm-ifup 50 \
+      --slave /sbin/ifdown ifdown %{_libexecdir}/nm-ifdown
+  fi
 fi
 fi
 
 
 %preun
 %preun
 if [ $1 -eq 0 ]; then
 if [ $1 -eq 0 ]; then
+%if %{with systemd}
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable NetworkManager.service >/dev/null 2>&1 ||
+:
+    # Don't kill networking entirely just on package remove
+    #/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
+
+%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
+%else
     /sbin/service NetworkManager stop >/dev/null 2>&1
     /sbin/service NetworkManager stop >/dev/null 2>&1
     killall -TERM nm-system-settings >/dev/null 2>&1
     killall -TERM nm-system-settings >/dev/null 2>&1
     /sbin/chkconfig --del NetworkManager
     /sbin/chkconfig --del NetworkManager
+%endif
+  if [ -L /sbin/ifup ]; then
+    /usr/sbin/update-alternatives \
+      --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
+  fi
 fi
 fi
 
 
 %post   libnm -p /sbin/ldconfig
 %post   libnm -p /sbin/ldconfig
@@ -255,9 +327,16 @@ fi
 %postun glib -p /sbin/ldconfig
 %postun glib -p /sbin/ldconfig
 %endif
 %endif
 
 
+%triggerpostun -- initscripts < 8.91.16-2
+if [ ! -f /sbin/ifup -o -L /sbin/ifup ]; then
+  /usr/sbin/update-alternatives \
+    --install /sbin/ifup ifup %{_libexecdir}/nm-ifup 50 \
+    --slave /sbin/ifdown ifdown %{_libexecdir}/nm-ifdown
+fi
+
 %posttrans
 %posttrans
 for file in `ls %{_sysconfdir}/sysconfig/network-scripts/ifcfg-*`
 for file in `ls %{_sysconfdir}/sysconfig/network-scripts/ifcfg-*`
-do 
+do
     grep "^UUID=" $file > /dev/null 2>&1
     grep "^UUID=" $file > /dev/null 2>&1
     if [ "$?" != "0" ]; then
     if [ "$?" != "0" ]; then
         device_name=`grep "DEVICE=" $file | awk -F'=' '{print $2;}' | grep -v lo`
         device_name=`grep "DEVICE=" $file | awk -F'=' '{print $2;}' | grep -v lo`
@@ -273,30 +352,50 @@ done
 
 
 %files
 %files
 %defattr(-,root,root,0755)
 %defattr(-,root,root,0755)
-%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
-%{_sysconfdir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
-#{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
-%{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
-%{_sysconfdir}/dbus-1/system.d/nm-ifcfg-rh.conf
-%config %{_sysconfdir}/rc.d/init.d/NetworkManager
+%license COPYING
+%doc NEWS AUTHORS README CONTRIBUTING TODO
+%{dbus_sys_dir}/*
 %{_sbindir}/%{name}
 %{_sbindir}/%{name}
 %dir %{_sysconfdir}/%{name}/
 %dir %{_sysconfdir}/%{name}/
-%dir %{_sysconfdir}/%{name}/dispatcher.d
 %dir %{_sysconfdir}/%{name}/VPN
 %dir %{_sysconfdir}/%{name}/VPN
 %dir %{_sysconfdir}/%{name}/conf.d
 %dir %{_sysconfdir}/%{name}/conf.d
+%dir %{_sysconfdir}/%{name}/dispatcher.d
+%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
+%dir %{_sysconfdir}/%{name}/dnsmasq.d
+%dir %{_sysconfdir}/%{name}/system-connections
+%dir %{nm_confdir}
+%dir %{nm_confdir}/VPN
+%dir %{nm_confdir}/conf.d
+%dir %{nm_confdir}/dispatcher.d
+%dir %{nm_confdir}/dispatcher.d/no-wait.d
+%dir %{nm_confdir}/dispatcher.d/pre-up.d
+%dir %{nm_confdir}/dispatcher.d/pre-down.d
+%dir %{nm_confdir}/system-connections
+%ifarch x86_64
+%dir %{_libdir}/%{name}
+%endif
+%{_libdir}/%{name}/%{version}-%{release}
+%if %{with systemd}
+%{systemd_dir}/*
+%{nm_confdir}/dispatcher.d/90-nm-cloud-setup.sh
+%{nm_confdir}/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
+%else
+%config %{_sysconfdir}/rc.d/init.d/NetworkManager
+%endif
 %config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
 %config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
 %config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf
 %config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf
 %{_bindir}/nm-online
 %{_bindir}/nm-online
 %{_bindir}/nmcli
 %{_bindir}/nmcli
 #{_libexecdir}/nm-avahi-autoipd.action
 #{_libexecdir}/nm-avahi-autoipd.action
+%{_libexecdir}/nm-cloud-setup
 %{_libexecdir}/nm-dhcp-helper
 %{_libexecdir}/nm-dhcp-helper
 %{_libexecdir}/nm-dispatcher
 %{_libexecdir}/nm-dispatcher
 %{_libexecdir}/nm-iface-helper
 %{_libexecdir}/nm-iface-helper
 %{_libexecdir}/nm-ifdown
 %{_libexecdir}/nm-ifdown
 %{_libexecdir}/nm-ifup
 %{_libexecdir}/nm-ifup
 %{_libexecdir}/nm-initrd-generator
 %{_libexecdir}/nm-initrd-generator
-%dir %{_libdir}/NetworkManager
-%{_libdir}/NetworkManager/%{version}-%{release}
+%dir %{_libdir}/pppd
+%dir %{_libdir}/pppd/%{ppp_version}
 %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
 %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
 %{_mandir}/man1/*
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/nmtui*
 %exclude %{_mandir}/man1/nmtui*
@@ -305,7 +404,6 @@ done
 %{_mandir}/man8/*
 %{_mandir}/man8/*
 %dir %{_localstatedir}/run/NetworkManager
 %dir %{_localstatedir}/run/NetworkManager
 %dir %{_localstatedir}/lib/NetworkManager
 %dir %{_localstatedir}/lib/NetworkManager
-%dir %{_sysconfdir}/NetworkManager/system-connections
 %{_datadir}/bash-completion/completions/nmcli
 %{_datadir}/bash-completion/completions/nmcli
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_datadir}/polkit-1/actions/*.policy
 %{_datadir}/polkit-1/actions/*.policy
@@ -378,6 +476,11 @@ done
 
 
 
 
 %changelog
 %changelog
+* Wed Apr 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.10-1
+- new upstream release.
+- built with ppp-2.4.8.
+- made ifup/ifdown selectable in alternatives.
+
 * Sun Sep 15 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.2-1
 * Sun Sep 15 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.2-1
 - new upstream release.
 - new upstream release.
 - added nmtui*.
 - added nmtui*.

+ 24 - 5
i/initscripts/initscripts-vl.spec

@@ -5,7 +5,7 @@ Summary:      The inittab file and the /etc/rc.d scripts.
 Summary(ja):  inittab と /etc/rc.d 以下の起動スクリプト一式
 Summary(ja):  inittab と /etc/rc.d 以下の起動スクリプト一式
 Name:         initscripts
 Name:         initscripts
 Version:      8.91.16
 Version:      8.91.16
-Release:      1%{?_dist_release}
+Release:      2%{?_dist_release}
 License:      GPL
 License:      GPL
 Group:        System Environment/Base
 Group:        System Environment/Base
 Url:          http://trac.vinelinux.org/browser/projects/initscripts
 Url:          http://trac.vinelinux.org/browser/projects/initscripts
@@ -16,6 +16,7 @@ Source:       %{name}-vine-%{version}.tar.bz2
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
 BuildRequires:  glib2-devel, popt-devel
 BuildRequires:  glib2-devel, popt-devel
+BuildRequires:  initscripts
 
 
 Requires:     mingetty, gawk, sed, mktemp, e2fsprogs >= 1.15
 Requires:     mingetty, gawk, sed, mktemp, e2fsprogs >= 1.15
 Requires:     procps >= 3.2.7, syslog
 Requires:     procps >= 3.2.7, syslog
@@ -33,6 +34,7 @@ Requires:     kbd
 Requires:     dhclient, ethtool
 Requires:     dhclient, ethtool
 Requires:     udev >= 153-1
 Requires:     udev >= 153-1
 Requires:     sed, coreutils
 Requires:     sed, coreutils
+Requires:     alternatives
 
 
 Conflicts:    kernel <= 2.4, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
 Conflicts:    kernel <= 2.4, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
 Conflicts:    ypbind < 1.6-12
 Conflicts:    ypbind < 1.6-12
@@ -40,7 +42,7 @@ Obsoletes:    rhsound, sapinit
 
 
 Requires(pre): shadow-utils
 Requires(pre): shadow-utils
 Requires(post): gawk, coreutils, sed, chkconfig
 Requires(post): gawk, coreutils, sed, chkconfig
-Requires(preun): chkconfig
+Requires(preun): chkconfig, alternatives
 
 
 Vendor:       Project Vine
 Vendor:       Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -62,6 +64,7 @@ deactivate most network interfaces.
 %setup -q
 %setup -q
 
 
 %build
 %build
+export CFLAGS="%{optflags} -DPORT_MAX_8250=19"
 %__make %{?_smp_mflags} libdir=%{_libdir}
 %__make %{?_smp_mflags} libdir=%{_libdir}
 
 
 
 
@@ -83,7 +86,12 @@ mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab
 rm -f $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-{ctc,escon,iucv}
 rm -f $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-{ctc,escon,iucv}
 rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \
 rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \
       $RPM_BUILD_ROOT/lib/udev/ccw_init
       $RPM_BUILD_ROOT/lib/udev/ccw_init
-    
+
+# ifup/ifdown
+mv -f %{buildroot}/sbin/ifup %{buildroot}/sbin/ifup.initscripts
+mv -f %{buildroot}/sbin/ifdown %{buildroot}/sbin/ifdown.initscripts
+
+
 %pre
 %pre
 /usr/sbin/groupadd -g 22 -r -f utmp
 /usr/sbin/groupadd -g 22 -r -f utmp
 
 
@@ -154,6 +162,7 @@ if [ $1 = 0 ]; then
   /sbin/chkconfig --del random
   /sbin/chkconfig --del random
   /sbin/chkconfig --del netfs
   /sbin/chkconfig --del netfs
   /sbin/chkconfig --del network
   /sbin/chkconfig --del network
+  /usr/sbin/update-alternatives --remove ifup /sbin/ifup.initscripts >/dev/null 2>&1 || :
 fi
 fi
 
 
 %triggerun -- initscripts <= 7.2.6
 %triggerun -- initscripts <= 7.2.6
@@ -314,6 +323,13 @@ sed -e "s|EMACS_IME=vje|EMACS_IME=scim|g" \
 cp -f $newime /etc/sysconfig/ime
 cp -f $newime /etc/sysconfig/ime
 rm -f $newime
 rm -f $newime
 
 
+%triggerpostun -- initscripts < 8.91.16-2
+if [ ! -f /sbin/ifup -o -L /sbin/ifup ]; then
+  /usr/sbin/update-alternatives \
+    --install /sbin/ifup ifup /sbin/ifup.initscripts 10 \
+    --slave /sbin/ifdown ifdown /sbin/ifdown.initscripts
+fi
+
 
 
 %clean
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 rm -rf ${RPM_BUILD_ROOT}
@@ -325,10 +341,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %verify(not md5 mtime size) /etc/adjtime
 %config(noreplace) %verify(not md5 mtime size) /etc/adjtime
 %config(noreplace) /etc/sysconfig/init
 %config(noreplace) /etc/sysconfig/init
 /etc/sysconfig/network-scripts/ifdown
 /etc/sysconfig/network-scripts/ifdown
-/sbin/ifdown
+/sbin/ifdown.initscripts
 /etc/sysconfig/network-scripts/ifdown-post
 /etc/sysconfig/network-scripts/ifdown-post
 /etc/sysconfig/network-scripts/ifup
 /etc/sysconfig/network-scripts/ifup
-/sbin/ifup
+/sbin/ifup.initscripts
 %dir /etc/sysconfig/console
 %dir /etc/sysconfig/console
 %dir /etc/sysconfig/modules
 %dir /etc/sysconfig/modules
 %config /etc/sysconfig/i18n
 %config /etc/sysconfig/i18n
@@ -439,6 +455,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 
 
 %changelog
 %changelog
+* Wed Apr 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-2
+- made ifup/ifdown selectable in alternatives.
+
 * Wed Jun 04 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 8.91.16-1
 * Wed Jun 04 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 8.91.16-1
 - add default dmtype
 - add default dmtype
 - change defaults of desktop/ime
 - change defaults of desktop/ime

+ 80 - 0
j/jitterentropy/jitterentropy-vl.spec

@@ -0,0 +1,80 @@
+Name:	jitterentropy
+Version:	2.2.0
+Release:	3%{?_dist_release}
+Summary:	Library implementing the jitter entropy source
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
+License:	BSD or GPLv2
+URL:		https://github.com/smuellerDD/jitterentropy-library
+Source0:	%url/archive/%{name}-library-%{version}.tar.gz
+
+BuildRequires: gcc
+
+# Disable Upstream Makefiles debuginfo strip on install
+Patch0: jitterentropy-rh-makefile.patch
+%description
+Library implementing the CPU jitter entropy source
+
+%package devel
+Summary: Development headers for jitterentropy library
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Development headers and libraries for jitterentropy
+
+%prep
+%autosetup -n %{name}-library-%{version}
+
+%build
+export CFLAGS="%{optflags}"
+%make_build
+
+%install
+mkdir -p %{buildroot}/usr/include/
+%make_install PREFIX=/usr LIBDIR=%{_lib}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%doc README.md
+%license COPYING COPYING.bsd COPYING.gplv2
+%{_libdir}/libjitterentropy.so.2*
+
+
+%files devel
+%{_includedir}/*
+%{_libdir}/libjitterentropy.so
+%{_mandir}/man3/*
+
+%changelog
+* Thu Apr 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.2.0-3
+- initial build for Vine Linux.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Sep 26 2019 Neil Horman <nhorman@redhat.com> - 2.2.0-1
+- Update to latest upstream
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Sep 21 2018 Neil Horman <nhorman@tuxdriver.com> - 2.1.2-3
+- Drop static library
+- Fix up naming
+- Add gcc buildrequires
+- Fix files glob
+
+* Thu Sep 13 2018 Neil Horman <nhorman@tuxdriver.com> - 2.1.2-2
+- Fixed license
+- Fixed up some macro usage in spec file
+- Documented patches
+- Modified makefile to use $(INSTALL) macro
+
+* Thu Sep 06 2018 Neil Horman <nhorman@tuxdriver.com> - 2.1.2-1
+- Initial import

+ 116 - 0
r/rng-tools/rng-tools-vl.spec

@@ -0,0 +1,116 @@
+%bcond_with systemd
+
+%global _hardened_build 1
+%global _sbindir /sbin
+
+Summary:        Random number generator related utilities
+Name:           rng-tools
+Version:        6.10
+Release:        4%{?_dist_release}
+Vendor:         Project Vine
+Distribution:   Vine Linux
+License:        GPLv2+
+URL:            https://github.com/nhorman/rng-tools
+Source0:        https://github.com/nhorman/rng-tools/archive/rng-tools-%{version}.tar.gz
+Source1:        rngd.service
+Source100:      rngd.init
+Source101:      rngd.sysconfig
+Source1000:     Changelog.fedora
+
+# https://sourceforge.net/p/gkernel/patches/111/
+
+BuildRequires: gcc make
+BuildRequires: gettext
+BuildRequires: libgcrypt-devel
+BuildRequires: autoconf automake
+BuildRequires: libsysfs-devel curl-devel
+BuildRequires: libxml2-devel openssl-devel
+BuildRequires: jansson-devel
+BuildRequires: jitterentropy-devel
+#BuildRequires: libp11-devel
+#BuildRequires: rtl-sdr-devel
+Provides: jitterentropy-rngd
+
+%if %{with systemd}
+BuildRequires:  systemd-units
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(postun): chkconfig
+%endif
+
+%description
+Hardware random number generation tools.
+
+%prep 
+%autosetup 
+
+%build
+./autogen.sh
+%configure \
+	--without-pkcs11 \
+	--without-rtlsdr \
+	%{nil}
+
+%make_build
+
+%install
+%make_install
+
+%if %{with systemd}
+# install systemd unit file
+install -Dt %{buildroot}%{_unitdir} -m0644 %{SOURCE1}
+%else
+mkdir -p %{buildroot}%{_initdir}
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+install -m755 %{SOURCE100} %{buildroot}%{_initdir}/rngd
+install -m644 %{SOURCE101} %{buildroot}%{_sysconfdir}/sysconfig/rngd
+%endif
+
+%post
+%if %{with systemd}
+%systemd_post rngd.service
+%else
+/sbin/chkconfig --add rngd
+%endif
+
+%preun
+%if %{with systemd}
+%systemd_preun rngd.service
+%else
+if [ "$1" = 0 ]; then
+  /sbin/service stop rngd >/dev/null 2>&1 ||:
+  /sbin/chkconfig --del rngd
+fi
+%endif
+
+%postun
+%if %{with systemd}
+%systemd_postun_with_restart rngd.service
+%else
+if [ "$1" != 0 ]; then
+  /sbin/service stop condrestart >/dev/null 2>&1 ||:
+fi
+%endif
+
+%files
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS NEWS README
+%{_bindir}/rngtest
+%{_sbindir}/rngd
+%{_mandir}/man1/rngtest.1.*
+%{_mandir}/man8/rngd.8.*
+%if %{with systemd}
+%attr(0644,root,root)   %{_unitdir}/rngd.service
+%else
+%attr(0755,root,root)   %{_initdir}/rngd
+%attr(0644,root,root)   %config(noreplace) %{_sysconfdir}/sysconfig/rngd
+%endif
+
+%changelog
+* Thu Apr 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 6.10-4
+- initial build for Vine Linux.

+ 62 - 4
s/samba/samba-vl.spec

@@ -1,6 +1,8 @@
+%bcond_without pidl
+
 %define samba_version 4.12.0
 %define samba_version 4.12.0
 #define rc_number rc4
 #define rc_number rc4
-%define samba_release 1
+%define samba_release 2
 
 
 %define doc_version 4.12.0
 %define doc_version 4.12.0
 %define api_version 4.0
 %define api_version 4.0
@@ -73,13 +75,16 @@ Conflicts: samba < %{version}
 Provides: samba = %{version}
 Provides: samba = %{version}
 
 
 Obsoletes: ctdb <= 2.5.5
 Obsoletes: ctdb <= 2.5.5
-Obsoletes: samba-pidl < 4.12.0
+%if ! %{with pidl}
+Obsoletes: samba-pidl < %{version}-%{release}
+%endif
 
 
 BuildRoot: %{_tmppath}/%{name}-%{samba_version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{samba_version}-%{release}-root
 Requires(post): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig, /sbin/service
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(preun): /sbin/chkconfig, /sbin/service
 
 
 BuildRequires: avahi-devel
 BuildRequires: avahi-devel
+BuildRequires: bison
 #BuildRequires: ctdb-devel
 #BuildRequires: ctdb-devel
 BuildRequires: cups-devel
 BuildRequires: cups-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: cyrus-sasl-devel
@@ -87,6 +92,7 @@ BuildRequires: docbook-style-xsl
 BuildRequires: docbook-utils
 BuildRequires: docbook-utils
 BuildRequires: e2fsprogs-devel
 BuildRequires: e2fsprogs-devel
 BuildRequires: coreutils
 BuildRequires: coreutils
+BuildRequires: flex
 BuildRequires: gdb
 BuildRequires: gdb
 BuildRequires: gettext
 BuildRequires: gettext
 BuildRequires: gnutls-devel
 BuildRequires: gnutls-devel
@@ -103,7 +109,7 @@ BuildRequires: libattr-devel
 BuildRequires: libblkid-devel
 BuildRequires: libblkid-devel
 BuildConflicts: libbsd-devel
 BuildConflicts: libbsd-devel
 BuildRequires: libcap-devel
 BuildRequires: libcap-devel
-BuildRequires: libidn-devel
+BuildRequires: libicu-devel
 #BuildRequires: libldb-devel >= 1.1.25
 #BuildRequires: libldb-devel >= 1.1.25
 BuildRequires: libpcap-devel
 BuildRequires: libpcap-devel
 BuildRequires: libtdb-devel
 BuildRequires: libtdb-devel
@@ -131,6 +137,7 @@ BuildRequires: python3-tdb
 BuildRequires: rpcgen
 BuildRequires: rpcgen
 BuildRequires: readline-devel
 BuildRequires: readline-devel
 BuildRequires: sqlite-devel
 BuildRequires: sqlite-devel
+BuildRequires: tracker-devel
 BuildRequires: zlib-devel
 BuildRequires: zlib-devel
 
 
 #BuildRequires: libuuid-devel
 #BuildRequires: libuuid-devel
@@ -218,6 +225,18 @@ The samba4-devel package contains the header files for the libraries
 needed to develop programs that link against the SMB, RPC and other
 needed to develop programs that link against the SMB, RPC and other
 libraries in the Samba suite.
 libraries in the Samba suite.
 
 
+## --------------------------------------------------------------------
+%if %{with pidl}
+%package pidl
+Summary: Perl IDL compiler
+Group: Development/Tools
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%description pidl
+The samba4-pidl package contains the Perl IDL compiler used by Samba
+and Wireshark to parse IDL and similar protocols
+%endif
+
 ## --------------------------------------------------------------------
 ## --------------------------------------------------------------------
 %package common
 %package common
 Summary: Files used by both Samba servers and clients
 Summary: Files used by both Samba servers and clients
@@ -420,6 +439,8 @@ the Samba suite.
 
 
 %endif
 %endif
 
 
+%debug_package
+
 ## ====================================================================
 ## ====================================================================
 %prep
 %prep
 %setup -q -n samba-%{samba_version}%{?rc_number}
 %setup -q -n samba-%{samba_version}%{?rc_number}
@@ -492,12 +513,18 @@ LDFLAGS="-Wl,-z,relro,-z,now" \
 #  --with-system-mitkrb5 \
 #  --with-system-mitkrb5 \
 #  --with-cluster-support \
 #  --with-cluster-support \
 
 
-
 # try and build the manpages
 # try and build the manpages
 #./release-scripts/build-manpages-nogit
 #./release-scripts/build-manpages-nogit
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
+%if %{with pidl}
+pushd pidl
+%__perl Makefile.PL PREFIX=%{_prefix}
+make %{?_smp_mflags}
+popd
+%endif
+
 # Remove some permission bits to avoid to many dependencies
 # Remove some permission bits to avoid to many dependencies
 find examples docs-xml -type f | xargs -r chmod -x
 find examples docs-xml -type f | xargs -r chmod -x
 
 
@@ -506,6 +533,17 @@ find examples docs-xml -type f | xargs -r chmod -x
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 make %{?_smp_mflags} install DESTDIR=%{buildroot}
 make %{?_smp_mflags} install DESTDIR=%{buildroot}
 
 
+%if %{with pidl}
+pushd pidl
+make DESTDIR=%{buildroot} install_vendor
+
+find %{buildroot}%{perl_archlib} -type f -name perllocal.pod | xargs rm -f
+find %{buildroot}%{perl_vendorarch} -type f -name .packlist | xargs rm -f
+# Already packaged by perl Parse:Yapp
+rm -rf %{buildroot}%{perl_vendorlib}/Parse/Yapp
+popd
+%endif
+
 # Create the target build directory hierarchy
 # Create the target build directory hierarchy
 mkdir -p %{buildroot}%{samba_includedir}
 mkdir -p %{buildroot}%{samba_includedir}
 mkdir -p %{buildroot}%{_initrddir}
 mkdir -p %{buildroot}%{_initrddir}
@@ -844,6 +882,7 @@ fi
 %attr(1777,root,root) %dir /var/spool/samba
 %attr(1777,root,root) %dir /var/spool/samba
 %{_initrddir}/nmb
 %{_initrddir}/nmb
 %{_initrddir}/smb
 %{_initrddir}/smb
+%{_datadir}/samba/mdssvc
 
 
 %{_mandir}/man1/ldbadd.1*
 %{_mandir}/man1/ldbadd.1*
 %{_mandir}/man1/ldbdel.1*
 %{_mandir}/man1/ldbdel.1*
@@ -1122,6 +1161,7 @@ fi
 %{_bindir}/smbcontrol
 %{_bindir}/smbcontrol
 %{_bindir}/testparm
 %{_bindir}/testparm
 #%{_datadir}/samba/codepages
 #%{_datadir}/samba/codepages
+%dir %{_datadir}/samba
 %dir /var/run/samba
 %dir /var/run/samba
 %dir /var/run/winbindd
 %dir /var/run/winbindd
 %dir /var/lib/samba
 %dir /var/lib/samba
@@ -1485,6 +1525,20 @@ fi
 #%exclude %{python_sitearch}/_ldb.so
 #%exclude %{python_sitearch}/_ldb.so
 #%exclude %{python_sitearch}/_tevent.so
 #%exclude %{python_sitearch}/_tevent.so
 
 
+## --------------------------------------------------------------------
+%if %{with pidl}
+%files pidl
+%defattr(-,root,root,-)
+%{perl_vendorlib}/Parse/*
+%{_mandir}/man1/pidl.1.gz
+%{_mandir}/man3/Parse::Pidl::Wireshark::NDR.3pm.gz
+%{_mandir}/man3/Parse::Pidl::Wireshark::Conformance.3pm.gz
+%{_mandir}/man3/Parse::Pidl::Dump.3pm.gz
+%{_mandir}/man3/Parse::Pidl::NDR.3pm.gz
+%{_mandir}/man3/Parse::Pidl::Util.3pm.gz
+%attr(755,root,root) %{_bindir}/pidl
+%endif
+
 ## --------------------------------------------------------------------
 ## --------------------------------------------------------------------
 %if %with_libsmbclient
 %if %with_libsmbclient
 %files -n libsmbclient
 %files -n libsmbclient
@@ -1663,6 +1717,10 @@ fi
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Tue Mar 31 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12.0-2
+- re-enabled pidl.
+- enabled tracker/Spotlight support.
+
 * Mon Mar 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12.0-1
 * Mon Mar 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 23 - 15
s/sysfsutils/sysfsutils-vl.spec

@@ -1,13 +1,16 @@
-Summary: Utilities for interfacing with sysfs
-Summary(ja): sysfs と接続するためのユーティリティ
-Name: sysfsutils
-Version: 2.1.0
-Release: 4%{?_dist_release}
-
-License: GPLv2
-Group: Development/Tools
-
-Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
+Summary:        Utilities for interfacing with sysfs
+Summary(ja):    sysfs と接続するためのユーティリティ
+Name:           sysfsutils
+Version:        2.1.0
+Release:        5%{?_dist_release}
+Group:          Development/Tools
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv2
+URL:            https://github.com/linux-ras/sysfsutils
+%global altver  %(echo %{version} | tr . _)
+Source0:        https://github.com/linux-ras/sysfsutils/archive/sysfsutils-%{altver}.tar.gz#/sysfsutils-sysfsutils-%{altver}.tar.gz
 Patch0: sysfsutils-2.0.0-redhatify.patch
 Patch0: sysfsutils-2.0.0-redhatify.patch
 Patch1: sysfsutils-2.0.0-class-dup.patch
 Patch1: sysfsutils-2.0.0-class-dup.patch
 Patch2: sysfsutils-2.1.0-get_link.patch
 Patch2: sysfsutils-2.1.0-get_link.patch
@@ -46,7 +49,7 @@ to build programs using the libsysfs API.
 
 
 
 
 %prep
 %prep
-%setup -q
+%setup -q -n sysfsutils-sysfsutils-%{altver}
 %patch0 -p1 -b .redhatify
 %patch0 -p1 -b .redhatify
 %patch1 -p1
 %patch1 -p1
 %patch2 -p1
 %patch2 -p1
@@ -77,16 +80,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc COPYING AUTHORS README NEWS CREDITS ChangeLog 
-%doc docs/libsysfs.txt cmd/GPL
+%license COPYING cmd/GPL
+%doc AUTHORS README NEWS CREDITS ChangeLog 
+%doc docs/libsysfs.txt
 %{_bindir}/systool
 %{_bindir}/systool
 %{_bindir}/get_module
 %{_bindir}/get_module
 %{_mandir}/man1/systool.1*
 %{_mandir}/man1/systool.1*
 
 
 %files -n libsysfs
 %files -n libsysfs
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc COPYING AUTHORS README NEWS CREDITS ChangeLog 
-%doc docs/libsysfs.txt lib/LGPL
+%license lib/LGPL
+%doc AUTHORS README NEWS CREDITS ChangeLog 
+%doc docs/libsysfs.txt
 /%{_lib}/libsysfs.so.*
 /%{_lib}/libsysfs.so.*
 
 
 %files -n libsysfs-devel
 %files -n libsysfs-devel
@@ -97,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Thu Apr 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.0-5
+- rebuilt with current environment.
+
 * Mon Nov 17 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.1.0-4
 * Mon Nov 17 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.1.0-4
 - added Patch0, 1, 2 and 3 from Fedora
 - added Patch0, 1, 2 and 3 from Fedora
 - moved shared libraries into libsysfs subpackage
 - moved shared libraries into libsysfs subpackage