diff --git a/SPECS-EXTENDED/zerofree/zerofree.8 b/SPECS-EXTENDED/zerofree/zerofree.8 deleted file mode 100644 index b0be0d28e4..0000000000 --- a/SPECS-EXTENDED/zerofree/zerofree.8 +++ /dev/null @@ -1,65 +0,0 @@ -.TH "ZEROFREE" "8" -.SH "NAME" -zerofree \(em zero free blocks from ext2/3 file-systems -.SH "SYNOPSIS" -.PP -\fBzerofree\fR [\fB-n\fP] [\fB-v\fP] \fIfilesystem\fR -.SH "DESCRIPTION" -.PP -\fBzerofree\fR finds the unallocated, -non-zeroed blocks in an ext2 or ext3 -\fIfilesystem\fR (e.g. /dev/hda1) and -fills them with zeroes. This is useful if the device on which -this file-system resides is a disk image. In this case, -depending on the type of disk image, a secondary utility may be -able to reduce the size of the disk image after zerofree has -been run. -.PP -The usual way to achieve the same result (zeroing the -unallocated blocks) is to run \fBdd\fR (1) to -create a file full of zeroes that takes up the entire free -space on the drive, and then delete this file. This has many -disadvantages, which zerofree alleviates: -.IP " \(bu" 6 -it is slow; -.IP " \(bu" 6 -it makes the disk image (temporarily) grow to its maximal -extent; -.IP " \(bu" 6 -it (temporarily) uses all free space on the disk, so other -concurrent write actions may fail. -.PP -\fIfilesystem\fR has to be unmounted or -mounted read-only for \fBzerofree\fR to work. It -will exit with an error message if the -\fIfilesystem\fR is mounted writable. To -remount the root file-system readonly, you can first switch to -single user runlevel (\fBtelinit 1\fR) then use -\fBmount \-o remount,ro -\fIfilesystem\fR\fR. -.PP -\fBzerofree\fR has been written to be -run from GNU/Linux systems installed as guest OSes inside a -virtual machine. It may however be useful in other -situations. -.SH "OPTIONS" -.IP "\fB-n\fP " 10 -Perform a dry run (do not modify the file-system); -.IP "\fB-v\fP " 10 -Be verbose. -.SH "SEE ALSO" -.PP -dd (1). -.SH "AUTHOR" -.PP -This manual page was written by Thibaut Paumard for -the \fBDebian\fP system (but may be used by others). Permission is -granted to copy, distribute and/or modify this document under -the terms of the GNU General Public License, Version 2 or any -later version published by the Free Software Foundation. - -.PP -On Debian systems, the complete text of the GNU General Public -License can be found in /usr/share/common-licenses/GPL-2. - -.\" created by instant / docbook-to-man, Wed 25 Nov 2009, 17:45 diff --git a/SPECS-EXTENDED/zerofree/zerofree.sgml b/SPECS-EXTENDED/zerofree/zerofree.sgml deleted file mode 100644 index e5c43a3d02..0000000000 --- a/SPECS-EXTENDED/zerofree/zerofree.sgml +++ /dev/null @@ -1,163 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. - --> - - Thibaut"> - Paumard"> - - February 6, 2008"> - 8"> - <paumard@users.sourceforge.net>"> - - ZEROFREE"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - zero free blocks from ext2/3 file-systems - - - - &dhpackage; - - - - - - filesystem - - - - DESCRIPTION - - &dhpackage; finds the unallocated, - non-zeroed blocks in an ext2 or ext3 - filesystem (e.g. /dev/hda1) and - fills them with zeroes. This is useful if the device on which - this file-system resides is a disk image. In this case, - depending on the type of disk image, a secondary utility may be - able to reduce the size of the disk image after zerofree has - been run. - - The usual way to achieve the same result (zeroing the - unallocated blocks) is to run dd (1) to - create a file full of zeroes that takes up the entire free - space on the drive, and then delete this file. This has many - disadvantages, which zerofree alleviates: - - it is slow; - - it makes the disk image (temporarily) grow to its maximal - extent; - - it (temporarily) uses all free space on the disk, so other - concurrent write actions may fail. - - - - filesystem has to be unmounted or - mounted read-only for &dhpackage; to work. It - will exit with an error message if the - filesystem is mounted writable. To - remount the root file-system readonly, you can first switch to - single user runlevel (telinit 1) then use - mount -o remount,ro - filesystem. - - &dhpackage; has been written to be - run from GNU/Linux systems installed as guest OSes inside a - virtual machine. It may however be useful in other - situations. - - - - OPTIONS - - - - - - - Perform a dry run (do not modify the file-system); - - - - - - - Be verbose. - - - - - - SEE ALSO - - dd (1). - - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 or any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL-2. - - - - - - - - diff --git a/SPECS-EXTENDED/afflib/afflib.signatures.json b/SPECS/afflib/afflib.signatures.json similarity index 100% rename from SPECS-EXTENDED/afflib/afflib.signatures.json rename to SPECS/afflib/afflib.signatures.json diff --git a/SPECS-EXTENDED/afflib/afflib.spec b/SPECS/afflib/afflib.spec similarity index 96% rename from SPECS-EXTENDED/afflib/afflib.spec rename to SPECS/afflib/afflib.spec index bb3598871f..b4579a67ad 100644 --- a/SPECS-EXTENDED/afflib/afflib.spec +++ b/SPECS/afflib/afflib.spec @@ -1,48 +1,38 @@ -Vendor: Microsoft Corporation -Distribution: Mariner +Summary: Library to support the Advanced Forensic Format Name: afflib Version: 3.7.19 -Release: 5%{?dist} -Summary: Library to support the Advanced Forensic Format - -License: BSD with advertising +Release: 6%{?dist} +License: BSD WITH advertising AND Public Domain +Vendor: Microsoft Corporation +Distribution: Mariner URL: https://github.com/sshock/AFFLIBv3 Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++ -BuildRequires: libtool - BuildRequires: curl-devel BuildRequires: expat-devel +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: make # GPLv2 FOSS incompatible with BSD with advertising -##BuildRequires: fuse-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel -# GPLv2 FOSS incompatible with BSD with advertising -##BuildRequires: readline-devel -#BuildRequires: libedit-devel - good replacement for readline - not supported for now -BuildRequires: zlib-devel -BuildRequires: make BuildRequires: python3 +BuildRequires: python3-Cython BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-Cython - - +BuildRequires: zlib-devel # Afflib format uses lzma-SDK 443 -Provides: bundled(lzma) = 443 - - +Provides: bundled(lzma) = 443 %description AFF® is an open and extensible file format designed to store disk images and associated metadata. afflib is library for support of the Advanced Forensic Format (AFF). - %package -n afftools Summary: Utilities for %{name} + Requires: %{name}%{?_isa} = %{version}-%{release} %description -n afftools @@ -50,34 +40,27 @@ The %{name}-utils package contains utilities for using %{name}. %package devel Summary: Development files for %{name} + Requires: %{name}%{?_isa} = %{version}-%{release} Requires: openssl-devel -Requires: pkgconfig +Requires: pkg-config %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %package -n python%{python3_pkgversion}-pyaff +%{?python_provide:%python_provide python%{python3_pkgversion}-pyaff} Summary: Python3 binding for the AFFLIB Group: Development/Libraries -%{?python_provide:%python_provide python%{python3_pkgversion}-pyaff} - - %description -n python%{python3_pkgversion}-pyaff Python3 bindings for AFFLIB. These bindings currently support a read-only file-like interface to AFFLIB and basic metadata accessor functions. The binding is not currently complete. - - - - %prep %autosetup -p1 -n AFFLIBv3-%{version} -# prevent internal lzma to be built - testing -#rm -rf lzma443 #fix spurious permissions with lzma443 find lzma443 -type f -exec chmod 0644 {} ';' @@ -106,18 +89,15 @@ cd pyaff %global py_setup_args build_ext --include-dirs %{_builddir}/AFFLIBv3-%{version}/include --library-dirs %{_builddir}/AFFLIBv3-%{version}/lib/.libs %py3_build - %install %make_install -find %{buildroot} -name '*.la' -exec rm -f {} ';' +find %{buildroot} -type f -name "*.la" -delete -print cd pyaff %py3_install - %ldconfig_scriptlets - %files %doc AUTHORS BUGLIST.txt ChangeLog NEWS README %doc doc/announce_2.2.txt @@ -141,6 +121,9 @@ cd pyaff %{python3_sitearch}/pyaff* %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 3.7.19-6 +- Cleaning-up spec. License verified. + * Mon Aug 09 2021 Thomas Crain - 3.7.19-5 - Initial CBL-Mariner import from Fedora 35 (license: MIT). - Remove Python 2 support @@ -442,4 +425,3 @@ cd pyaff * Fri Nov 2 2007 kwizart < kwizart at gmail.com > - 2.4.0-1 - Initial package for Fedora - diff --git a/SPECS-EXTENDED/execstack/Add-PL_ARCH-for-AArch64.patch b/SPECS/execstack/Add-PL_ARCH-for-AArch64.patch similarity index 100% rename from SPECS-EXTENDED/execstack/Add-PL_ARCH-for-AArch64.patch rename to SPECS/execstack/Add-PL_ARCH-for-AArch64.patch diff --git a/SPECS-EXTENDED/execstack/execstack.signatures.json b/SPECS/execstack/execstack.signatures.json similarity index 100% rename from SPECS-EXTENDED/execstack/execstack.signatures.json rename to SPECS/execstack/execstack.signatures.json diff --git a/SPECS-EXTENDED/execstack/execstack.spec b/SPECS/execstack/execstack.spec similarity index 79% rename from SPECS-EXTENDED/execstack/execstack.spec rename to SPECS/execstack/execstack.spec index 4fd3cd450d..1baed75285 100644 --- a/SPECS-EXTENDED/execstack/execstack.spec +++ b/SPECS/execstack/execstack.spec @@ -1,27 +1,30 @@ -Name: execstack -Version: 0.5.0 -Release: 19%{?dist} -Summary: Utility to set/clear/query executable stack bit - %global commit 4c79120bcdbde0616f592458ccde7035e92ca3d8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -License: GPLv2+ +Summary: Utility to set/clear/query executable stack bit +Name: execstack +Version: 0.5.0 +Release: 20%{?dist} +License: GPLv2+ +Vendor: Microsoft Corporation +Distribution: Mariner # work around for missing upstream tarball with latest checkin -Url: https://github.com/keszybz/prelink -Source0: https://github.com/keszybz/prelink/archive/%{commit}.tar.gz#/prelink-%{shortcommit}.tar.gz +URL: https://github.com/keszybz/prelink +Source0: https://github.com/keszybz/prelink/archive/%{commit}.tar.gz#/prelink-%{shortcommit}.tar.gz +Patch0: Add-PL_ARCH-for-AArch64.patch +BuildRequires: elfutils-libelf-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: git +BuildRequires: libselinux-devel +BuildRequires: libselinux-utils -Patch0: Add-PL_ARCH-for-AArch64.patch - -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: elfutils-libelf-devel -BuildRequires: libselinux-devel, libselinux-utils -BuildRequires: git -Requires: glibc >= 2.2.4-18, coreutils, findutils -Requires: util-linux, gawk, grep - -Obsoletes: prelink < 0.5.0-8 +Requires: coreutils +Requires: findutils +Requires: gawk +Requires: glibc >= 2.2.4-18 +Requires: grep +Requires: util-linux %description This package is built from prelink sources but contains just the @@ -58,6 +61,9 @@ install -Dm0644 doc/execstack.8 %{buildroot}%{_mandir}/man8/execstack.8 %{_mandir}/man8/execstack.8.* %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 0.5.0-20 +- Cleaning-up spec. License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 0.5.0-19 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/gfs2-utils/0-Fix_libuuid_linking.patch b/SPECS/gfs2-utils/0-Fix_libuuid_linking.patch similarity index 100% rename from SPECS-EXTENDED/gfs2-utils/0-Fix_libuuid_linking.patch rename to SPECS/gfs2-utils/0-Fix_libuuid_linking.patch diff --git a/SPECS-EXTENDED/gfs2-utils/1-Fix_more_linking_errors.patch b/SPECS/gfs2-utils/1-Fix_more_linking_errors.patch similarity index 100% rename from SPECS-EXTENDED/gfs2-utils/1-Fix_more_linking_errors.patch rename to SPECS/gfs2-utils/1-Fix_more_linking_errors.patch diff --git a/SPECS-EXTENDED/gfs2-utils/gfs2-utils.signatures.json b/SPECS/gfs2-utils/gfs2-utils.signatures.json similarity index 100% rename from SPECS-EXTENDED/gfs2-utils/gfs2-utils.signatures.json rename to SPECS/gfs2-utils/gfs2-utils.signatures.json diff --git a/SPECS-EXTENDED/gfs2-utils/gfs2-utils.spec b/SPECS/gfs2-utils/gfs2-utils.spec similarity index 86% rename from SPECS-EXTENDED/gfs2-utils/gfs2-utils.spec rename to SPECS/gfs2-utils/gfs2-utils.spec index 6f70bbc146..22d3f1b304 100644 --- a/SPECS-EXTENDED/gfs2-utils/gfs2-utils.spec +++ b/SPECS/gfs2-utils/gfs2-utils.spec @@ -1,5 +1,3 @@ -Vendor: Microsoft Corporation -Distribution: Mariner ############################################################################### ############################################################################### ## @@ -11,30 +9,32 @@ Distribution: Mariner ## ############################################################################### ############################################################################### +Summary: Utilities for managing the global file system (GFS2) +Name: gfs2-utils +Version: 3.2.0 +Release: 9%{?dist} +License: GPLv2+ AND LGPLv2+ +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://pagure.io/gfs2-utils +Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz +Patch0: 0-Fix_libuuid_linking.patch +Patch1: 1-Fix_more_linking_errors.patch -Name: gfs2-utils -Version: 3.2.0 -Release: 8%{?dist} -License: GPLv2+ and LGPLv2+ -Summary: Utilities for managing the global file system (GFS2) -%ifnarch %{arm} -%{?fedora:Recommends: kmod(gfs2.ko) kmod(dlm.ko)} -%endif -BuildRequires: ncurses-devel -BuildRequires: kernel-headers -BuildRequires: automake -BuildRequires: libtool -BuildRequires: zlib-devel -BuildRequires: gettext-devel -BuildRequires: bison -BuildRequires: flex -BuildRequires: libblkid-devel -BuildRequires: libuuid-devel -BuildRequires: check-devel -Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz -URL: https://pagure.io/gfs2-utils -Patch0: 0-Fix_libuuid_linking.patch -Patch1: 1-Fix_more_linking_errors.patch +BuildRequires: automake +BuildRequires: bison +BuildRequires: check-devel +BuildRequires: flex +BuildRequires: gettext-devel +BuildRequires: kernel-headers +BuildRequires: libblkid-devel +BuildRequires: libtool +BuildRequires: libuuid-devel +BuildRequires: ncurses-devel +BuildRequires: zlib-devel + +Recommends: kmod(dlm.ko) +Recommends: kmod(gfs2.ko) %prep %autosetup -p1 @@ -50,8 +50,8 @@ make check || { cat tests/testsuite.log; exit 1; } %install make -C gfs2 install DESTDIR=%{buildroot} # Don't ship gfs2_{trace,lockcapture} in this package -rm -f %{buildroot}/usr/sbin/gfs2_trace -rm -f %{buildroot}/usr/sbin/gfs2_lockcapture +rm -f %{buildroot}%{_sbindir}/gfs2_trace +rm -f %{buildroot}%{_sbindir}/gfs2_lockcapture rm -f %{buildroot}%{_mandir}/man8/gfs2_trace.8 rm -f %{buildroot}%{_mandir}/man8/gfs2_lockcapture.8 @@ -60,8 +60,8 @@ The gfs2-utils package contains a number of utilities for creating, checking, modifying, and correcting inconsistencies in GFS2 file systems. %files -%doc doc/COPYING.* doc/COPYRIGHT doc/*.txt -%doc doc/README.contributing doc/README.licence +%license doc/COPYING.* doc/README.licence doc/COPYRIGHT +%doc doc/README.contributing doc/*.txt %{_sbindir}/fsck.gfs2 %{_sbindir}/gfs2_grow %{_sbindir}/gfs2_jadd @@ -74,9 +74,12 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_mandir}/man8/*gfs2* %{_mandir}/man8/glocktop* %{_mandir}/man5/* -%{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules +%{_libdir}/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 3.2.0-9 +- Cleaning-up spec. License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 3.2.0-8 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/hexedit/hexedit-1.2.13-config.patch b/SPECS/hexedit/hexedit-1.2.13-config.patch similarity index 100% rename from SPECS-EXTENDED/hexedit/hexedit-1.2.13-config.patch rename to SPECS/hexedit/hexedit-1.2.13-config.patch diff --git a/SPECS-EXTENDED/hexedit/hexedit-man-page-color.patch b/SPECS/hexedit/hexedit-man-page-color.patch similarity index 100% rename from SPECS-EXTENDED/hexedit/hexedit-man-page-color.patch rename to SPECS/hexedit/hexedit-man-page-color.patch diff --git a/SPECS-EXTENDED/hexedit/hexedit.signatures.json b/SPECS/hexedit/hexedit.signatures.json similarity index 100% rename from SPECS-EXTENDED/hexedit/hexedit.signatures.json rename to SPECS/hexedit/hexedit.signatures.json diff --git a/SPECS-EXTENDED/hexedit/hexedit.spec b/SPECS/hexedit/hexedit.spec similarity index 92% rename from SPECS-EXTENDED/hexedit/hexedit.spec rename to SPECS/hexedit/hexedit.spec index fb8a636263..d2fe85f984 100644 --- a/SPECS-EXTENDED/hexedit/hexedit.spec +++ b/SPECS/hexedit/hexedit.spec @@ -1,20 +1,18 @@ +Summary: A hexadecimal file viewer and editor +Name: hexedit +Version: 1.2.13 +Release: 19%{?dist} +License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner -Summary: A hexadecimal file viewer and editor -Name: hexedit -Version: 1.2.13 -Release: 18%{?dist} -License: GPLv2+ - -URL: http://rigaux.org/hexedit.html -Source: http://rigaux.org/%{name}-%{version}.src.tgz - -Patch1: hexedit-1.2.13-config.patch +URL: http://rigaux.org/hexedit.html +Source: http://rigaux.org/%{name}-%{version}.src.tgz +Patch1: hexedit-1.2.13-config.patch # Document --color option. Sent upstream 2013-04-05. -Patch2: hexedit-man-page-color.patch +Patch2: hexedit-man-page-color.patch -BuildRequires: ncurses-devel -BuildRequires: gcc +BuildRequires: gcc +BuildRequires: ncurses-devel %description Hexedit shows a file both in ASCII and in hexadecimal. The file can be a device @@ -33,16 +31,20 @@ make %{_smp_mflags} %install make install \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ + mandir=%{buildroot}%{_mandir} \ + bindir=%{buildroot}%{_bindir} \ INSTALL='install -p' %files -%doc hexedit-%{version}.lsm COPYING Changes +%license COPYING +%doc hexedit-%{version}.lsm Changes %{_bindir}/hexedit %{_mandir}/man1/hexedit.1* %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 1.2.13-19 +- Cleaning-up spec. License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 1.2.13-18 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/libewf/libewf.signatures.json b/SPECS/libewf/libewf.signatures.json similarity index 100% rename from SPECS-EXTENDED/libewf/libewf.signatures.json rename to SPECS/libewf/libewf.signatures.json diff --git a/SPECS-EXTENDED/libewf/libewf.spec b/SPECS/libewf/libewf.spec similarity index 94% rename from SPECS-EXTENDED/libewf/libewf.spec rename to SPECS/libewf/libewf.spec index a96a193c05..6a9e542535 100644 --- a/SPECS-EXTENDED/libewf/libewf.spec +++ b/SPECS/libewf/libewf.spec @@ -1,35 +1,31 @@ -Vendor: Microsoft Corporation -Distribution: Mariner - +Summary: Library for the Expert Witness Compression Format (EWF) Name: libewf Version: 20140608 -Release: 21%{?dist} -Summary: Library for the Expert Witness Compression Format (EWF) +Release: 22%{?dist} +License: LGPLv3 +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://github.com/libyal/libewf +Source0: https://github.com/libyal/legacy/raw/main/%{name}/%{name}-%{version}.tar.gz -License: LGPLv3+ -URL: http://sourceforge.net/projects/libewf/ -Source0: https://53efc0a7187d0baa489ee347026b8278fe4020f6.googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/%{name}-%{version}.tar.gz - - -BuildRequires: make -BuildRequires: gcc-c++ BuildRequires: fuse-devel +BuildRequires: gcc-c++ BuildRequires: libuuid-devel +BuildRequires: make BuildRequires: openssl-devel BuildRequires: zlib-devel - %description Libewf is a library for support of the Expert Witness Compression Format (EWF), -it support both the SMART format (EWF-S01) and the EnCase format (EWF-E01). +it support both the SMART format (EWF-S01) and the EnCase format (EWF-E01). Libewf allows you to read and write media information within the EWF files. - %package -n ewftools Summary: Utilities for the Expert Witness Compression Format (EWF) + Requires: %{name}%{?_isa} = %{version}-%{release} + Provides: %{name}-tools = %{version}-%{release} -Obsoletes: %{name}-tools <= %{version}-%{release} %description -n ewftools Several tools for reading and writing EWF files. @@ -37,19 +33,18 @@ It contains tools to acquire, verify and export EWF files. %package devel Summary: Development files for %{name} + Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkg-config Requires: zlib-devel -Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %prep %setup -q - %build # FIXME: Package suffers from c11/inline issues # Workaround by appending -std=gnu89 to CFLAGS @@ -57,10 +52,10 @@ developing applications that use %{name}. %configure --disable-static \ --enable-wide-character-type \ %if "%{version}" <= "20140608" - CFLAGS="${RPM_OPT_FLAGS} -std=gnu89" + CFLAGS="%{optflags} -std=gnu89" %endif -# Remove rpath from libtool +# Remove rpath from libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -69,16 +64,12 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool %make_build - %install %make_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - - +find %{buildroot} -type f -name "*.la" -delete -print %ldconfig_scriptlets - %files %doc AUTHORS NEWS %license COPYING @@ -96,6 +87,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_mandir}/man3/*.gz %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 20140608-22 +- Cleaning-up spec. License verified. + * Mon Aug 09 2021 Thomas Crain - 20140608-21 - Initial CBL-Mariner import from Fedora 35 (license: MIT). - Remove Python 2 support @@ -249,4 +243,3 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' * Fri Nov 2 2007 kwizart < kwizart at gmail.com > - 0-1.20070512 - Initial package for Fedora - diff --git a/SPECS-EXTENDED/libldm/libldm.signatures.json b/SPECS/libldm/libldm.signatures.json similarity index 100% rename from SPECS-EXTENDED/libldm/libldm.signatures.json rename to SPECS/libldm/libldm.signatures.json diff --git a/SPECS-EXTENDED/libldm/libldm.spec b/SPECS/libldm/libldm.spec similarity index 91% rename from SPECS-EXTENDED/libldm/libldm.spec rename to SPECS/libldm/libldm.spec index f2ef744a17..b56ef280fe 100644 --- a/SPECS-EXTENDED/libldm/libldm.spec +++ b/SPECS/libldm/libldm.spec @@ -1,21 +1,23 @@ -Vendor: Microsoft Corporation -Distribution: Mariner +Summary: A tool to manage Windows dynamic disks Name: libldm Version: 0.2.4 -Release: 8%{?dist} -Summary: A tool to manage Windows dynamic disks - -License: LGPLv3+ and GPLv3+ -URL: https://github.com/mdbooth/libldm +Release: 9%{?dist} +License: LGPLv3+ AND GPLv3+ +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://github.com/mdbooth/libldm Source0: https://github.com/mdbooth/libldm/archive/%{name}-%{version}.tar.gz BuildRequires: %{_bindir}/xsltproc -BuildRequires: autoconf, automake, libtool +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: device-mapper-devel >= 1.0 BuildRequires: glib2-devel >= 2.26.0 BuildRequires: json-glib-devel >= 0.14.0 -BuildRequires: device-mapper-devel >= 1.0 -BuildRequires: zlib-devel libuuid-devel readline-devel - +BuildRequires: libtool +BuildRequires: libuuid-devel +BuildRequires: readline-devel +BuildRequires: zlib-devel %description libldm is a library for managing Microsoft Windows dynamic disks, which use @@ -25,7 +27,6 @@ exposes this functionality as a command-line tool. libldm is released under LGPLv3+. ldmtool is released under GPLv3+. - %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -34,7 +35,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %prep %setup -q -n %{name}-%{name}-%{version} sed -i -e 's/-Werror //' src/Makefile.* @@ -48,28 +48,26 @@ autoreconf -i %configure --disable-static --disable-gtk-doc make %{?_smp_mflags} V=1 - %install %make_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - +find %{buildroot} -type f -name "*.la" -delete -print %ldconfig_scriptlets - %files %license COPYING.lgpl COPYING.gpl %{_libdir}/*.so.* %{_bindir}/ldmtool - %files devel %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/ldm-1.0.pc - %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 0.2.4-9 +- Cleaning-up spec. License verified. + * Mon Mar 21 2022 Pawel Winogrodzki - 0.2.4-8 - Adding BR on '%%{_bindir}/xsltproc'. - Disabled gtk doc generation to remove network dependency during build-time. diff --git a/SPECS-EXTENDED/mac-robber/mac-robber.signatures.json b/SPECS/mac-robber/mac-robber.signatures.json similarity index 100% rename from SPECS-EXTENDED/mac-robber/mac-robber.signatures.json rename to SPECS/mac-robber/mac-robber.signatures.json diff --git a/SPECS-EXTENDED/mac-robber/mac-robber.spec b/SPECS/mac-robber/mac-robber.spec similarity index 95% rename from SPECS-EXTENDED/mac-robber/mac-robber.spec rename to SPECS/mac-robber/mac-robber.spec index 6c1cab26ea..31586c55d5 100644 --- a/SPECS-EXTENDED/mac-robber/mac-robber.spec +++ b/SPECS/mac-robber/mac-robber.spec @@ -1,45 +1,40 @@ -Vendor: Microsoft Corporation -Distribution: Mariner +Summary: Tool to create a timeline of file activity for mounted file systems Name: mac-robber Version: 1.02 -Release: 22%{?dist} -Summary: Tool to create a timeline of file activity for mounted file systems - -License: GPLv2+ -URL: http://sourceforge.net/projects/mac-robber/ +Release: 23%{?dist} +License: GPLv2 +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://sourceforge.net/projects/mac-robber/ Source0: http://downloads.sourceforge.net/mac-robber/mac-robber-%{version}.tar.gz BuildRequires: gcc BuildRequires: make - %description mac-robber is a digital forensics and incident response tool that can be used -with The Sleuth Kit to create a timeline of file activity for mounted +with The Sleuth Kit to create a timeline of file activity for mounted file systems. - %prep %setup -q - %build %make_build GCC_OPT="%{optflags}" - %install mkdir -p %{buildroot}%{_bindir} install -pm 0755 mac-robber %{buildroot}%{_bindir} - - %files -%doc CHANGES README %license COPYING +%doc CHANGES README %{_bindir}/mac-robber - %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 1.02-23 +- Cleaning-up spec. License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 1.02-22 - Initial CBL-Mariner import from Fedora 35 (license: MIT). diff --git a/SPECS-EXTENDED/mdadm/mdadm-2.5.2-static.patch b/SPECS/mdadm/mdadm-2.5.2-static.patch similarity index 100% rename from SPECS-EXTENDED/mdadm/mdadm-2.5.2-static.patch rename to SPECS/mdadm/mdadm-2.5.2-static.patch diff --git a/SPECS-EXTENDED/mdadm/mdadm-3.3-udev.patch b/SPECS/mdadm/mdadm-3.3-udev.patch similarity index 100% rename from SPECS-EXTENDED/mdadm/mdadm-3.3-udev.patch rename to SPECS/mdadm/mdadm-3.3-udev.patch diff --git a/SPECS-EXTENDED/mdadm/mdadm-4.1-no-Werror.patch b/SPECS/mdadm/mdadm-4.1-no-Werror.patch similarity index 100% rename from SPECS-EXTENDED/mdadm/mdadm-4.1-no-Werror.patch rename to SPECS/mdadm/mdadm-4.1-no-Werror.patch diff --git a/SPECS-EXTENDED/mdadm/mdadm-raid-check-sysconfig b/SPECS/mdadm/mdadm-raid-check-sysconfig similarity index 100% rename from SPECS-EXTENDED/mdadm/mdadm-raid-check-sysconfig rename to SPECS/mdadm/mdadm-raid-check-sysconfig diff --git a/SPECS-EXTENDED/mdadm/mdadm.conf b/SPECS/mdadm/mdadm.conf similarity index 100% rename from SPECS-EXTENDED/mdadm/mdadm.conf rename to SPECS/mdadm/mdadm.conf diff --git a/SPECS-EXTENDED/mdadm/mdadm.rules b/SPECS/mdadm/mdadm.rules similarity index 100% rename from SPECS-EXTENDED/mdadm/mdadm.rules rename to SPECS/mdadm/mdadm.rules diff --git a/SPECS-EXTENDED/mdadm/mdadm.signatures.json b/SPECS/mdadm/mdadm.signatures.json similarity index 100% rename from SPECS-EXTENDED/mdadm/mdadm.signatures.json rename to SPECS/mdadm/mdadm.signatures.json diff --git a/SPECS-EXTENDED/mdadm/mdadm.spec b/SPECS/mdadm/mdadm.spec similarity index 99% rename from SPECS-EXTENDED/mdadm/mdadm.spec rename to SPECS/mdadm/mdadm.spec index 6a8c588999..a9f83a1eed 100644 --- a/SPECS-EXTENDED/mdadm/mdadm.spec +++ b/SPECS/mdadm/mdadm.spec @@ -1,8 +1,9 @@ %bcond_with libreport + Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 4.1 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner @@ -16,14 +17,16 @@ Source5: mdadm.conf Source6: mdadm_event.conf Source7: raid-check.timer Source8: raid-check.service -# Build without -Werror. From Debian. +# Build without -Werror. From Debian. Patch00: https://sources.debian.org/data/main/m/mdadm/4.1-2/debian/patches/debian-no-Werror.diff#/mdadm-4.1-no-Werror.patch -# Fedora customization patches +# Fedora customization patches, keeping in Mariner for now. Patch97: mdadm-3.3-udev.patch Patch98: mdadm-2.5.2-static.patch + BuildRequires: binutils-devel BuildRequires: gcc BuildRequires: systemd-rpm-macros + Requires(post): coreutils Requires(post): systemd Requires(postun): coreutils @@ -96,6 +99,9 @@ install -m644 %{SOURCE6} %{buildroot}%{_sysconfdir}/libreport/events.d %endif %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 4.1-8 +- Cleaning-up spec. License verified. + * Tue Jan 18 2022 Thomas Crain - 4.1-7 - Disable usage of libreport by default - License verified diff --git a/SPECS-EXTENDED/mdadm/mdadm_event.conf b/SPECS/mdadm/mdadm_event.conf similarity index 100% rename from SPECS-EXTENDED/mdadm/mdadm_event.conf rename to SPECS/mdadm/mdadm_event.conf diff --git a/SPECS-EXTENDED/mdadm/mdmonitor.service b/SPECS/mdadm/mdmonitor.service similarity index 100% rename from SPECS-EXTENDED/mdadm/mdmonitor.service rename to SPECS/mdadm/mdmonitor.service diff --git a/SPECS-EXTENDED/mdadm/raid-check b/SPECS/mdadm/raid-check similarity index 100% rename from SPECS-EXTENDED/mdadm/raid-check rename to SPECS/mdadm/raid-check diff --git a/SPECS-EXTENDED/mdadm/raid-check.service b/SPECS/mdadm/raid-check.service similarity index 100% rename from SPECS-EXTENDED/mdadm/raid-check.service rename to SPECS/mdadm/raid-check.service diff --git a/SPECS-EXTENDED/mdadm/raid-check.timer b/SPECS/mdadm/raid-check.timer similarity index 100% rename from SPECS-EXTENDED/mdadm/raid-check.timer rename to SPECS/mdadm/raid-check.timer diff --git a/SPECS-EXTENDED/ntfs-3g-system-compression/ntfs-3g-system-compression.signatures.json b/SPECS/ntfs-3g-system-compression/ntfs-3g-system-compression.signatures.json similarity index 100% rename from SPECS-EXTENDED/ntfs-3g-system-compression/ntfs-3g-system-compression.signatures.json rename to SPECS/ntfs-3g-system-compression/ntfs-3g-system-compression.signatures.json diff --git a/SPECS-EXTENDED/ntfs-3g-system-compression/ntfs-3g-system-compression.spec b/SPECS/ntfs-3g-system-compression/ntfs-3g-system-compression.spec similarity index 73% rename from SPECS-EXTENDED/ntfs-3g-system-compression/ntfs-3g-system-compression.spec rename to SPECS/ntfs-3g-system-compression/ntfs-3g-system-compression.spec index 82fdcbc6bb..1cc34f28ce 100644 --- a/SPECS-EXTENDED/ntfs-3g-system-compression/ntfs-3g-system-compression.spec +++ b/SPECS/ntfs-3g-system-compression/ntfs-3g-system-compression.spec @@ -1,19 +1,20 @@ +Summary: NTFS-3G plugin for reading "system compressed" files +Name: ntfs-3g-system-compression +Version: 1.0 +Release: 5%{?dist} +License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner -Name: ntfs-3g-system-compression -Summary: NTFS-3G plugin for reading "system compressed" files -Version: 1.0 -Release: 4%{?dist} -License: GPLv2+ -URL: https://github.com/ebiggers/ntfs-3g-system-compression -Source0: https://github.com/ebiggers/ntfs-3g-system-compression/archive/v%{version}/ntfs-3g-system-compression-%{version}.tar.gz +URL: https://github.com/ebiggers/ntfs-3g-system-compression +Source0: https://github.com/ebiggers/ntfs-3g-system-compression/archive/v%{version}/ntfs-3g-system-compression-%{version}.tar.gz -BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool -BuildRequires: pkgconfig(libntfs-3g) >= 2017.3.23 BuildRequires: fuse-devel +BuildRequires: gcc +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: pkgconfig(libntfs-3g) >= 2017.3.23 %description System compression, also known as "Compact OS", is a Windows feature that @@ -37,7 +38,7 @@ autoreconf -i %install %make_install -rm -rf %{buildroot}%{_libdir}/ntfs-3g/*.la +find %{buildroot} -type f -name "*.la" -delete -print %files %doc README.md @@ -46,6 +47,9 @@ rm -rf %{buildroot}%{_libdir}/ntfs-3g/*.la %{_libdir}/ntfs-3g/ntfs-plugin-80000017.so %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 1.0-5 +- Cleaning-up spec. License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 1.0-4 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/perl-Expect/perl-Expect.signatures.json b/SPECS/perl-Expect/perl-Expect.signatures.json similarity index 100% rename from SPECS-EXTENDED/perl-Expect/perl-Expect.signatures.json rename to SPECS/perl-Expect/perl-Expect.signatures.json diff --git a/SPECS-EXTENDED/perl-Expect/perl-Expect.spec b/SPECS/perl-Expect/perl-Expect.spec similarity index 87% rename from SPECS-EXTENDED/perl-Expect/perl-Expect.spec rename to SPECS/perl-Expect/perl-Expect.spec index 77d4df8289..820cec8549 100644 --- a/SPECS-EXTENDED/perl-Expect/perl-Expect.spec +++ b/SPECS/perl-Expect/perl-Expect.spec @@ -1,40 +1,45 @@ +Summary: Expect for Perl +Name: perl-Expect +Version: 1.35 +Release: 13%{?dist} +License: GPL+ OR Artistic Vendor: Microsoft Corporation Distribution: Mariner -Name: perl-Expect -Version: 1.35 -Release: 12%{?dist} -Summary: Expect for Perl -License: GPL+ or Artistic -URL: https://metacpan.org/release/Expect -Source0: https://cpan.metacpan.org/modules/by-module/Expect/Expect-%{version}.tar.gz#/perl-Expect-%{version}.tar.gz -BuildArch: noarch +URL: https://metacpan.org/release/Expect +Source0: https://cpan.metacpan.org/modules/by-module/Expect/Expect-%{version}.tar.gz#/perl-Expect-%{version}.tar.gz + +BuildArch: noarch + # Module Build -BuildRequires: coreutils -BuildRequires: findutils -BuildRequires: make -BuildRequires: perl-generators -BuildRequires: perl-interpreter -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.64 -BuildRequires: sed +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make +BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: sed + # Module Runtime -BuildRequires: perl(Carp) -BuildRequires: perl(Errno) -BuildRequires: perl(Exporter) -BuildRequires: perl(Fcntl) -BuildRequires: perl(IO::Handle) -BuildRequires: perl(IO::Pty) >= 1.11 -BuildRequires: perl(IO::Tty) >= 1.11 -BuildRequires: perl(POSIX) -BuildRequires: perl(strict) -BuildRequires: perl(vars) -BuildRequires: perl(warnings) +BuildRequires: perl(Carp) + # Test Suite -BuildRequires: perl(Config) -BuildRequires: perl(File::Temp) -BuildRequires: perl(Test::Builder) -BuildRequires: perl(Test::More) >= 0.98 +BuildRequires: perl(Config) +BuildRequires: perl(Errno) +BuildRequires: perl(Exporter) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.64 +BuildRequires: perl(Fcntl) +BuildRequires: perl(File::Temp) +BuildRequires: perl(IO::Handle) +BuildRequires: perl(IO::Pty) >= 1.11 +BuildRequires: perl(IO::Tty) >= 1.11 +BuildRequires: perl(POSIX) +BuildRequires: perl(Test::Builder) +BuildRequires: perl(Test::More) >= 0.98 +BuildRequires: perl(strict) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) + # Runtime -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description This module provides Expect-like functionality to Perl. Expect is @@ -59,16 +64,15 @@ find %{buildroot} -type f -name .packlist -delete make test %files -%if 0%{?_licensedir:1} %license LICENSE -%else -%doc LICENSE -%endif %doc Changes README.md examples/ tutorial/ %{perl_vendorlib}/Expect.pm %{_mandir}/man3/Expect.3* %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 1.35-13 +- Cleaning-up spec. License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 1.35-12 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/perl-IO-Tty/perl-IO-Tty.signatures.json b/SPECS/perl-IO-Tty/perl-IO-Tty.signatures.json similarity index 100% rename from SPECS-EXTENDED/perl-IO-Tty/perl-IO-Tty.signatures.json rename to SPECS/perl-IO-Tty/perl-IO-Tty.signatures.json diff --git a/SPECS-EXTENDED/perl-IO-Tty/perl-IO-Tty.spec b/SPECS/perl-IO-Tty/perl-IO-Tty.spec similarity index 96% rename from SPECS-EXTENDED/perl-IO-Tty/perl-IO-Tty.spec rename to SPECS/perl-IO-Tty/perl-IO-Tty.spec index 9c6d657196..b419d2eacf 100644 --- a/SPECS-EXTENDED/perl-IO-Tty/perl-IO-Tty.spec +++ b/SPECS/perl-IO-Tty/perl-IO-Tty.spec @@ -1,12 +1,14 @@ +Summary: Perl interface to pseudo tty's Name: perl-IO-Tty Version: 1.14 -Release: 3%{?dist} -Summary: Perl interface to pseudo tty's -License: (GPL+ or Artistic) and BSD +Release: 4%{?dist} +# Mostly licensed same as Perl. IO-Tty-1.14/Tty.xs is licensed under BSD. +License: (GPL+ OR Artistic) AND BSD Vendor: Microsoft Corporation Distribution: Mariner URL: https://metacpan.org/release/IO-Tty Source0: https://cpan.metacpan.org/modules/by-module/IO/IO-Tty-%{version}.tar.gz#/perl-IO-Tty-%{version}.tar.gz + # Module Build BuildRequires: coreutils BuildRequires: findutils @@ -15,21 +17,24 @@ BuildRequires: make BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl-interpreter -BuildRequires: perl(Config) -BuildRequires: perl(Cwd) -BuildRequires: perl(Exporter) -BuildRequires: perl(ExtUtils::MakeMaker) + # Module Runtime BuildRequires: perl(Carp) +BuildRequires: perl(Config) +BuildRequires: perl(Cwd) BuildRequires: perl(DynaLoader) +BuildRequires: perl(Exporter) +BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(IO::File) BuildRequires: perl(IO::Handle) BuildRequires: perl(POSIX) -BuildRequires: perl(strict) -BuildRequires: perl(vars) + # Test Suite BuildRequires: perl(Test::More) +BuildRequires: perl(strict) +BuildRequires: perl(vars) BuildRequires: perl(warnings) + # Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) @@ -56,7 +61,8 @@ find %{buildroot} -type f -name '*.bs' -empty -delete make test %files -%doc ChangeLog README.md +%license README.md +%doc ChangeLog %{perl_vendorarch}/auto/IO/ %{perl_vendorarch}/IO/ %{_mandir}/man3/IO::Pty.3* @@ -64,6 +70,9 @@ make test %{_mandir}/man3/IO::Tty::Constant.3* %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 1.14-4 +- Cleaning-up spec. License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 1.14-3 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/perl-Sys-Virt/perl-Sys-Virt.signatures.json b/SPECS/perl-Sys-Virt/perl-Sys-Virt.signatures.json similarity index 100% rename from SPECS-EXTENDED/perl-Sys-Virt/perl-Sys-Virt.signatures.json rename to SPECS/perl-Sys-Virt/perl-Sys-Virt.signatures.json diff --git a/SPECS-EXTENDED/perl-Sys-Virt/perl-Sys-Virt.spec b/SPECS/perl-Sys-Virt/perl-Sys-Virt.spec similarity index 93% rename from SPECS-EXTENDED/perl-Sys-Virt/perl-Sys-Virt.spec rename to SPECS/perl-Sys-Virt/perl-Sys-Virt.spec index ceaa2f437f..a226e40dab 100644 --- a/SPECS-EXTENDED/perl-Sys-Virt/perl-Sys-Virt.spec +++ b/SPECS/perl-Sys-Virt/perl-Sys-Virt.spec @@ -1,12 +1,13 @@ -Vendor: Microsoft Corporation -Distribution: Mariner +Summary: Represent and manage a libvirt hypervisor connection Name: perl-Sys-Virt Version: 6.1.0 -Release: 3%{?dist} -Summary: Represent and manage a libvirt hypervisor connection -License: GPLv2+ or Artistic +Release: 4%{?dist} +License: GPLv2+ OR Artistic +Vendor: Microsoft Corporation +Distribution: Mariner URL: https://metacpan.org/release/Sys-Virt -Source0: https://cpan.metacpan.org/authors/id/D/DA/DANBERR/Sys-Virt-v%{version}.tar.gz#/perl-Sys-Virt-v%{version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/D/DA/DANBERR/Sys-Virt-v%{version}.tar.gz#/%{name}-v%{version}.tar.gz + # Build BuildRequires: coreutils BuildRequires: findutils @@ -16,27 +17,30 @@ BuildRequires: make BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl-interpreter +BuildRequires: sed BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(Module::Build) -BuildRequires: sed +BuildRequires: perl(XSLoader) + # Runtime BuildRequires: perl(overload) BuildRequires: perl(strict) BuildRequires: perl(warnings) -BuildRequires: perl(XSLoader) + %if %{with_check} -# Tests only -BuildRequires: perl(base) BuildRequires: perl(Sys::Hostname) +# Optional tests only +BuildRequires: perl(Test::CPAN::Changes) BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod) >= 1.00 +BuildRequires: perl(Test::Pod::Coverage) >= 1.00 BuildRequires: perl(Time::HiRes) BuildRequires: perl(XML::XPath) BuildRequires: perl(XML::XPath::XMLParser) -# Optional tests only -BuildRequires: perl(Test::CPAN::Changes) -BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.00 +# Tests only +BuildRequires: perl(base) %endif + Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) %description @@ -53,9 +57,9 @@ perl Build.PL installdirs=vendor ./Build %install -./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +./Build install destdir=%{buildroot} create_packlist=0 -%{_fixperms} $RPM_BUILD_ROOT/* +%{_fixperms} %{buildroot}/* %check ./Build test @@ -68,6 +72,9 @@ perl Build.PL installdirs=vendor %{_mandir}/man3/* %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 6.1.0-4 +- Cleaning-up spec. License verified. + * Tue Jan 18 2022 Thomas Crain - 6.1.0-3 - Only pull in test dependencies during check builds - License verified diff --git a/SPECS-EXTENDED/scrub/scrub.signatures.json b/SPECS/scrub/scrub.signatures.json similarity index 100% rename from SPECS-EXTENDED/scrub/scrub.signatures.json rename to SPECS/scrub/scrub.signatures.json diff --git a/SPECS-EXTENDED/scrub/scrub.spec b/SPECS/scrub/scrub.spec similarity index 90% rename from SPECS-EXTENDED/scrub/scrub.spec rename to SPECS/scrub/scrub.spec index 90006135d8..cb3df1d438 100644 --- a/SPECS-EXTENDED/scrub/scrub.spec +++ b/SPECS/scrub/scrub.spec @@ -1,14 +1,15 @@ +Summary: Disk scrubbing program +Name: scrub +Version: 2.5.2 +Release: 18%{?dist} +License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner -Name: scrub -Version: 2.5.2 -Release: 17%{?dist} -Summary: Disk scrubbing program -License: GPLv2+ -URL: https://code.google.com/archive/p/diskscrub -Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/diskscrub/%{name}-%{version}.tar.bz2 +URL: https://code.google.com/archive/p/diskscrub +Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/diskscrub/%{name}-%{version}.tar.bz2 BuildRequires: gcc + %description Scrub writes patterns on files or disk devices to make retrieving the data more difficult. It operates in one of three @@ -29,12 +30,15 @@ make %{?_smp_mflags} make DESTDIR=%{buildroot} install %files -%doc DISCLAIMER COPYING -%doc README ChangeLog +%license COPYING +%doc DISCLAIMER README ChangeLog %{_bindir}/scrub %{_mandir}/man1/scrub.1* %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 2.5.2-18 +- Cleaning-up spec. License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 2.5.2-17 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/sleuthkit/sleuthkit.signatures.json b/SPECS/sleuthkit/sleuthkit.signatures.json similarity index 100% rename from SPECS-EXTENDED/sleuthkit/sleuthkit.signatures.json rename to SPECS/sleuthkit/sleuthkit.signatures.json diff --git a/SPECS-EXTENDED/sleuthkit/sleuthkit.spec b/SPECS/sleuthkit/sleuthkit.spec similarity index 91% rename from SPECS-EXTENDED/sleuthkit/sleuthkit.spec rename to SPECS/sleuthkit/sleuthkit.spec index 18547b855b..1518f3cef9 100644 --- a/SPECS-EXTENDED/sleuthkit/sleuthkit.spec +++ b/SPECS/sleuthkit/sleuthkit.spec @@ -1,37 +1,21 @@ -Vendor: Microsoft Corporation -Distribution: Mariner -# Could be part of http://fedoraproject.org/wiki/LukeMacken/SecurityLiveCD - +Summary: The Sleuth Kit (TSK) Name: sleuthkit Version: 4.9.0 -Release: 3%{?dist} -Summary: The Sleuth Kit (TSK) - -License: CPL and IBM and GPLv2+ -URL: http://www.sleuthkit.org +Release: 4%{?dist} +License: BSD AND CPL AND GPLv2+ AND IBM AND MIT +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://www.sleuthkit.org Source0: https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-%{version}/sleuthkit-%{version}.tar.gz -#BuildRequires: libtool - -# afflib - BSD with advertising, GPL incompatible BuildRequires: gcc-c++ -BuildRequires: afflib-devel >= 3.3.4 -# libewf - Newer versions are plain BSD (older are BSD with advertising) BuildRequires: libewf-devel BuildRequires: perl-generators BuildRequires: sqlite-devel -%{?_with_java: -BuildRequires: java-devel >= 1.6.0 -BuildRequires: jpackage-utils - -Requires: java >= 1.6.0 -Requires: jpackage-utils -} - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: file -Requires: mac-robber +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: file +Requires: mac-robber %description The Sleuth Kit (TSK) is a collection of UNIX-based command line tools that @@ -39,14 +23,12 @@ allow you to investigate a computer. The current focus of the tools is the file and volume systems and TSK supports FAT, Ext2/3, NTFS, UFS, and ISO 9660 file systems - %package libs Summary: Library for %{name} %description libs The %{name}-libs package contains library for %{name}. - %package devel Summary: Development files for %{name} Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -56,15 +38,12 @@ Requires: sqlite-devel%{?_isa} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %prep -%setup -q -n %{name}-%{version} - +%setup -q %build -#export LIBS='-lpthread -ldl' %configure --disable-static \ - %{!?_with_java:--disable-java} + --disable-java # remove rpath from libtool sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -72,15 +51,12 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_build - %install %make_install INSTALL="install -p" -find %{buildroot} -name '*.la' -exec rm -f {} ';' - +find %{buildroot} -type f -name "*.la" -delete -print %ldconfig_scriptlets libs - %files %doc ChangeLog.txt NEWS.txt %license licenses/* @@ -89,8 +65,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_bindir}/blkcat %{_bindir}/blkls %{_bindir}/blkstat -#{_bindir}/disk_sreset -#{_bindir}/disk_stat #fcat conflicts with freeze fcat %exclude %{_bindir}/fcat %{_bindir}/ffind @@ -129,8 +103,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_mandir}/man1/blkcat.1* %{_mandir}/man1/blkls.1* %{_mandir}/man1/blkstat.1* -#{_mandir}/man1/disk_sreset.1* -#{_mandir}/man1/disk_stat.1* %exclude %{_mandir}/man1/fcat.1* %{_mandir}/man1/ffind.1* %{_mandir}/man1/fls.1* @@ -167,8 +139,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_includedir}/tsk/ %{_libdir}/*.so - %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 4.9.0-4 +- Cleaning-up spec. License verified. + * Wed Nov 03 2021 Muhammad Falak - 4.9.0-3 - Remove epoch @@ -343,5 +317,3 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' * Mon Oct 29 2007 kwizart < kwizart at gmail.com > - 2.09-1 - Initial package for Fedora (inspired from Oden Eriksson mdk spec). - - diff --git a/SPECS-EXTENDED/zerofree/index.html b/SPECS/zerofree/index.html similarity index 100% rename from SPECS-EXTENDED/zerofree/index.html rename to SPECS/zerofree/index.html diff --git a/SPECS-EXTENDED/zerofree/sparsify.c b/SPECS/zerofree/sparsify.c similarity index 100% rename from SPECS-EXTENDED/zerofree/sparsify.c rename to SPECS/zerofree/sparsify.c diff --git a/SPECS-EXTENDED/zerofree/zerofree.signatures.json b/SPECS/zerofree/zerofree.signatures.json similarity index 56% rename from SPECS-EXTENDED/zerofree/zerofree.signatures.json rename to SPECS/zerofree/zerofree.signatures.json index 2a32b406ba..a66eb79904 100644 --- a/SPECS-EXTENDED/zerofree/zerofree.signatures.json +++ b/SPECS/zerofree/zerofree.signatures.json @@ -2,8 +2,6 @@ "Signatures": { "index.html": "1e842f92dfc8ca5c7aa515a5a41b512681f7a591eb27db821996b9832f1c6b1f", "sparsify.c": "a31d66ebad0a8177d4d4def2f10baa09f8d21cf47515dd754668a6bb70dd3870", - "zerofree-1.1.1.tgz": "956bc861b55ba0a2b7593c58d32339dab1a0e7da6ea2b813d27c80f08b723867", - "zerofree.8": "d2e3c63d37a9a83676126da3bf89ac7c554bc443e1ab699fd916017f720d6e05", - "zerofree.sgml": "46f54d3ea8af335309e7103b35b5fc931f2ff09e2d2d93932ca1579f99a55e71" + "zerofree-1.1.1.tgz": "956bc861b55ba0a2b7593c58d32339dab1a0e7da6ea2b813d27c80f08b723867" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/zerofree/zerofree.spec b/SPECS/zerofree/zerofree.spec similarity index 88% rename from SPECS-EXTENDED/zerofree/zerofree.spec rename to SPECS/zerofree/zerofree.spec index ecd9d0fbd4..7c7ea4073e 100644 --- a/SPECS-EXTENDED/zerofree/zerofree.spec +++ b/SPECS/zerofree/zerofree.spec @@ -1,26 +1,17 @@ -Vendor: Microsoft Corporation -Distribution: Mariner Summary: Utility to force unused ext2/3/4 inodes and blocks to zero Name: zerofree Version: 1.1.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 - +Vendor: Microsoft Corporation +Distribution: Mariner URL: https://frippery.org/uml/ - Source0: https://frippery.org/uml/%{name}-%{version}.tgz Source1: https://frippery.org/uml/sparsify.c Source2: https://frippery.org/uml/index.html -# zerofree.sgml is the source for the man page from Debian. -# Unfortunately we cannot build this in Fedora because of an apparent -# bug in our DocBook tools. Therefore I also include the generated -# man page (generated on a Debian system from this source). -Source3: zerofree.sgml -Source4: zerofree.8 - -BuildRequires: gcc, e2fsprogs-devel - +BuildRequires: e2fsprogs-devel +BuildRequires: gcc %description zerofree is a utility to set unused filesystem inodes and blocks of an @@ -34,33 +25,29 @@ WARNING: The filesystem to be processed should be unmounted or mounted read-only. The tool tries to check this before running, but you should be careful. - %prep %setup -q cp -p %{SOURCE1} . cp -p %{SOURCE2} . - %build -make CC="gcc $RPM_OPT_FLAGS" -gcc $RPM_OPT_FLAGS sparsify.c -o sparsify -lext2fs - +make CC="gcc %{optflags}" +gcc %{optflags} sparsify.c -o sparsify -lext2fs %install -install -D -p -m 755 zerofree $RPM_BUILD_ROOT%{_sbindir}/zerofree -install -D -p -m 755 sparsify $RPM_BUILD_ROOT%{_sbindir}/sparsify -install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man8/zerofree.8 - +install -D -p -m 755 zerofree %{buildroot}%{_sbindir}/zerofree +install -D -p -m 755 sparsify %{buildroot}%{_sbindir}/sparsify %files %license COPYING %doc index.html %{_sbindir}/zerofree %{_sbindir}/sparsify -%{_mandir}/man8/zerofree.8* - %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 1.1.1-7 +- Cleaning-up spec. License verified. + * Fri Oct 15 2021 Pawel Winogrodzki - 1.1.1-6 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/zfs-fuse/common.patch b/SPECS/zfs-fuse/common.patch similarity index 100% rename from SPECS-EXTENDED/zfs-fuse/common.patch rename to SPECS/zfs-fuse/common.patch diff --git a/SPECS-EXTENDED/zfs-fuse/tirpc.patch b/SPECS/zfs-fuse/tirpc.patch similarity index 100% rename from SPECS-EXTENDED/zfs-fuse/tirpc.patch rename to SPECS/zfs-fuse/tirpc.patch diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse-0.7.2.2-python3.patch b/SPECS/zfs-fuse/zfs-fuse-0.7.2.2-python3.patch similarity index 100% rename from SPECS-EXTENDED/zfs-fuse/zfs-fuse-0.7.2.2-python3.patch rename to SPECS/zfs-fuse/zfs-fuse-0.7.2.2-python3.patch diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse-0.7.2.2-stack.patch b/SPECS/zfs-fuse/zfs-fuse-0.7.2.2-stack.patch similarity index 100% rename from SPECS-EXTENDED/zfs-fuse/zfs-fuse-0.7.2.2-stack.patch rename to SPECS/zfs-fuse/zfs-fuse-0.7.2.2-stack.patch diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse-helper b/SPECS/zfs-fuse/zfs-fuse-helper similarity index 100% rename from SPECS-EXTENDED/zfs-fuse/zfs-fuse-helper rename to SPECS/zfs-fuse/zfs-fuse-helper diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.scrub b/SPECS/zfs-fuse/zfs-fuse.scrub similarity index 100% rename from SPECS-EXTENDED/zfs-fuse/zfs-fuse.scrub rename to SPECS/zfs-fuse/zfs-fuse.scrub diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.service b/SPECS/zfs-fuse/zfs-fuse.service similarity index 100% rename from SPECS-EXTENDED/zfs-fuse/zfs-fuse.service rename to SPECS/zfs-fuse/zfs-fuse.service diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.signatures.json b/SPECS/zfs-fuse/zfs-fuse.signatures.json similarity index 100% rename from SPECS-EXTENDED/zfs-fuse/zfs-fuse.signatures.json rename to SPECS/zfs-fuse/zfs-fuse.signatures.json diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec b/SPECS/zfs-fuse/zfs-fuse.spec similarity index 89% rename from SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec rename to SPECS/zfs-fuse/zfs-fuse.spec index 25a0623769..ff3c864828 100644 --- a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.spec +++ b/SPECS/zfs-fuse/zfs-fuse.spec @@ -1,32 +1,46 @@ +%define _hardened_build 1 + +Summary: ZFS ported to Linux FUSE +Name: zfs-fuse +Version: 0.7.2.2 +Release: 17%{?dist} +License: CDDL Vendor: Microsoft Corporation Distribution: Mariner -%define _hardened_build 1 -Name: zfs-fuse -Version: 0.7.2.2 -Release: 16%{?dist} -Summary: ZFS ported to Linux FUSE -License: CDDL -URL: https://github.com/gordan-bobic/zfs-fuse -Source00: http://github.com/gordan-bobic/zfs-fuse/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source01: zfs-fuse.service -Source02: zfs-fuse.scrub -Source03: zfs-fuse.sysconfig -Source04: zfs-fuse-helper -Patch0: zfs-fuse-0.7.2.2-stack.patch -Patch1: zfs-fuse-0.7.2.2-python3.patch -Patch2: tirpc.patch -Patch3: common.patch -BuildRequires: gcc -BuildRequires: fuse-devel libaio-devel perl-generators scons gcc-c++ -BuildRequires: zlib-devel openssl-devel libattr-devel lzo-devel bzip2-devel xz-devel -BuildRequires: libtirpc-devel -%ifnarch aarch64 ppc64le -BuildRequires: /usr/bin/execstack -%endif -BuildRequires: systemd -Requires: fuse >= 2.7.4-1 +URL: https://github.com/gordan-bobic/zfs-fuse +Source00: http://github.com/gordan-bobic/zfs-fuse/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source01: zfs-fuse.service +Source02: zfs-fuse.scrub +Source03: zfs-fuse.sysconfig +Source04: zfs-fuse-helper +Patch0: zfs-fuse-0.7.2.2-stack.patch +Patch1: zfs-fuse-0.7.2.2-python3.patch +Patch2: tirpc.patch +Patch3: common.patch + # (2010 karsten@redhat.com) zfs-fuse doesn't have s390(x) implementations for atomic instructions -ExcludeArch: s390 s390x aarch64 +ExcludeArch: s390 s390x aarch64 + +BuildRequires: bzip2-devel +BuildRequires: fuse-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libaio-devel +BuildRequires: libattr-devel +BuildRequires: libtirpc-devel +BuildRequires: lzo-devel +BuildRequires: openssl-devel +BuildRequires: perl-generators +BuildRequires: scons +BuildRequires: systemd +BuildRequires: xz-devel +BuildRequires: zlib-devel + +%ifnarch aarch64 ppc64le +BuildRequires: %{_bindir}/execstack +%endif + +Requires: fuse >= 2.7.4-1 %description ZFS is an advanced modern general-purpose filesystem from Sun @@ -38,10 +52,10 @@ operating system. %prep %setup -q -%patch0 -p0 +%patch0 %patch1 -p1 %patch2 -p1 -%patch3 -p0 +%patch3 f=LICENSE mv $f $f.iso88591 @@ -74,14 +88,14 @@ install -Dp -m 0755 %{SOURCE4} %{buildroot}%{_sbindir}/zfs-fuse-helper %ifnarch aarch64 ppc64le #set stack not executable, BZ 911150 for i in zdb zfs zfs-fuse zpool ztest; do - /usr/bin/execstack -c %{buildroot}%{_sbindir}/$i + %{_bindir}/execstack -c %{buildroot}%{_sbindir}/$i done %endif %post # Move cache if upgrading -oldcache=/etc/zfs/zpool.cache # this changed per 0.6.9, only needed when upgrading from earlier versions -newcache=/var/lib/zfs/zpool.cache +oldcache=%{_sysconfdir}/zfs/zpool.cache # this changed per 0.6.9, only needed when upgrading from earlier versions +newcache=%{_sharedstatedir}/zfs/zpool.cache if [[ -f $oldcache && ! -e $newcache ]]; then echo "Moving existing zpool.cache to new location" @@ -99,10 +113,10 @@ fi %systemd_preun zfs-fuse.service %postun -%systemd_postun_with_restart zfs-fuse.service +%systemd_postun_with_restart zfs-fuse.service echo "Removing files since we removed the last package" -rm -rf /var/run/zfs -rm -rf /var/lock/zfs +rm -rf %{_var}/run/zfs +rm -rf %{_var}/lock/zfs %files %license LICENSE @@ -127,6 +141,9 @@ rm -rf /var/lock/zfs %{_mandir}/man8/zstreamdump.8.gz %changelog +* Fri Apr 01 2022 Pawel Winogrodzki - 0.7.2.2-17 +- Cleaning-up spec. + * Tue Jan 18 2022 Thomas Crain - 0.7.2.2-16 - Remove copying of RPM's config.guess/config.sub into build dir (not shipped by RPM anymore) - Update Source0 URL diff --git a/SPECS-EXTENDED/zfs-fuse/zfs-fuse.sysconfig b/SPECS/zfs-fuse/zfs-fuse.sysconfig similarity index 100% rename from SPECS-EXTENDED/zfs-fuse/zfs-fuse.sysconfig rename to SPECS/zfs-fuse/zfs-fuse.sysconfig diff --git a/cgmanifest.json b/cgmanifest.json index ca25a7de8a..cb152baed4 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -9422,7 +9422,7 @@ "other": { "name": "libewf", "version": "20140608", - "downloadUrl": "https://53efc0a7187d0baa489ee347026b8278fe4020f6.googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-20140608.tar.gz" + "downloadUrl": "https://github.com/libyal/legacy/raw/main/libewf/libewf-20140608.tar.gz" } } },