Browse Source

updated 8 packages

cryptsetup-2.3.1-1

gdisk-1.0.5-1

kernel-4.14.174-1

lvm2-2.03.09-1

libblockdev-2.23-1

libmicrohttpd-0.9.70-1

udisks-1.0.5-1

udisks2-2.8.4-1

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

+ 23 - 39
c/cryptsetup/cryptsetup-vl.spec

@@ -4,24 +4,29 @@
 Summary:	A utility for setting up encrypted disks
 Summary(ja):	暗号化ファイルシステム設定用ユーティリティ
 Name:		cryptsetup
-Version:	1.7.5
-Release:	1%{?_dist_release}
-License:	GPLv2 and LGPLv2+
 Group:		Applications/System
-URL:		http://cryptsetup.googlecode.com/
 
-Source0:	https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-%{upstream_version}.tar.xz
+Version:	2.3.1
+Release:	1%{?_dist_release}
+
+License:	GPLv2 and LGPLv2+
+URL:		https://gitlab.com/cryptsetup/cryptsetup
+%global		shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+Source0:	https://www.kernel.org/pub/linux/utils/cryptsetup/v%{shortver}/cryptsetup-%{upstream_version}.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:	libgcrypt-devel
 BuildRequires:  popt-devel
 BuildRequires:  device-mapper-devel
+BuildRequires:  json-c-devel
+BuildRequires:  libblkid-devel
+BuildRequires:	libgcrypt-devel
 BuildRequires:	libgpg-error-devel
 BuildRequires:  libuuid-devel
-BuildRequires:	python-devel
+BuildRequires:  openssl-devel
 Provides:	cryptsetup-luks = %{version}-%{release}
 Obsoletes:	cryptsetup-luks < 1.4.0
 Requires:	cryptsetup-libs = %{version}-%{release}
+Obsoletes:	%{name}-python < 2.0.0
 
 %description
 The cryptsetup package contains a utility for setting up
@@ -68,32 +73,16 @@ This package contains the cryptsetup shared library, libcryptsetup.
 収録されています。
 
 
-%package python
-Summary: Python bindings for libcryptsetup
-Summary(ja): libcryptsetup の Python バインディング
-Group: System Environment/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Provides: python-cryptsetup = %{version}-%{release}
-Obsoletes: python-cryptsetup < 1.4.0
-
-%description python
-This package provides Python bindings for libcryptsetup, a library
-for setting up disk encryption using dm-crypt kernel module.
-
-%description python -l ja
-このパッケージには、dm-crypt カーネルモジュールを使って
-ディスクの暗号化を設定するライブラリ libcryptsetup の
-Python バインディングが収録されています。
-
-
 %prep
 %setup -q -n cryptsetup-%{upstream_version}
-chmod -x python/pycryptsetup-test.py
 
 
 %build
-%configure  --sbindir=%{_root_sbindir} --libdir=/%{_lib} \
-	--enable-python \
+export PYTHON=%{__python3}
+
+%configure \
+	--sbindir=%{_root_sbindir} \
+	--libdir=/%{_lib} \
 	--disable-selinux
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -110,7 +99,7 @@ rm -rf  %{buildroot}/%{_lib}/*.la %{buildroot}/%{_lib}/cryptsetup
 pushd %{buildroot}/%{_lib}
 rm libcryptsetup.so
 mkdir -p %{buildroot}/%{_libdir}
-ln -s ../../%{_lib}/$(ls libcryptsetup.so.?.?.?) %{buildroot}/%{_libdir}/libcryptsetup.so
+ln -s ../../%{_lib}/$(ls libcryptsetup.so.??.?.?) %{buildroot}/%{_libdir}/libcryptsetup.so
 mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir}
 popd
 %find_lang cryptsetup
@@ -124,10 +113,8 @@ popd
 
 %files -f cryptsetup.lang
 %doc COPYING ChangeLog AUTHORS TODO FAQ
-%{_mandir}/man8/cryptsetup.8.gz
-%{_mandir}/man8/veritysetup.8.gz
-%{_root_sbindir}/cryptsetup
-%{_root_sbindir}/veritysetup
+%{_mandir}/man8/*.8.gz
+%{_root_sbindir}/*
 
 
 %files devel
@@ -142,17 +129,14 @@ popd
 /%{_lib}/libcryptsetup.so.*
 
 
-%files python
-%doc COPYING.LGPL python/pycryptsetup-test.py
-%exclude %{python_sitearch}/pycryptsetup.la
-%{python_sitearch}/pycryptsetup.so
-
-
 %clean
 rm -rf %{buildroot}
 
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.3.1-1
+- new upstream release.
+
 * Sun Sep 10 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.7.5-1
 - updated to 1.7.5.
 

+ 12 - 6
g/gdisk/gdisk-vl.spec

@@ -1,20 +1,22 @@
 Summary:       An fdisk-like partitioning tool for GPT disks
 Summary(ja):   GPT ディスク用の fdisk 風パーティションツール
 Name:          gdisk
-Version:       1.0.0
-Release:       2%{?_dist_release}
+Version:       1.0.5
+Release:       1%{?_dist_release}
+Group:         System Environment/Base
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:       GPLv2
 URL:           http://www.rodsbooks.com/gdisk/
-Group:         System Environment/Base
-Source0:       http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz
+Source0:       https://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: popt-devel
 BuildRequires: libuuid-devel
 BuildRequires: ncurses-devel
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
 
 %description
 An fdisk-like partitioning tool for GPT disks. GPT fdisk features a
@@ -22,6 +24,7 @@ command-line interface, fairly direct manipulation of partition table
 structures, recovery tools to help you deal with corrupt partition
 tables, and the ability to convert MBR disks to GPT format.
 
+
 %prep
 %setup -q -n gptfdisk-%{version}
 chmod 0644 gdisk_test.sh
@@ -47,6 +50,9 @@ done
 %{_mandir}/man8/fixparts.8*
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.5-1
+- new upstream release.
+
 * Sat Jul 09 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.0-2
 - rebuild with gcc-5.4.0
 

+ 17 - 7
k/kernel/kernel-vl.spec

@@ -4,10 +4,15 @@
 
 %if "%{?_dist_release}" > "vl6"
 %global kmod kmod
+%global mkinitrd dracut
+%global mkinitrd_version 049
 %else
 %global kmod module-init-tools
+%global mkinitrd mkinitrd
+%global mkinitrd_version 6.0.93
 %endif
 
+
 Summary: The Linux kernel (the core of the Linux operating system)
 Summary(ja): Linux カーネル (Linux オペレーティングシステムの心臓部分)
 
@@ -32,7 +37,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # adding some text to the end of the version number.
 #
 %define sublevel 14
-%define patchlevel 160
+%define patchlevel 174
 %define kversion 4.%{sublevel}
 %define rpmversion 4.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}
@@ -125,7 +130,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, %{kmod}, initscripts >= 8.80, mkinitrd >= 6.0.93, linux-firmware >= 20110601-1
+%define kernel_prereq  fileutils, %{kmod}, initscripts >= 8.80, %{mkinitrd} >= %{mkinitrd_version}, linux-firmware >= 20110601-1
 
 Name: kernel
 Group: System Environment/Kernel
@@ -141,9 +146,6 @@ Provides: kernel-drm-nouveau = 16
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: alsa-driver = 1.0.20
 Requires(pre): %{kernel_prereq}
-%if "%{_dist_release}" >= "vl7"
-Requires(pre): mkinitrd >= 6.0.93-24
-%endif
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Conflicts: %{nptl_conflicts}
@@ -570,7 +572,7 @@ cd linux-%{kversion}
 # %patch1461 -p1
 
 # Aquantia driver update from 4.19.y
-%patch1470 -p1 
+#patch1470 -p1 
 
 # Misc fixes
 # Make multimedia buttons on Dell Inspiron 8200 work.
@@ -1173,7 +1175,9 @@ fi
 %if %{with_headers}
 %files headers
 %defattr(-,root,root)
-/usr/include/*
+%{_includedir}/*
+%exclude %{_includedir}/cpufreq.h
+%exclude %{_includedir}/cpuidle.h
 %endif
 
 %if %{with_firmware}
@@ -1264,9 +1268,15 @@ fi
 %files -n kernel-tools-libs-devel
 %{_libdir}/libcpupower.so
 %{_includedir}/cpufreq.h
+%{_includedir}/cpuidle.h
 %endif
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.14.174-1
+- updated to 4.14.174.
+- disabled Patch1470 (aquantia).
+- R:dracut instead of mkinitrd.
+
 * Mon Dec 30 2019 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.160-1
 - updated to 4.14.160
 - fix changelog typo

+ 22 - 91
l/lvm2/lvm2-vl.spec

@@ -1,6 +1,5 @@
-%define lvm_version 2.02.177
-%define device_mapper_version 1.02.146
-%define with_cluster 0
+%define lvm_version 2.03.09
+%define device_mapper_version 1.02.171
 
 %define _unpackaged_files_terminate_build 1
 
@@ -12,35 +11,29 @@ Summary(ja): 論理ボリューム管理ツール
 Name: lvm2
 Version: %{lvm_version}
 Release: 1%{?_dist_release}
-License: GPLv2
 Group: System Environment/Base
-URL: http://sources.redhat.com/lvm2
 
+Distribution: Vine Linux
+Vendor: Project Vine
+Packager: daisuke
+
+License: GPLv2
+URL: http://sourceware.org/lvm2/
 Source0: LVM2.%{lvm_version}.tgz
 Patch0: lvm2-set-default-preferred_names.patch
-Patch1: lvm2-lvmetad-timeout.patch
-# Upstream: 3f9ae846b89a
-Patch2: lvm2-2_02_178-lvmlockd-fix-uninitialized.patch
-
-Patch10: libdevmapper-static.patch
-
-#Patch20: lvm2-2.02.107-fix-dupliate-const.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{lvm_version}-%{release}-buildroot
+BuildRequires: libaio-devel
 BuildRequires: libtermcap-devel
+BuildRequires: libudev-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
-BuildRequires: eudev-libudev-devel
 Requires: device-mapper >= %{device_mapper_version}-%{release}
 Requires: device-mapper-event >= %{device_mapper_version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Conflicts: lvm
 Obsoletes: lvm
 
-Distribution: Vine Linux
-Vendor: Project Vine
-Packager: daisuke
-
 %define _exec_prefix /usr
 
 %description
@@ -75,22 +68,6 @@ Group: System Environment/Libraries
 %description libs
 This package contains shared lvm2 libraries for applications.
 
-%if %{with_cluster}
-# lvm2-cluster
-%package cluster
-Summary: Cluster extensions for userland logical volume management tools
-License: GPLv2
-Group: System Environment/Base
-Requires: lvm2 >= %{version}-%{lvm_release}
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): device-mapper >= %{device_mapper_version}
-Requires(preun): lvm2 >= 2.02
-
-%description cluster
-Extensions to LVM2 to support clusters.
-%endif
-
 # device-mapper
 %package -n device-mapper
 Summary: Device mapper utility
@@ -123,19 +100,6 @@ Requires: device-mapper-libs = %{device_mapper_version}-%{release}
 This package contains files needed to develop applications that use
 the device-mapper libraries.
 
-# device-mapper-static
-%package -n device-mapper-static
-Summary: Static libraries for device-mapper
-Summary(ja): Device-mapper の静的ライブラリ
-Version: %{device_mapper_version}
-Release: %{release}
-License: LGPLv2
-Group: Development/Libraries
-Requires: device-mapper-devel = %{device_mapper_version}-%{release}
-
-%description -n device-mapper-static
-This package contains the device-mapper static libraries.
-
 %package -n device-mapper-libs
 Summary: Device-mapper shared library
 Summary(ja): Device-mapper の共有ライブラリ
@@ -190,12 +154,6 @@ the device-mapper event library.
 %prep
 %setup -q -n LVM2.%{lvm_version}
 %patch0 -p1 -b .preferred_names
-%patch1 -p1 -b .lvmetad_timeout
-%patch2 -p1 -b .lvmlockd_uninitialized
-
-%patch10 -p1 -b .libdevmapper_static
-
-#%patch20 -p1
 
 %build
 %define _exec_prefix /
@@ -235,14 +193,8 @@ install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/cache
 install -m 0700 -d $RPM_BUILD_ROOT/var/lock/lvm
 install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/cache/.cache
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
-%if %{with_cluster}
-install scripts/clvmd_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
-install scripts/cmirrord_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/cmirrord
-%endif
 install -m 0755 scripts/lvm2_monitoring_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/lvm2-monitor
-install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
 
-install -m 644 libdm/ioctl/libdevmapper.a $RPM_BUILD_ROOT/usr%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -260,19 +212,6 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
-%if %{with_cluster}
-%post cluster
-/sbin/chkconfig --add clvmd
-
-/sbin/lvmconf --lockinglibdir %{_libdir}
-
-%preun cluster
-if [ "$1" = 0 ]; then
-        /sbin/chkconfig --del clvmd
-        /sbin/lvmconf --disable-cluster
-fi
-%endif
-
 %post -n device-mapper-libs -p /sbin/ldconfig
 
 %postun -n device-mapper-libs -p /sbin/ldconfig
@@ -283,7 +222,8 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW
+%license COPYING COPYING.LIB
+%doc INSTALL README VERSION WHATS_NEW
 %attr(555,root,root) %{_sbindir}/fsadm
 %{_sbindir}/lvchange
 %{_sbindir}/lvconvert
@@ -291,7 +231,6 @@ fi
 %{_sbindir}/lvdisplay
 %{_sbindir}/lvextend
 %{_sbindir}/lvm
-%{_sbindir}/lvmconf
 %{_sbindir}/lvmconfig
 %{_sbindir}/lvmdiskscan
 %{_sbindir}/lvmdump
@@ -337,6 +276,7 @@ fi
 %{_mandir}/man7/lvmreport.7.gz
 %{_mandir}/man7/lvmsystemid.7.gz
 %{_mandir}/man7/lvmthin.7.gz
+%{_mandir}/man7/lvmvdo.7.gz
 %{_mandir}/man8/fsadm.8.gz
 %{_mandir}/man8/lvchange.8.gz
 %{_mandir}/man8/lvconvert.8.gz
@@ -348,7 +288,6 @@ fi
 %{_mandir}/man8/lvm-dumpconfig.8.gz
 %{_mandir}/man8/lvm-fullreport.8.gz
 %{_mandir}/man8/lvm-lvpoll.8.gz
-%{_mandir}/man8/lvmconf.8.gz
 %{_mandir}/man8/lvmconfig.8.gz
 %{_mandir}/man8/lvmdiskscan.8.gz
 %{_mandir}/man8/lvmdump.8.gz
@@ -389,6 +328,7 @@ fi
 %{_mandir}/man8/vgscan.8.gz
 %{_mandir}/man8/vgsplit.8.gz
 %{_udevdir}/11-dm-lvm.rules
+%{_udevdir}/69-dm-lvm-metad.rules
 %dir /etc/lvm
 %ghost /etc/lvm/cache/.cache
 %config(noreplace) /etc/lvm/lvm.conf
@@ -403,15 +343,11 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-/usr%{_libdir}/liblvm2app.so
 /usr%{_libdir}/liblvm2cmd.so
-%{_includedir}/lvm2app.h
 %{_includedir}/lvm2cmd.h
-/usr%{_libdir}/pkgconfig/lvm2app.pc
 /usr%{_libdir}/libdevmapper-event-lvm2.so
 
 %files libs
-%attr(755,root,root) %{_libdir}/liblvm2app.so.*
 %attr(755,root,root) %{_libdir}/liblvm2cmd.so.*
 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2.so.*
 %dir %{_libdir}/device-mapper
@@ -419,22 +355,17 @@ fi
 %{_libdir}/device-mapper/libdevmapper-event-lvm2snapshot.so
 %{_libdir}/device-mapper/libdevmapper-event-lvm2raid.so
 %{_libdir}/device-mapper/libdevmapper-event-lvm2thin.so
+%{_libdir}/device-mapper/libdevmapper-event-lvm2vdo.so
 %{_libdir}/libdevmapper-event-lvm2mirror.so
 %{_libdir}/libdevmapper-event-lvm2snapshot.so
 %{_libdir}/libdevmapper-event-lvm2raid.so
 %{_libdir}/libdevmapper-event-lvm2thin.so
-
-%if %{with_cluster}
-%files cluster
-%defattr(-,root,root,-)
-%attr(755,root,root) /usr/sbin/clvmd
-%{_mandir}/man8/clvmd.8.gz
-/etc/rc.d/init.d/clvmd
-%endif
+%{_libdir}/libdevmapper-event-lvm2vdo.so
 
 %files -n device-mapper
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL udev/12-dm-permissions.rules
+%license COPYING COPYING.LIB
+%doc WHATS_NEW_DM VERSION_DM README INSTALL udev/12-dm-permissions.rules
 %attr(755,root,root) /sbin/blkdeactivate
 %attr(755,root,root) /sbin/dmsetup
 %attr(755,root,root) /sbin/dmstats
@@ -453,10 +384,6 @@ fi
 %{_includedir}/libdevmapper.h
 /usr%{_libdir}/pkgconfig/devmapper.pc
 
-%files -n device-mapper-static
-%defattr(-,root,root,-)
-/usr%{_libdir}/libdevmapper.a
-
 %files -n device-mapper-libs
 %attr(755,root,root) %{_libdir}/libdevmapper.so.*
 
@@ -475,6 +402,10 @@ fi
 /usr%{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.03.09-1
+- new upstream release.
+- dropped Patch1, 2 and 10.
+
 * Sat Feb 24 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.02.177-1
 - updated to 2.02.177
 - dropped Patch2: fixed in upstream.

+ 11 - 7
lib/libb/libblockdev/libblockdev-vl.spec

@@ -105,17 +105,16 @@
 %define configure_opts %{?python2_copts} %{?python3_copts} %{?bcache_copts} %{?lvm_dbus_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?kbd_copts} %{?part_copts} %{?fs_copts} %{?nvdimm_copts} %{?vdo_copts} %{?gi_copts}
 
 Name:         libblockdev
-Version:      2.20
-Release:      5%{?_dist_release}
+Version:      2.23
+Release:      1%{?_dist_release}
 Summary:      A library for low-level manipulation with block devices
-License:      LGPLv2+
-URL:          https://github.com/storaged-project/libblockdev
 
 Vendor:       Project Vine
 Distribution: Vine Linux
 
-Source0:      https://github.com/storaged-project/libblockdev/releases/download/%{version}-%{release}/%{name}-%{version}.tar.gz
-Patch0:       0001-swap-error-codes.patch
+License:      LGPLv2+
+URL:          https://github.com/storaged-project/libblockdev
+Source0:      https://github.com/storaged-project/libblockdev/releases/download/%{version}-1/%{name}-%{version}.tar.gz
 
 BuildRequires: glib2-devel
 BuildRequires: libudev-devel
@@ -386,6 +385,7 @@ with the libblockdev-loop plugin/library.
 %package lvm
 BuildRequires: device-mapper-devel
 Summary:     The LVM plugin for the libblockdev library
+Provides: %{name}-tools = %{version}-%{release}
 Requires: %{name}-utils%{?_isa} >= 0.11
 Requires: lvm2
 # for thin_metadata_size
@@ -667,7 +667,6 @@ A meta-package that pulls all the libblockdev plugins as dependencies.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 
 %build
 autoreconf -ivf
@@ -884,6 +883,7 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 
 %if %{with_lvm}
 %files lvm
+%{_bindir}/lvm-cache-stats
 %{_libdir}/libbd_lvm.so.*
 
 %files lvm-devel
@@ -984,6 +984,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %files plugins-all
 
 %changelog
+* Mon Mar 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.23-1
+- new upstream release.
+- dropped Patch0: fixed in upstream.
+
 * Thu Feb 07 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.20-5
 - removed R:device-mapper-multipath from libblockdev-{fs,part}.
 

+ 14 - 8
lib/libm/libmicrohttpd/libmicrohttpd-vl.spec

@@ -1,12 +1,15 @@
 Summary: Lightweight library for embedding a webserver in applications
 Name: libmicrohttpd
-Version: 0.9.39
-Release: 2%{?_dist_release}
+Version: 0.9.70
+Release: 1%{?_dist_release}
 Group: System Environment/Libraries
-License: LGPLv2+
-URL: http://www.gnu.org/software/libmicrohttpd/
 
-Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: LGPLv2+
+URL: https://www.gnu.org/software/libmicrohttpd/
+Source0: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  autoconf, automake, libtool
@@ -103,8 +106,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
-%{_bindir}/microspdy2http
+%license COPYING
 %{_libdir}/libmicro*.so.*
 
 %files devel
@@ -120,9 +122,13 @@ fi
 %defattr(-,root,root,-)
 %{_mandir}/man3/libmicrohttpd.3.gz
 %{_infodir}/libmicrohttpd.info.gz
+%{_infodir}/libmicrohttpd_performance_data.png.gz
 %{_infodir}/libmicrohttpd-tutorial.info.gz
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.70-1
+- rebuilt with current environment.
+
 * Sun May 15 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.39-2
 - rebuild with openssl-1.0.2
 
@@ -145,7 +151,7 @@ fi
 * Sun Nov  7 2010 Tim Niemueller <tim@niemueller.de> - 0.9.2-1
 - Update to 0.9.2
 
-* Sun Jun  4 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.4.6-1
+* Fri Jun  4 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.4.6-1
 - Update to 0.4.6
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.2-2

+ 28 - 15
u/udisks/udisks-vl.spec

@@ -9,16 +9,26 @@
 %define libatasmart_version     0.12
 %define sg3_utils_version       1.27
 %define smp_utils_version       0.94
-%define lvm2_version            2.02.78
 
 Summary: Storage Management Service
 Name: udisks
-Version: 1.0.4
-Release: 4%{?_dist_release}
-License: GPLv2+
+Version: 1.0.5
+Release: 1%{?_dist_release}
 Group: System Environment/Libraries
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPLv2+
 URL: http://www.freedesktop.org/wiki/Software/udisks
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+# https://bugs.freedesktop.org/show_bug.cgi?id=90778
+Patch0:  udisks-1.0.5-fix-build-with-glibc-2.20.patch
+Patch1:  fix_bash_completion.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1238664
+Patch2:  udisks-1.0.5-fix-service-file.patch
+Patch3:  udisks-1.0.5-fix-makedev-failure.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -31,7 +41,6 @@ BuildRequires: libatasmart-devel >= %{libatasmart_version}
 BuildRequires: eudev-libgudev1-devel >= %{eudev_version}
 BuildRequires: eudev-libudev-devel >= %{eudev_version}
 BuildRequires: sg3_utils-devel >= %{sg3_utils_version}
-BuildRequires: lvm2-devel >= %{lvm2_version}
 # needed to pull in the system bus daemon
 Requires: dbus >= %{dbus_version}
 # needed to pull in the udev daemon
@@ -71,9 +80,6 @@ Requires: lvm2-libs >= %{lvm2_version}
 Obsoletes: DeviceKit-disks <= 009
 Provides: DeviceKit-disks = 010
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 udisks provides a daemon, D-Bus API and command line tools
 for managing disks and storage devices.
@@ -94,17 +100,23 @@ D-Bus interface definitions and documentation for udisks.
 
 %prep
 %setup -q
+%autopatch -p1
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=673544#c15
+rm -f src/*-glue.h tools/*-glue.h
+
+autoreconf --force --install
 
 %build
 %configure \
 	--enable-gtk-doc \
-	--enable-lvm2
-make
+	%{nil}
+make %{_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -124,9 +136,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-
-%doc README AUTHORS NEWS COPYING HACKING doc/TODO
-
+%license COPYING
+%doc README AUTHORS NEWS HACKING doc/TODO
 %{_sysconfdir}/avahi/services/udisks.service
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_sysconfdir}/profile.d/*.sh
@@ -136,7 +147,6 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/udisks-dm-export
 /lib/udev/udisks-probe-ata-smart
 /lib/udev/udisks-probe-sas-expander
-/lib/udev/udisks-lvm-pv-export
 /sbin/umount.udisks
 
 %{_bindir}/*
@@ -164,6 +174,9 @@ rm -rf $RPM_BUILD_ROOT
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 #
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.5-1
+- new upstream release.
+
 * Tue Jun 17 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.4-4
 - change BuildRequires: eudev-libudev-devel instead of libudev-devel
 - change BuildRequires: eudev-libgudev1-devel instead of libgudev1-devel

+ 11 - 10
u/udisks2/udisks2-vl.spec

@@ -8,18 +8,19 @@
 %define libatasmart_version     0.17
 %define sg3_utils_version       1.27
 %define smp_utils_version       0.94
-%define lvm2_version            2.02.78
 %global libblockdev_version     2.19
 
 Summary: Storage Management Service
 Name: udisks2
-Version: 2.8.1
-Release: 2%{?_dist_release}
-License: GPLv2+
+Version: 2.8.4
+Release: 1%{?_dist_release}
 Group: System Environment/Libraries
-URL: http://www.freedesktop.org/wiki/Software/udisks
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source0: http://udisks.freedesktop.org/releases/udisks-%{version}.tar.bz2
+License: GPLv2+
+URL: http://www.freedesktop.org/wiki/Software/udisks
+Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -97,9 +98,6 @@ Conflicts: kernel < 2.6.26
 #
 Requires: lvm2-libs >= %{lvm2_version}
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 udisks provides a daemon, D-Bus API and command line tools
 for managing disks and storage devices.
@@ -215,7 +213,6 @@ udevadm trigger
 %license COPYING
 %doc README* AUTHORS NEWS HACKING NEWS
 %config(noreplace) %{_sysconfdir}/udisks2/udisks2.conf
-%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
 /lib/udev/rules.d/80-udisks2.rules
 %{_bindir}/udisksctl
 %{_syssbindir}/umount.udisks2
@@ -228,6 +225,7 @@ udevadm trigger
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/udisksctl
 %{_datadir}/dbus-1/system-services/org.freedesktop.UDisks2.service
+%{_datadir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.policy
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -263,6 +261,9 @@ udevadm trigger
 
 #
 %changelog
+* Mon Mar 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.4-1
+- new upstream release.
+
 * Mon Jan 07 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.1-2
 - enabled lvm2, lvmcache and zram.