Arch-excludes May 2019

arch-excludes@lists.fedoraproject.org

2 participants
338 discussions

Architecture specific change in rpms/rust-gstreamer-video.git
by githook-noreply＠fedoraproject.org 05 May '19

05 May '19

The package rpms/rust-gstreamer-video.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-gstreamer-video.git/commit/?id…. Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 2ac887fdb84a5b8f270f9b7e7a55fc2fba852554 Author: Artem Polishchuk <ego.cordatus(a)gmail.com> Date: Sun May 5 22:39:55 2019 +0300 Initial import (#1706604). diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..731766e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/gstreamer-video-0.13.0.crate diff --git a/rust-gstreamer-video.spec b/rust-gstreamer-video.spec new file mode 100644 index 0000000..5d781a1 --- /dev/null +++ b/rust-gstreamer-video.spec @@ -0,0 +1,171 @@ +# Generated by rust2rpm +%bcond_without check +%global debug_package %{nil} + +%global crate gstreamer-video + +Name: rust-%{crate} +Version: 0.13.0 +Release: 1%{?dist} +Summary: GStreamer (Video library) bindings for Rust + +# Upstream license specification: MIT/Apache-2.0 +License: MIT or ASL 2.0 +URL: https://crates.io/crates/gstreamer-video +Source: %{crates_source} + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging +BuildRequires: (crate(bitflags/default) >= 1.0.0 with crate(bitflags/default) < 2.0.0) +BuildRequires: (crate(glib-sys/default) >= 0.8.0 with crate(glib-sys/default) < 0.9.0) +BuildRequires: (crate(glib/default) >= 0.7.0 with crate(glib/default) < 0.8.0) +BuildRequires: (crate(gobject-sys/default) >= 0.8.0 with crate(gobject-sys/default) < 0.9.0) +BuildRequires: (crate(gstreamer-base-sys/default) >= 0.7.0 with crate(gstreamer-base-sys/default) < 0.8.0) +BuildRequires: (crate(gstreamer-base-sys/v1_8) >= 0.7.0 with crate(gstreamer-base-sys/v1_8) < 0.8.0) +BuildRequires: (crate(gstreamer-base/default) >= 0.13.0 with crate(gstreamer-base/default) < 0.14.0) +BuildRequires: (crate(gstreamer-sys/default) >= 0.7.0 with crate(gstreamer-sys/default) < 0.8.0) +BuildRequires: (crate(gstreamer-sys/v1_8) >= 0.7.0 with crate(gstreamer-sys/v1_8) < 0.8.0) +BuildRequires: (crate(gstreamer-video-sys/default) >= 0.7.0 with crate(gstreamer-video-sys/default) < 0.8.0) +BuildRequires: (crate(gstreamer-video-sys/v1_8) >= 0.7.0 with crate(gstreamer-video-sys/v1_8) < 0.8.0) +BuildRequires: (crate(gstreamer/default) >= 0.13.0 with crate(gstreamer/default) < 0.14.0) +BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0) + +%global _description \ +These bindings are providing a safe API that can be used to interface with\ +GStreamer, e.g. for writing GStreamer-based applications and GStreamer plugins.\ +\ +The bindings are mostly autogenerated with gir\ +based on the GObject-Introspection\ +API metadata provided by the GStreamer project. + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%doc README.md +%licence LICENSE-APACHE LICENSE-MIT +%{cargo_registry}/%{crate}-%{version}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+dox-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dox-devel %{_description} + +This package contains library source intended for building other packages +which use "dox" feature of "%{crate}" crate. + +%files -n %{name}+dox-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+embed-lgpl-docs-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+embed-lgpl-docs-devel %{_description} + +This package contains library source intended for building other packages +which use "embed-lgpl-docs" feature of "%{crate}" crate. + +%files -n %{name}+embed-lgpl-docs-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+purge-lgpl-docs-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+purge-lgpl-docs-devel %{_description} + +This package contains library source intended for building other packages +which use "purge-lgpl-docs" feature of "%{crate}" crate. + +%files -n %{name}+purge-lgpl-docs-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+rustdoc-stripper-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rustdoc-stripper-devel %{_description} + +This package contains library source intended for building other packages +which use "rustdoc-stripper" feature of "%{crate}" crate. + +%files -n %{name}+rustdoc-stripper-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_10-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+v1_10-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_10" feature of "%{crate}" crate. + +%files -n %{name}+v1_10-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_12-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+v1_12-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_12" feature of "%{crate}" crate. + +%files -n %{name}+v1_12-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_14-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+v1_14-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_14" feature of "%{crate}" crate. + +%files -n %{name}+v1_14-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Sun May 05 18:52:49 EEST 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.13.0-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..3006e0d --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (gstreamer-video-0.13.0.crate) = 48f112bb06587bca154d376e2a089c3f538a23696c18563a4646e1427ee5477165ab7b4f8406adfef9c9507bddbc49db9951add9cadcd95200e82b109887433e

1 0

Architecture specific change in rpms/calamares.git
by githook-noreply＠fedoraproject.org 05 May '19

05 May '19

The package rpms/calamares.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/calamares.git/commit/?id=a41aa30005…. Change: -%ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64} Thanks. Full change: ============ commit 057e097ca0a1732aaef415333368c2130a69d8e7 Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org> Date: Sun May 5 20:01:23 2019 +0200 Add BuildRequires: parted-devel (used in welcome to check storage requirement) * Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-3 - Add BuildRequires: parted-devel (used in welcome to check storage requirement) diff --git a/calamares.spec b/calamares.spec index 158ffd8..c849218 100644 --- a/calamares.spec +++ b/calamares.spec @@ -23,7 +23,7 @@ Name: calamares Version: 3.2.7 -Release: 2%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist} +Release: 3%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist} Summary: Installer from a live CD/DVD/USB to disk License: GPLv3+ @@ -112,6 +112,7 @@ BuildRequires: boost-python3-devel >= 1.55.0 # Other libraries BuildRequires: libpwquality-devel BuildRequires: libxcrypt-devel +BuildRequires: parted-devel BuildRequires: yaml-cpp-devel >= 0.5.1 # for automatic branding setup @@ -368,6 +369,9 @@ EOF %changelog +* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-3 +- Add BuildRequires: parted-devel (used in welcome to check storage requirement) + * Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-2 - Fix finding Boost::Python3 on F30+ - Only BuildRequire libatasmart-devel and libblkid-devel on F29- commit bfd07ae3e2bf600985083a9e6757af04dde5788f Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org> Date: Sun May 5 19:50:16 2019 +0200 Actually bump Release diff --git a/calamares.spec b/calamares.spec index 5b67a51..158ffd8 100644 --- a/calamares.spec +++ b/calamares.spec @@ -23,7 +23,7 @@ Name: calamares Version: 3.2.7 -Release: 1%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist} +Release: 2%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist} Summary: Installer from a live CD/DVD/USB to disk License: GPLv3+ commit 9d1fb4dc09096d3e7540c86ea3417d37c1e674e9 Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org> Date: Sun May 5 19:48:34 2019 +0200 Only BuildRequire libatasmart-devel and libblkid-devel on F29- diff --git a/calamares.spec b/calamares.spec index 8a70166..5b67a51 100644 --- a/calamares.spec +++ b/calamares.spec @@ -17,6 +17,10 @@ %global webview_qtwebengine 1 %endif +%if 0%{?fedora} > 29 +%global kpmcore4 1 +%endif + Name: calamares Version: 3.2.7 Release: 1%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist} @@ -92,13 +96,13 @@ BuildRequires: kf5-kwidgetsaddons-devel BuildRequires: kf5-plasma-devel # KPMCore +%if 0%{?kpmcore4} +BuildRequires: kpmcore-devel >= 4.0 +%else BuildRequires: kpmcore-devel >= 3.3 -# This one should definitely not be required anymore with kpmcore 4.0, it is not -# used there anymore: BuildRequires: libatasmart-devel -# This one may or may not be still required with kpmcore 4.0, it should not be -# in the public link interface: BuildRequires: libblkid-devel +%endif # Python 3 BuildRequires: python3-devel >= 3.3 @@ -365,7 +369,8 @@ EOF %changelog * Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-2 -- Fix finding Boost::Python3 on Fedora >= 30 +- Fix finding Boost::Python3 on F30+ +- Only BuildRequire libatasmart-devel and libblkid-devel on F29- * Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1 - Update to 3.2.7 and update BuildRequires and Requires commit 970a5d230c6086fd3ad74558c8de210b5c7397bd Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org> Date: Sun May 5 19:46:07 2019 +0200 Fix finding Boost::Python3 on Fedora >= 30 * Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-2 - Fix finding Boost::Python3 on Fedora >= 30 diff --git a/calamares-3.2.7-boost-python3.patch b/calamares-3.2.7-boost-python3.patch new file mode 100644 index 0000000..5f4de2f --- /dev/null +++ b/calamares-3.2.7-boost-python3.patch @@ -0,0 +1,26 @@ +diff -ur calamares-3.2.7/CMakeModules/BoostPython3.cmake calamares-3.2.7-boost-python3/CMakeModules/BoostPython3.cmake +--- calamares-3.2.7/CMakeModules/BoostPython3.cmake 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-boost-python3/CMakeModules/BoostPython3.cmake 2019-05-05 19:42:40.290272157 +0200 +@@ -15,6 +15,11 @@ + # libboost_python-3.4.so + # depending on what python's targets you selected during install + # ++# On Fedora >= 30 instead, the boost-python3-devel provides boost library with a ++# name like: ++# libboost_python37.so ++# depending on what python's targets you selected during install ++# + # find_boost_python3() tries to find the package with different component + # names. By default it tries "python3", "python-py$suffix" and + # "python-$dotsuffix", where suffix is based on the `python_version` argument. +@@ -47,6 +52,10 @@ + _find_boost_python3_int( ${boost_version} python-py${_fbp_python_short_version} _fbp_found ) + + if (NOT _fbp_found) ++ _find_boost_python3_int( ${boost_version} python${_fbp_python_short_version} _fbp_found ) ++ endif() ++ ++ if (NOT _fbp_found) + # The following loop changes the searched name for Gentoo based distributions + # turns "3.4.123abc" into "3.4" + string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1.\\2" _fbp_python_short_version ${python_version} ) diff --git a/calamares.spec b/calamares.spec index fa6fcb4..8a70166 100644 --- a/calamares.spec +++ b/calamares.spec @@ -45,6 +45,9 @@ Patch0: calamares-3.2.7-default-settings.patch # use kdesu instead of pkexec (works around #1171779) Patch1: calamares-3.2.7-kdesu.patch +# fix finding Boost::Python3 on Fedora >= 30 +Patch2: calamares-3.2.7-boost-python3.patch + # Calamares is only supported where live images (and GRUB) are. (#1171380) # This list matches the livearches global from anaconda.spec ExclusiveArch: %{ix86} x86_64 @@ -213,6 +216,7 @@ developing custom modules for Calamares. # delete backup files so they don't get installed rm -f src/modules/*/*.conf.default-settings %patch1 -p1 -b .kdesu +%patch2 -p1 -b .boost-python3 %build mkdir -p %{_target_platform} @@ -360,6 +364,9 @@ EOF %changelog +* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-2 +- Fix finding Boost::Python3 on Fedora >= 30 + * Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1 - Update to 3.2.7 and update BuildRequires and Requires - Add plasmalnf subpackage for the new plasmalnf module requiring plasma-desktop commit 699951531edf58924b8e11d7b333bbad9ce9c68a Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org> Date: Sun May 5 19:02:54 2019 +0200 Readd BR libatasmart-devel libblkid-devel for now These have no business being in the public link interface of KPMCore, especially without a Requires in kpmcore-devel, and libatasmart is no longer used in KPMCore 4.0. diff --git a/calamares.spec b/calamares.spec index a8c8693..fa6fcb4 100644 --- a/calamares.spec +++ b/calamares.spec @@ -88,13 +88,21 @@ BuildRequires: kf5-kservice-devel BuildRequires: kf5-kwidgetsaddons-devel BuildRequires: kf5-plasma-devel +# KPMCore +BuildRequires: kpmcore-devel >= 3.3 +# This one should definitely not be required anymore with kpmcore 4.0, it is not +# used there anymore: +BuildRequires: libatasmart-devel +# This one may or may not be still required with kpmcore 4.0, it should not be +# in the public link interface: +BuildRequires: libblkid-devel + # Python 3 BuildRequires: python3-devel >= 3.3 BuildRequires: boost-python3-devel >= 1.55.0 %global __python %{__python3} # Other libraries -BuildRequires: kpmcore-devel >= 3.3 BuildRequires: libpwquality-devel BuildRequires: libxcrypt-devel BuildRequires: yaml-cpp-devel >= 0.5.1 commit 5ffac0a78261fc55101be8cdcb1cafc5f2cab372 Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org> Date: Sun May 5 18:52:38 2019 +0200 Fix weekday in 2017-12-26 changelog entry diff --git a/calamares.spec b/calamares.spec index d20783c..a8c8693 100644 --- a/calamares.spec +++ b/calamares.spec @@ -397,7 +397,7 @@ EOF * Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3.1.8-4 - Remove obsolete scriptlets -* Mon Dec 26 2017 Mattia Verga <mattia.verga(a)email.it> - 3.1.8-3 +* Tue Dec 26 2017 Mattia Verga <mattia.verga(a)email.it> - 3.1.8-3 - Rebuild for libkpmcore soname bump in rawhide * Sun Dec 03 2017 Mattia Verga <mattia.verga(a)email.it> - 3.1.8-2 commit eaef09ddd033f17231f7dcacb20b1a8128502d8b Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org> Date: Sun May 5 18:51:44 2019 +0200 Fix BuildRequires package names diff --git a/calamares.spec b/calamares.spec index e7f58db..d20783c 100644 --- a/calamares.spec +++ b/calamares.spec @@ -63,9 +63,9 @@ BuildRequires: desktop-file-utils BuildRequires: gettext # Qt 5 +BuildRequires: qt5-linguist >= 5.10 BuildRequires: qt5-qtbase-devel >= 5.10 BuildRequires: qt5-qtdeclarative-devel >= 5.10 -BuildRequires: qt5-qtlinguist >= 5.10 BuildRequires: qt5-qtsvg-devel >= 5.10 %if 0%{?webview_qtwebengine} BuildRequires: qt5-qtwebengine-devel >= 5.10 @@ -85,7 +85,7 @@ BuildRequires: kf5-ki18n-devel BuildRequires: kf5-kpackage-devel BuildRequires: kf5-kparts-devel BuildRequires: kf5-kservice-devel -BuildRequires: kf5-kwidgetaddons-devel +BuildRequires: kf5-kwidgetsaddons-devel BuildRequires: kf5-plasma-devel # Python 3 commit a41aa30005421d49419f655ba721bd17d1c9c9c0 Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org> Date: Sun May 5 18:44:25 2019 +0200 Update to 3.2.7, disable QtWebEngine, rebase patches * Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1 - Update to 3.2.7 and update BuildRequires and Requires - Add plasmalnf subpackage for the new plasmalnf module requiring plasma-desktop - Switch webview from QtWebEngine to QtWebKit to work around upstream issue 1051 - Rebase default-settings patch and update some settings: - enable INSTALL_CONFIG by default (we patch it in place, so install it) - disable plymouthcfg by default (now only needed to change the default theme) - bootloader.conf: enable sb-shim (UEFI "Secure Boot" support) - plasmalnf.conf (note: module disabled by default): fix default liveuser - plasmalnf.conf (note: module disabled by default): default: show all themes - tracking.conf (note: module disabled by default): default tracking to none - users.conf: default to honoring the default shell from /etc/default/useradd - welcome.conf: use https for internetCheckUrl (catches more captive portals) - Rebase kdesu patch diff --git a/.gitignore b/.gitignore index 3b17288..0b4fab2 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /calamares-3.1.6.tar.gz /calamares-3.1.7.tar.gz /calamares-3.1.8.tar.gz +/calamares-3.2.7.tar.gz diff --git a/calamares-3.1.5-kdesu.patch b/calamares-3.1.5-kdesu.patch deleted file mode 100644 index c18fb9f..0000000 --- a/calamares-3.1.5-kdesu.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Nur calamares-3.1.5/calamares.desktop calamares-3.1.5-kdesu/calamares.desktop ---- calamares-3.1.5/calamares.desktop 2017-09-25 17:13:33.000000000 +0200 -+++ calamares-3.1.5-kdesu/calamares.desktop 2017-09-27 03:30:14.647027258 +0200 -@@ -5,7 +5,7 @@ - GenericName=System Installer - Keywords=calamares;system;installer - TryExec=calamares --Exec=pkexec /usr/bin/calamares -+Exec=kdesu /usr/bin/calamares - Comment=Calamares System Installer - Icon=calamares - Terminal=false -diff -Nur calamares-3.1.5/CMakeLists.txt calamares-3.1.5-kdesu/CMakeLists.txt ---- calamares-3.1.5/CMakeLists.txt 2017-09-25 17:13:33.000000000 +0200 -+++ calamares-3.1.5-kdesu/CMakeLists.txt 2017-09-27 03:30:15.121020240 +0200 -@@ -110,7 +110,6 @@ - - find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools Svg Quick QuickWidgets ) - find_package( YAMLCPP 0.5.1 REQUIRED ) --find_package( PolkitQt5-1 REQUIRED ) - - option( INSTALL_CONFIG "Install configuration files" ON ) - option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) -@@ -332,13 +331,6 @@ - - install( - FILES -- com.github.calamares.calamares.policy -- DESTINATION -- "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" --) -- --install( -- FILES - calamares.desktop - DESTINATION - ${CMAKE_INSTALL_DATADIR}/applications -diff -Nur calamares-3.1.5/com.github.calamares.calamares.policy calamares-3.1.5-kdesu/com.github.calamares.calamares.policy ---- calamares-3.1.5/com.github.calamares.calamares.policy 2017-09-25 17:13:33.000000000 +0200 -+++ calamares-3.1.5-kdesu/com.github.calamares.calamares.policy 1970-01-01 01:00:00.000000000 +0100 -@@ -1,22 +0,0 @@ --<?xml version="1.0" encoding="UTF-8"?> --<!DOCTYPE policyconfig PUBLIC --"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" --"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> --<policyconfig> -- -- <vendor>Calamares</vendor> -- <vendor_url>https://github.com/calamares</vendor_url> -- -- <action id="com.github.calamares.calamares.pkexec.run"> -- <description>Run Installer</description> -- <message>Authentication is required to run the installation program</message> -- <icon_name>drive-harddisk</icon_name> -- <defaults> -- <allow_any>no</allow_any> -- <allow_inactive>no</allow_inactive> -- <allow_active>auth_admin</allow_active> -- </defaults> -- <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/calamares</annotate> -- <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> -- </action> --</policyconfig> -\ No newline at end of file diff --git a/calamares-3.1.8-default-settings.patch b/calamares-3.1.8-default-settings.patch deleted file mode 100644 index 3cc0875..0000000 --- a/calamares-3.1.8-default-settings.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -ur calamares-3.1.8/settings.conf calamares-3.1.8-default-settings/settings.conf ---- calamares-3.1.8/settings.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/settings.conf 2017-11-14 16:53:50.562464805 +0100 -@@ -80,21 +80,22 @@ - - locale - - keyboard - - localecfg --# - luksbootkeyfile -+ - luksbootkeyfile - # - luksopenswaphookcfg --# - dracutlukscfg --# - plymouthcfg -- - initcpiocfg -- - initcpio -+ - dracutlukscfg -+ - plymouthcfg -+# - initcpiocfg -+# - initcpio - - users - - displaymanager - - networkcfg - - hwclock - - services --# - dracut -- - initramfs --# - grubcfg -+ - dracut -+# - initramfs -+ - grubcfg - - bootloader -+ - packages - - umount - - show: - # - webview@owncloud -@@ -109,7 +110,7 @@ - # Only the name of the branding component (directory) should be specified here, Calamares - # then takes care of finding it and loading the contents. - # YAML: string. --branding: default -+branding: auto - - # If this is set to true, Calamares will show an "Are you sure?" prompt right before - # each execution phase, i.e. at points of no return. If this is set to false, no prompt -diff -ur calamares-3.1.8/src/modules/bootloader/bootloader.conf calamares-3.1.8-default-settings/src/modules/bootloader/bootloader.conf ---- calamares-3.1.8/src/modules/bootloader/bootloader.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/bootloader/bootloader.conf 2017-11-14 16:53:50.641463674 +0100 -@@ -17,11 +17,13 @@ - - # GRUB 2 binary names and boot directory - # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. --grubInstall: "grub-install" --grubMkconfig: "grub-mkconfig" --grubCfg: "/boot/grub/grub.cfg" -+grubInstall: "grub2-install" -+grubMkconfig: "grub2-mkconfig" -+grubCfg: "/boot/grub2/grub.cfg" - # Optionally set the --bootloader-id to use for EFI. If not set, this defaults - # to the bootloaderEntryName from branding.desc with problematic characters - # replaced. If an efiBootloaderId is specified here, it is taken to already be a - # valid directory name, so no such postprocessing is done in this case. --# efiBootloaderId: "dirname" -+# PACKAGER NOTE: If you really want to change this value, you will also have to -+# change the hardcoded directory name in the grub2(-efi) package. -+efiBootloaderId: "fedora" -diff -ur calamares-3.1.8/src/modules/keyboard/keyboard.conf calamares-3.1.8-default-settings/src/modules/keyboard/keyboard.conf ---- calamares-3.1.8/src/modules/keyboard/keyboard.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/keyboard/keyboard.conf 2017-11-14 16:53:50.721462529 +0100 -@@ -11,4 +11,4 @@ - # Write keymap configuration to /etc/default/keyboard, usually - # found on Debian-related systems. - # Defaults to true if nothing is set. --#writeEtcDefaultKeyboard: true -+writeEtcDefaultKeyboard: false -diff -ur calamares-3.1.8/src/modules/license/license.conf calamares-3.1.8-default-settings/src/modules/license/license.conf ---- calamares-3.1.8/src/modules/license/license.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/license/license.conf 2017-11-14 16:53:50.721462529 +0100 -@@ -3,21 +3,9 @@ - --- - # YAML: list of maps. - entries: --- id: nvidia # Entry identifier, must be unique. Not user visible. YAML: string. -- name: Nvidia # Pretty name for the software product, user visible and untranslatable. YAML: string. -- vendor: Nvidia Corporation # Pretty name for the software vendor, user visible and untranslatable. YAML: string, optional, default is empty. -+- id: evil # Entry identifier, must be unique. Not user visible. YAML: string. -+ name: Evil # Pretty name for the software product, user visible and untranslatable. YAML: string. -+ vendor: Evil Corporation # Pretty name for the software vendor, user visible and untranslatable. YAML: string, optional, default is empty. - type: driver # Package type for presentation, not user visible but affects user visible strings. YAML: string, allowed values: driver, gpudriver, browserplugin, codec, package, software; optional, default is software. -- url: http://developer.download.nvidia.com/cg/Cg_3.0/license.pdf # Url of license text to display in a web view. YAML: string. -+ url: http://www.example.com/evil_666.0/license.pdf # Url of license text to display in a web view. YAML: string. - required: false # If set to true, the user cannot proceed without accepting this license. YAML: boolean, optional, default is false. --- id: amd -- name: Catalyst -- vendor: "Advanced Micro Devices, Inc." -- type: gpudriver -- url: http://support.amd.com/en-us/download/eula -- required: false --- id: flashplugin -- name: Adobe Flash -- vendor: Adobe Systems Incorporated -- type: browserplugin -- url: http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combined… -- required: true -diff -ur calamares-3.1.8/src/modules/netinstall/netinstall.conf calamares-3.1.8-default-settings/src/modules/netinstall/netinstall.conf ---- calamares-3.1.8/src/modules/netinstall/netinstall.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/netinstall/netinstall.conf 2017-11-14 16:53:50.787461586 +0100 -@@ -1,7 +1,10 @@ - --- - # This is the URL that is retrieved to get the netinstall groups-and-packages - # data (which should be in the format described in netinstall.yaml). --groupsUrl: http://chakraos.org/netinstall.php -+# Packager note: If you want to enable the netinstall module, you will also have -+# to create such a file (see the example in the source code). -+groupsUrl: file:///etc/calamares/modules/netinstall.yaml -+#groupsUrl: http://example.com/netinstall.yaml - - # If the installation can proceed without netinstall (e.g. the Live CD - # can create a working installed system, but netinstall is preferred -diff -ur calamares-3.1.8/src/modules/packages/packages.conf calamares-3.1.8-default-settings/src/modules/packages/packages.conf ---- calamares-3.1.8/src/modules/packages/packages.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/packages/packages.conf 2017-11-14 16:53:50.788461571 +0100 -@@ -12,12 +12,12 @@ - # - entropy - Sabayon package manager - # - dummy - Dummy manager, only logs - # --backend: dummy -+backend: dnf - - # If set to true, a package-manager specific update procedure - # is run first (only if there is internet) to update the list - # of packages and dependencies. --update_db: true -+update_db: false - - # - # List of maps with package operations such as install or remove. -@@ -112,11 +112,5 @@ - # of packages, this can lead to a considerable time savings. - # - operations: -- - install: -- - vi -- - wget -- - binutils -- - remove: -- - vi -- - wget -- - binutils -+ - try_remove: -+ - calamares -diff -ur calamares-3.1.8/src/modules/partition/partition.conf calamares-3.1.8-default-settings/src/modules/partition/partition.conf ---- calamares-3.1.8/src/modules/partition/partition.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/partition/partition.conf 2017-11-14 16:53:50.862460511 +0100 -@@ -21,7 +21,7 @@ - neverCreateSwap: false - - # Correctly draw nested (e.g. logical) partitions as such. --drawNestedPartitions: false -+drawNestedPartitions: true - - # Show/hide partition labels on manual partitioning page. - alwaysShowPartitionLabels: true -diff -ur calamares-3.1.8/src/modules/services/services.conf calamares-3.1.8-default-settings/src/modules/services/services.conf ---- calamares-3.1.8/src/modules/services/services.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/services/services.conf 2017-11-14 16:53:50.863460497 +0100 -@@ -12,9 +12,4 @@ - - name: "graphical" - mandatory: true - --disable: -- - name: "pacman-init" -- mandatory: false -- --# Example to express an empty list: --# disable: [] -+disable: [] -diff -ur calamares-3.1.8/src/modules/umount/umount.conf calamares-3.1.8-default-settings/src/modules/umount/umount.conf ---- calamares-3.1.8/src/modules/umount/umount.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/umount/umount.conf 2017-11-14 16:53:50.863460497 +0100 -@@ -1,9 +1,6 @@ - --- --#srcLog: "/path/to/installation.log" --#destLog: "/var/log/installation.log" --# example when using the Calamares created log: --#srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" --#destLog: "/var/log/Calamares.log" -+srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" -+destLog: "/var/log/calamares.log" - # example when creating with a sudo calamares -d log: --#srcLog: "/home/live/installation.log" -+#srcLog: "/home/liveuser/installation.log" - #destLog: "/var/log/installation.log" -diff -ur calamares-3.1.8/src/modules/unpackfs/unpackfs.conf calamares-3.1.8-default-settings/src/modules/unpackfs/unpackfs.conf ---- calamares-3.1.8/src/modules/unpackfs/unpackfs.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/unpackfs/unpackfs.conf 2017-11-14 16:53:50.863460497 +0100 -@@ -33,6 +33,10 @@ - - # You can list filesystem source paths relative to the Calamares run - # directory, if you use -d (this is only useful for testing, though). -- - source: ./example.sqfs -- sourcefs: squashfs -+# - source: ./example.sqfs -+# sourcefs: squashfs -+# destination: "" -+ -+ - source: "/dev/mapper/live-base" -+ sourcefs: "ext4" - destination: "" -diff -ur calamares-3.1.8/src/modules/users/users.conf calamares-3.1.8-default-settings/src/modules/users/users.conf ---- calamares-3.1.8/src/modules/users/users.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/users/users.conf 2017-11-14 16:53:50.863460497 +0100 -@@ -15,15 +15,15 @@ - - users - - lp - - video -- - network -- - storage -+ - dialout - - wheel - - audio - autologinGroup: autologin --doAutologin: true -+doAutologin: false - --# remove the following line to avoid creating /etc/sudoers.d/10-installer --sudoersGroup: wheel -+# this is already the default in /etc/sudoers, so do NOT set it here, as that -+# would create a confusing /etc/sudoers.d/10-installer file that sets it again -+# sudoersGroup: wheel - - setRootPassword: true - doReusePassword: true -diff -ur calamares-3.1.8/src/modules/welcome/welcome.conf calamares-3.1.8-default-settings/src/modules/welcome/welcome.conf ---- calamares-3.1.8/src/modules/welcome/welcome.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/welcome/welcome.conf 2017-11-14 16:53:50.864460483 +0100 -@@ -6,7 +6,7 @@ - requirements: - requiredStorage: 5.5 - requiredRam: 1.0 -- internetCheckUrl: http://google.com -+ internetCheckUrl: http://fedoraproject.org/static/hotspot.txt - - # List conditions to check. Each listed condition will be - # probed in some way, and yields true or false according to diff --git a/calamares-3.1.8-fix-version.patch b/calamares-3.1.8-fix-version.patch deleted file mode 100644 index 40bb192..0000000 --- a/calamares-3.1.8-fix-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 848d532a5800de40ca398a6d06cb91edef12c92b Mon Sep 17 00:00:00 2001 -Message-Id: <848d532a5800de40ca398a6d06cb91edef12c92b.1510674994.git.kevin.kofler(a)chello.at> -From: Adriaan de Groot <groot(a)kde.org> -Date: Tue, 14 Nov 2017 10:18:58 -0500 -Subject: [PATCH] CMake: drop -rc status - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9913436..7c0af9c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -167,7 +167,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX - set( CALAMARES_VERSION_MAJOR 3 ) - set( CALAMARES_VERSION_MINOR 1 ) - set( CALAMARES_VERSION_PATCH 8 ) --set( CALAMARES_VERSION_RC 1 ) -+set( CALAMARES_VERSION_RC 0 ) - - set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) - set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) --- -2.9.5 - diff --git a/calamares-3.2.7-default-settings.patch b/calamares-3.2.7-default-settings.patch new file mode 100644 index 0000000..5b6d4d5 --- /dev/null +++ b/calamares-3.2.7-default-settings.patch @@ -0,0 +1,335 @@ +diff -ur calamares-3.2.7/CMakeLists.txt calamares-3.2.7-default-settings/CMakeLists.txt +--- calamares-3.2.7/CMakeLists.txt 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/CMakeLists.txt 2019-05-05 13:36:50.504240246 +0200 +@@ -44,7 +44,7 @@ + + ### OPTIONS + # +-option( INSTALL_CONFIG "Install configuration files" OFF ) ++option( INSTALL_CONFIG "Install configuration files" ON ) + option( INSTALL_POLKIT "Install Polkit configuration" ON ) + option( BUILD_TESTING "Build the testing tree." ON ) + option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) +diff -ur calamares-3.2.7/settings.conf calamares-3.2.7-default-settings/settings.conf +--- calamares-3.2.7/settings.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/settings.conf 2019-05-05 15:49:51.132001547 +0200 +@@ -92,21 +92,22 @@ + - locale + - keyboard + - localecfg +-# - luksbootkeyfile ++ - luksbootkeyfile + # - luksopenswaphookcfg +-# - dracutlukscfg ++ - dracutlukscfg + # - plymouthcfg +- - initcpiocfg +- - initcpio ++# - initcpiocfg ++# - initcpio + - users + - displaymanager + - networkcfg + - hwclock + - services-systemd +-# - dracut +- - initramfs +-# - grubcfg ++ - dracut ++# - initramfs ++ - grubcfg + - bootloader ++ - packages + - umount + - show: + # - webview@owncloud +@@ -124,7 +125,7 @@ + # here, Calamares then takes care of finding it and loading the contents. + # + # YAML: string. +-branding: default ++branding: auto + + # If this is set to true, Calamares will show an "Are you sure?" prompt right + # before each execution phase, i.e. at points of no return. If this is set to +diff -ur calamares-3.2.7/src/modules/bootloader/bootloader.conf calamares-3.2.7-default-settings/src/modules/bootloader/bootloader.conf +--- calamares-3.2.7/src/modules/bootloader/bootloader.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/bootloader/bootloader.conf 2019-05-05 14:59:12.992331162 +0200 +@@ -4,7 +4,7 @@ + --- + # Define which bootloader you want to use for EFI installations + # Possible options are 'grub', 'sb-shim' and 'systemd-boot'. +-efiBootLoader: "grub" ++efiBootLoader: "sb-shim" + + # systemd-boot configuration files settings, set kernel and initramfs file names + # and amount of time before default selection boots +@@ -26,10 +26,10 @@ + # GRUB functionality (notably grub-probe) to work. As needed, you may use + # complete paths like `/usr/bin/efibootmgr` for the executables. + # +-grubInstall: "grub-install" +-grubMkconfig: "grub-mkconfig" +-grubCfg: "/boot/grub/grub.cfg" +-grubProbe: "grub-probe" ++grubInstall: "grub2-install" ++grubMkconfig: "grub2-mkconfig" ++grubCfg: "/boot/grub2/grub.cfg" ++grubProbe: "grub2-probe" + efiBootMgr: "efibootmgr" + + # Optionally set the bootloader ID to use for EFI. This is passed to +@@ -43,7 +43,9 @@ + # setting the option here, keep in mind that the name is sanitized + # (problematic characters, see above, are replaced). + # +-# efiBootloaderId: "dirname" ++# PACKAGER NOTE: If you really want to change this value, you will also have to ++# change the hardcoded directory name in the grub2(-efi) package. ++efiBootloaderId: "fedora" + + # Optionally install a copy of the GRUB EFI bootloader as the EFI + # fallback loader (either bootia32.efi or bootx64.efi depending on +diff -ur calamares-3.2.7/src/modules/keyboard/keyboard.conf calamares-3.2.7-default-settings/src/modules/keyboard/keyboard.conf +--- calamares-3.2.7/src/modules/keyboard/keyboard.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/keyboard/keyboard.conf 2019-05-05 13:38:14.200062500 +0200 +@@ -13,4 +13,4 @@ + # Write keymap configuration to /etc/default/keyboard, usually + # found on Debian-related systems. + # Defaults to true if nothing is set. +-#writeEtcDefaultKeyboard: true ++writeEtcDefaultKeyboard: false +diff -ur calamares-3.2.7/src/modules/license/license.conf calamares-3.2.7-default-settings/src/modules/license/license.conf +--- calamares-3.2.7/src/modules/license/license.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/license/license.conf 2019-05-05 17:44:32.369155950 +0200 +@@ -15,24 +15,12 @@ + # URL (i.e. file:///) assumes that the contents are HTML or plain text, and + # displays the license in-line. YAML: string, mandatory. + entries: +-- id: nvidia +- name: Nvidia +- vendor: Nvidia Corporation ++- id: evil ++ name: Evil ++ vendor: Evil Corporation + type: driver +- url: http://developer.download.nvidia.com/cg/Cg_3.0/license.pdf ++ url: http://www.example.com/evil_666.0/license.pdf + required: false +-- id: amd +- name: Catalyst +- vendor: "Advanced Micro Devices, Inc." +- type: gpudriver +- url: http://support.amd.com/en-us/download/eula +- required: false +-- id: flashplugin +- name: Adobe Flash +- vendor: Adobe Systems Incorporated +- type: browserplugin +- url: http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combined… +- required: true + # This example uses a file: link. This example uses a relative link, which + # is relative to where you run Calamares. Assuming you run it from build/ + # as part of your testing, you'll get the LICENSE text for Calamares +diff -ur calamares-3.2.7/src/modules/netinstall/netinstall.conf calamares-3.2.7-default-settings/src/modules/netinstall/netinstall.conf +--- calamares-3.2.7/src/modules/netinstall/netinstall.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/netinstall/netinstall.conf 2019-05-05 15:19:42.480153258 +0200 +@@ -5,6 +5,9 @@ + # or it can be a locally installed file: + # groupsUrl: file:///usr/share/calamares/netinstall.yaml + # groupsUrl: file:///usr/share/calamares/netinstall.yaml ++# Packager note: If you want to enable the netinstall module, you will also have ++# to create such a file (see the example in the source code). ++groupsUrl: file:///etc/calamares/modules/netinstall.yaml + + # If the installation can proceed without netinstall (e.g. the Live CD + # can create a working installed system, but netinstall is preferred +diff -ur calamares-3.2.7/src/modules/packages/packages.conf calamares-3.2.7-default-settings/src/modules/packages/packages.conf +--- calamares-3.2.7/src/modules/packages/packages.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/packages/packages.conf 2019-05-05 15:29:59.264557922 +0200 +@@ -12,7 +12,7 @@ + # - entropy - Sabayon package manager + # - dummy - Dummy manager, only logs + # +-backend: dummy ++backend: dnf + + # + # Often package installation needs an internet connection. +@@ -36,7 +36,7 @@ + # Therefore set also "update_system" to 'true'. + # + skip_if_no_internet: false +-update_db: true ++update_db: false + update_system: false + + # +@@ -143,12 +143,5 @@ + # of packages, this can lead to a considerable time savings. + # + operations: +- - install: +- - vi +- - vi-${LOCALE} +- - wget +- - binutils +- - remove: +- - vi +- - wget +- - binutils ++ - try_remove: ++ - calamares +diff -ur calamares-3.2.7/src/modules/partition/partition.conf calamares-3.2.7-default-settings/src/modules/partition/partition.conf +--- calamares-3.2.7/src/modules/partition/partition.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/partition/partition.conf 2019-05-05 13:38:14.201062486 +0200 +@@ -40,7 +40,7 @@ + # neverCreateSwap: false + + # Correctly draw nested (e.g. logical) partitions as such. +-drawNestedPartitions: false ++drawNestedPartitions: true + + # Show/hide partition labels on manual partitioning page. + alwaysShowPartitionLabels: true +diff -ur calamares-3.2.7/src/modules/plasmalnf/plasmalnf.conf calamares-3.2.7-default-settings/src/modules/plasmalnf/plasmalnf.conf +--- calamares-3.2.7/src/modules/plasmalnf/plasmalnf.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/plasmalnf/plasmalnf.conf 2019-05-05 18:40:21.937760778 +0200 +@@ -19,7 +19,7 @@ + # to the originating username; the lnftool will be run through + # "sudo -H -u <liveuser>" instead of directly. + # +-# liveuser: "live" ++liveuser: "liveuser" + + # You can limit the list of Plasma look-and-feel themes by listing ids + # here. If this key is not present, all of the installed themes are listed. +@@ -47,20 +47,20 @@ + # The image screenshot is resized to 12x8 the current font size, with + # a minimum of 120x80 pixels. This allows the screenshot to scale up + # on HiDPI displays where the fonts are larger (in pixels). +-themes: +- - org.kde.fuzzy-pig.desktop +- - theme: org.kde.breeze.desktop +- image: "breeze.png" +- - theme: org.kde.breezedark.desktop +- image: "breeze-dark.png" +- - org.kde.fluffy-bunny.desktop ++#themes: ++# - org.kde.fuzzy-pig.desktop ++# - theme: org.kde.breeze.desktop ++# image: "breeze.png" ++# - theme: org.kde.breezedark.desktop ++# image: "breeze-dark.png" ++# - org.kde.fluffy-bunny.desktop + + # If *showAll* is true, then all installed themes are shown in the + # UI for selection, even if they are not listed in *themes*. This + # allows selection of all themes even while not all of them are + # listed in *themes* -- which is useful to show screenshots for those + # you do have a screenshot for. +-showAll: false ++showAll: true + + # You can pre-select one of the themes; it is not applied + # immediately, but its radio-button is switched on to indicate +diff -ur calamares-3.2.7/src/modules/tracking/tracking.conf calamares-3.2.7-default-settings/src/modules/tracking/tracking.conf +--- calamares-3.2.7/src/modules/tracking/tracking.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/tracking/tracking.conf 2019-05-05 17:18:29.470734115 +0200 +@@ -54,7 +54,7 @@ + + # This is the default level to enable for tracking. If commented out, + # empty, or otherwise invalid, "none" is used, so no tracking by default. +-default: user ++default: none + + # The install area has one specific configuration key: + # url: this URL (remember to include the protocol, and prefer https) +diff -ur calamares-3.2.7/src/modules/umount/umount.conf calamares-3.2.7-default-settings/src/modules/umount/umount.conf +--- calamares-3.2.7/src/modules/umount/umount.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/umount/umount.conf 2019-05-05 17:20:19.852211125 +0200 +@@ -35,8 +35,8 @@ + --- + # example when using the normal Calamares log: + srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" +-destLog: "/var/log/Calamares.log" ++destLog: "/var/log/calamares.log" + + # example when using a log created by `sudo calamares -d`: +-#srcLog: "/home/live/installation.log" ++#srcLog: "/home/liveuser/installation.log" + #destLog: "/var/log/installation.log" +diff -ur calamares-3.2.7/src/modules/unpackfs/unpackfs.conf calamares-3.2.7-default-settings/src/modules/unpackfs/unpackfs.conf +--- calamares-3.2.7/src/modules/unpackfs/unpackfs.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/unpackfs/unpackfs.conf 2019-05-05 13:38:42.980657503 +0200 +@@ -33,6 +33,10 @@ + + # You can list filesystem source paths relative to the Calamares run + # directory, if you use -d (this is only useful for testing, though). +- - source: ./example.sqfs +- sourcefs: squashfs ++# - source: ./example.sqfs ++# sourcefs: squashfs ++# destination: "" ++ ++ - source: "/dev/mapper/live-base" ++ sourcefs: "ext4" + destination: "" +diff -ur calamares-3.2.7/src/modules/users/users.conf calamares-3.2.7-default-settings/src/modules/users/users.conf +--- calamares-3.2.7/src/modules/users/users.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/users/users.conf 2019-05-05 17:34:39.281336143 +0200 +@@ -17,8 +17,7 @@ + - users + - lp + - video +- - network +- - storage ++ - dialout + - wheel + - audio + +@@ -29,7 +28,7 @@ + autologinGroup: autologin + # You can control the initial state for the 'autologin checkbox' in UsersViewStep here. + # Possible values are: true to enable or false to disable the checkbox by default +-doAutologin: true ++doAutologin: false + + # When set to a non-empty string, Calamares creates a sudoers file for the user. + # /etc/sudoers.d/10-installer +@@ -39,7 +38,7 @@ + # remove this setting (delete or comment out the line below). Otherwise, + # the setting will be duplicated in the /etc/sudoers.d/10-installer file, + # potentially confusing users. +-sudoersGroup: wheel ++#sudoersGroup: wheel + + # Setting this to false , causes the root account to be disabled. + setRootPassword: true +@@ -82,4 +81,4 @@ + # and rely on a correct configuration file in /etc/default/useradd + # - set, non-empty, use that path as shell. No validation is done + # that the shell actually exists or is executable. +-# userShell: /bin/bash ++userShell: "" +diff -ur calamares-3.2.7/src/modules/welcome/welcome.conf calamares-3.2.7-default-settings/src/modules/welcome/welcome.conf +--- calamares-3.2.7/src/modules/welcome/welcome.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/welcome/welcome.conf 2019-05-05 17:40:52.754174665 +0200 +@@ -25,7 +25,7 @@ + + # To check for internet connectivity, Calamares does a HTTP GET + # on this URL; on success (e.g. HTTP code 200) internet is OK. +- internetCheckUrl: http://google.com ++ internetCheckUrl: https://fedoraproject.org/static/hotspot.txt + + # List conditions to check. Each listed condition will be + # probed in some way, and yields true or false according to +@@ -44,6 +44,6 @@ + # If any of these conditions are not met, the user cannot + # continue past the welcome page. + required: +- # - storage ++ - storage + - ram +- # - root ++ - root diff --git a/calamares-3.2.7-kdesu.patch b/calamares-3.2.7-kdesu.patch new file mode 100644 index 0000000..fec2800 --- /dev/null +++ b/calamares-3.2.7-kdesu.patch @@ -0,0 +1,97 @@ +diff -Nur calamares-3.2.7/calamares.desktop calamares-3.2.7-kdesu/calamares.desktop +--- calamares-3.2.7/calamares.desktop 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-kdesu/calamares.desktop 2019-05-05 13:30:15.193847592 +0200 +@@ -5,7 +5,7 @@ + GenericName=System Installer + Keywords=calamares;system;installer + TryExec=calamares +-Exec=pkexec /usr/bin/calamares ++Exec=kdesu /usr/bin/calamares + Comment=Calamares System Installer + Icon=calamares + Terminal=false +diff -Nur calamares-3.2.7/calamares.desktop.in calamares-3.2.7-kdesu/calamares.desktop.in +--- calamares-3.2.7/calamares.desktop.in 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-kdesu/calamares.desktop.in 2019-05-05 13:31:41.331620769 +0200 +@@ -5,7 +5,7 @@ + GenericName=System Installer + Keywords=calamares;system;installer + TryExec=calamares +-Exec=pkexec /usr/bin/calamares ++Exec=kdesu /usr/bin/calamares + Comment=Calamares System Installer + Icon=calamares + Terminal=false +diff -Nur calamares-3.2.7/CMakeLists.txt calamares-3.2.7-kdesu/CMakeLists.txt +--- calamares-3.2.7/CMakeLists.txt 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-kdesu/CMakeLists.txt 2019-05-05 13:33:35.673992717 +0200 +@@ -45,7 +45,6 @@ + ### OPTIONS + # + option( INSTALL_CONFIG "Install configuration files" ON ) +-option( INSTALL_POLKIT "Install Polkit configuration" ON ) + option( BUILD_TESTING "Build the testing tree." ON ) + option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) + option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." ON ) +@@ -244,18 +243,6 @@ + # + find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core Gui Widgets LinguistTools Svg Quick QuickWidgets ) + find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED ) +-if( INSTALL_POLKIT ) +- find_package( PolkitQt5-1 REQUIRED ) +-else() +- # Find it anyway, for dependencies-reporting +- find_package( PolkitQt5-1 ) +-endif() +-set_package_properties( +- PolkitQt5-1 PROPERTIES +- DESCRIPTION "Qt5 support for Polkit" +- URL "https://cgit.kde.org/polkit-qt-1.git" +- PURPOSE "PolkitQt5-1 helps with installing Polkit configuration" +-) + + # Find ECM once, and add it to the module search path; Calamares + # modules that need ECM can do +@@ -534,15 +521,6 @@ + ) + endif() + +-if( INSTALL_POLKIT ) +- install( +- FILES +- com.github.calamares.calamares.policy +- DESTINATION +- "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" +- ) +-endif() +- + install( + FILES + calamares.desktop +diff -Nur calamares-3.2.7/com.github.calamares.calamares.policy calamares-3.2.7-kdesu/com.github.calamares.calamares.policy +--- calamares-3.2.7/com.github.calamares.calamares.policy 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-kdesu/com.github.calamares.calamares.policy 1970-01-01 01:00:00.000000000 +0100 +@@ -1,22 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8"?> +-<!DOCTYPE policyconfig PUBLIC +-"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" +-"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> +-<policyconfig> +- +- <vendor>Calamares</vendor> +- <vendor_url>https://github.com/calamares</vendor_url> +- +- <action id="com.github.calamares.calamares.pkexec.run"> +- <description>Run Installer</description> +- <message>Authentication is required to run the installation program</message> +- <icon_name>drive-harddisk</icon_name> +- <defaults> +- <allow_any>no</allow_any> +- <allow_inactive>no</allow_inactive> +- <allow_active>auth_admin</allow_active> +- </defaults> +- <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/calamares</annotate> +- <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> +- </action> +-</policyconfig> +\ No newline at end of file diff --git a/calamares.spec b/calamares.spec index afdb869..e7f58db 100644 --- a/calamares.spec +++ b/calamares.spec @@ -7,15 +7,19 @@ #global prerelease beta2 -%ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64} +# do not use QtWebEngine because it no longer works with QtWebEngine >= 5.11 +# (it now refuses to run as root unless "export QTWEBENGINE_DISABLE_SANDBOX=1") +# https://github.com/calamares/calamares/issues/1051 +%if 0 +#ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64} # use QtWebEngine instead of QtWebKit for the optional webview module # only possible on qt5_qtwebengine_arches, which for livearches means only x86 %global webview_qtwebengine 1 %endif Name: calamares -Version: 3.1.8 -Release: 13%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist} +Version: 3.2.7 +Release: 1%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist} Summary: Installer from a live CD/DVD/USB to disk License: GPLv3+ @@ -36,57 +40,64 @@ Source4: calamares-auto_de.ts Source5: calamares-auto_it.ts # adjust some default settings (default shipped .conf files) -Patch0: calamares-3.1.8-default-settings.patch +Patch0: calamares-3.2.7-default-settings.patch # use kdesu instead of pkexec (works around #1171779) -Patch1: calamares-3.1.5-kdesu.patch +Patch1: calamares-3.2.7-kdesu.patch # Calamares is only supported where live images (and GRUB) are. (#1171380) # This list matches the livearches global from anaconda.spec ExclusiveArch: %{ix86} x86_64 +# Macros BuildRequires: kf5-rpm-macros -BuildRequires: gcc-c++ >= 4.9.0 +# Compilation tools BuildRequires: cmake >= 3.2 -BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: extra-cmake-modules >= 5.18 +BuildRequires: gcc-c++ >= 4.9.0 +BuildRequires: pkgconfig + +# Other build-time tools +BuildRequires: desktop-file-utils +BuildRequires: gettext -BuildRequires: qt5-qtbase-devel >= 5.6 -BuildRequires: qt5-qtdeclarative-devel >= 5.6 -BuildRequires: qt5-qtsvg-devel >= 5.6 -BuildRequires: qt5-qttools-devel >= 5.6 +# Qt 5 +BuildRequires: qt5-qtbase-devel >= 5.10 +BuildRequires: qt5-qtdeclarative-devel >= 5.10 +BuildRequires: qt5-qtlinguist >= 5.10 +BuildRequires: qt5-qtsvg-devel >= 5.10 %if 0%{?webview_qtwebengine} -BuildRequires: qt5-qtwebengine-devel >= 5.6 +BuildRequires: qt5-qtwebengine-devel >= 5.10 %global webview_force_webkit OFF %global webview_engine QtWebEngine %else -BuildRequires: qt5-qtwebkit-devel >= 5.6 +BuildRequires: qt5-qtwebkit-devel >= 5.212 %global webview_force_webkit ON %global webview_engine Qt5WebKit %endif +# KF5 BuildRequires: kf5-kconfig-devel BuildRequires: kf5-kcoreaddons-devel +BuildRequires: kf5-kcrash-devel BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kiconthemes-devel -BuildRequires: kf5-kio-devel +BuildRequires: kf5-kpackage-devel BuildRequires: kf5-kparts-devel BuildRequires: kf5-kservice-devel +BuildRequires: kf5-kwidgetaddons-devel +BuildRequires: kf5-plasma-devel -BuildRequires: pkgconfig -BuildRequires: gettext - +# Python 3 BuildRequires: python3-devel >= 3.3 -BuildRequires: boost-python3-devel >= 1.54.0 +BuildRequires: boost-python3-devel >= 1.55.0 %global __python %{__python3} +# Other libraries +BuildRequires: kpmcore-devel >= 3.3 +BuildRequires: libpwquality-devel +BuildRequires: libxcrypt-devel BuildRequires: yaml-cpp-devel >= 0.5.1 -BuildRequires: libblkid-devel -BuildRequires: libatasmart-devel -BuildRequires: parted-devel -BuildRequires: kpmcore-devel >= 3.0.3 - -BuildRequires: desktop-file-utils # for automatic branding setup Requires(post): system-release @@ -95,7 +106,6 @@ Requires: system-logos Requires: coreutils Requires: util-linux -Requires: dmidecode Requires: upower Requires: NetworkManager Requires: dracut @@ -118,7 +128,6 @@ Requires: grub2-efi-modules %endif Requires: console-setup Requires: xorg-x11-xkb-utils -Requires: NetworkManager Requires: os-prober Requires: e2fsprogs Requires: dosfstools @@ -160,6 +169,17 @@ Optional interactiveterminal module for the Calamares installer, based on the KonsolePart (from Konsole 5) +%package plasmalnf +Summary: Calamares plasmalnf module +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: plasma-desktop + +%description plasmalnf +Optional plasmalnf module for the Calamares installer, based on the KDE Plasma +Desktop Workspace and its KDE Frameworks (KConfig, KPackage, Plasma) + + %package webview Summary: Calamares webview module Requires: %{name} = %{version}-%{release} @@ -189,7 +209,7 @@ rm -f src/modules/*/*.conf.default-settings %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} -DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" .. +%{cmake_kf5} -DBUILD_TESTING:BOOL=OFF -DWITH_PYTHONQT:BOOL=OFF -DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -294,6 +314,7 @@ EOF %{_datadir}/calamares/branding/auto/lang/ %{_datadir}/calamares/modules/ %exclude %{_datadir}/calamares/modules/interactiveterminal.conf +%exclude %{_datadir}/calamares/modules/plasmalnf.conf %exclude %{_datadir}/calamares/modules/webview.conf %{_datadir}/calamares/qml/ %{_datadir}/applications/calamares.desktop @@ -308,12 +329,17 @@ EOF %{_libdir}/libcalamaresui.so.* %{_libdir}/calamares/ %exclude %{_libdir}/calamares/modules/interactiveterminal/ +%exclude %{_libdir}/calamares/modules/plasmalnf/ %exclude %{_libdir}/calamares/modules/webview/ %files interactiveterminal %{_datadir}/calamares/modules/interactiveterminal.conf %{_libdir}/calamares/modules/interactiveterminal/ +%files plasmalnf +%{_datadir}/calamares/modules/plasmalnf.conf +%{_libdir}/calamares/modules/plasmalnf/ + %files webview %{_datadir}/calamares/modules/webview.conf %{_libdir}/calamares/modules/webview/ @@ -326,6 +352,21 @@ EOF %changelog +* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1 +- Update to 3.2.7 and update BuildRequires and Requires +- Add plasmalnf subpackage for the new plasmalnf module requiring plasma-desktop +- Switch webview from QtWebEngine to QtWebKit to work around upstream issue 1051 +- Rebase default-settings patch and update some settings: + - enable INSTALL_CONFIG by default (we patch it in place, so install it) + - disable plymouthcfg by default (now only needed to change the default theme) + - bootloader.conf: enable sb-shim (UEFI "Secure Boot" support) + - plasmalnf.conf (note: module disabled by default): fix default liveuser + - plasmalnf.conf (note: module disabled by default): default: show all themes + - tracking.conf (note: module disabled by default): default tracking to none + - users.conf: default to honoring the default shell from /etc/default/useradd + - welcome.conf: use https for internetCheckUrl (catches more captive portals) +- Rebase kdesu patch + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.8-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 0cb03e5..03b2364 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calamares-3.1.8.tar.gz) = f5fe3e92357d2f7492298b26826da420862438e55f91be6f8d9414d332c2f4b74d382d1c128d78e453609a9a2bc79b423c5e331a295479d169ed76a7028f0375 +SHA512 (calamares-3.2.7.tar.gz) = b7b8b54254f629056b3b074b47275752672046342e19db876a9807108bf0b66481fec1db2225ddea2f7c0cd1bfe83901e5cea5c3e8fe907bef1bf6a8ba890d60

1 0

Architecture specific change in rpms/calamares.git
by githook-noreply＠fedoraproject.org 05 May '19

05 May '19

The package rpms/calamares.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/calamares.git/commit/?id=a41aa30005…. Change: -%ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64} Thanks. Full change: ============ commit a41aa30005421d49419f655ba721bd17d1c9c9c0 Author: Kevin Kofler <Kevin(a)tigcc.ticalc.org> Date: Sun May 5 18:44:25 2019 +0200 Update to 3.2.7, disable QtWebEngine, rebase patches * Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1 - Update to 3.2.7 and update BuildRequires and Requires - Add plasmalnf subpackage for the new plasmalnf module requiring plasma-desktop - Switch webview from QtWebEngine to QtWebKit to work around upstream issue 1051 - Rebase default-settings patch and update some settings: - enable INSTALL_CONFIG by default (we patch it in place, so install it) - disable plymouthcfg by default (now only needed to change the default theme) - bootloader.conf: enable sb-shim (UEFI "Secure Boot" support) - plasmalnf.conf (note: module disabled by default): fix default liveuser - plasmalnf.conf (note: module disabled by default): default: show all themes - tracking.conf (note: module disabled by default): default tracking to none - users.conf: default to honoring the default shell from /etc/default/useradd - welcome.conf: use https for internetCheckUrl (catches more captive portals) - Rebase kdesu patch diff --git a/.gitignore b/.gitignore index 3b17288..0b4fab2 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /calamares-3.1.6.tar.gz /calamares-3.1.7.tar.gz /calamares-3.1.8.tar.gz +/calamares-3.2.7.tar.gz diff --git a/calamares-3.1.5-kdesu.patch b/calamares-3.1.5-kdesu.patch deleted file mode 100644 index c18fb9f..0000000 --- a/calamares-3.1.5-kdesu.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Nur calamares-3.1.5/calamares.desktop calamares-3.1.5-kdesu/calamares.desktop ---- calamares-3.1.5/calamares.desktop 2017-09-25 17:13:33.000000000 +0200 -+++ calamares-3.1.5-kdesu/calamares.desktop 2017-09-27 03:30:14.647027258 +0200 -@@ -5,7 +5,7 @@ - GenericName=System Installer - Keywords=calamares;system;installer - TryExec=calamares --Exec=pkexec /usr/bin/calamares -+Exec=kdesu /usr/bin/calamares - Comment=Calamares System Installer - Icon=calamares - Terminal=false -diff -Nur calamares-3.1.5/CMakeLists.txt calamares-3.1.5-kdesu/CMakeLists.txt ---- calamares-3.1.5/CMakeLists.txt 2017-09-25 17:13:33.000000000 +0200 -+++ calamares-3.1.5-kdesu/CMakeLists.txt 2017-09-27 03:30:15.121020240 +0200 -@@ -110,7 +110,6 @@ - - find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools Svg Quick QuickWidgets ) - find_package( YAMLCPP 0.5.1 REQUIRED ) --find_package( PolkitQt5-1 REQUIRED ) - - option( INSTALL_CONFIG "Install configuration files" ON ) - option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) -@@ -332,13 +331,6 @@ - - install( - FILES -- com.github.calamares.calamares.policy -- DESTINATION -- "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" --) -- --install( -- FILES - calamares.desktop - DESTINATION - ${CMAKE_INSTALL_DATADIR}/applications -diff -Nur calamares-3.1.5/com.github.calamares.calamares.policy calamares-3.1.5-kdesu/com.github.calamares.calamares.policy ---- calamares-3.1.5/com.github.calamares.calamares.policy 2017-09-25 17:13:33.000000000 +0200 -+++ calamares-3.1.5-kdesu/com.github.calamares.calamares.policy 1970-01-01 01:00:00.000000000 +0100 -@@ -1,22 +0,0 @@ --<?xml version="1.0" encoding="UTF-8"?> --<!DOCTYPE policyconfig PUBLIC --"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" --"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> --<policyconfig> -- -- <vendor>Calamares</vendor> -- <vendor_url>https://github.com/calamares</vendor_url> -- -- <action id="com.github.calamares.calamares.pkexec.run"> -- <description>Run Installer</description> -- <message>Authentication is required to run the installation program</message> -- <icon_name>drive-harddisk</icon_name> -- <defaults> -- <allow_any>no</allow_any> -- <allow_inactive>no</allow_inactive> -- <allow_active>auth_admin</allow_active> -- </defaults> -- <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/calamares</annotate> -- <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> -- </action> --</policyconfig> -\ No newline at end of file diff --git a/calamares-3.1.8-default-settings.patch b/calamares-3.1.8-default-settings.patch deleted file mode 100644 index 3cc0875..0000000 --- a/calamares-3.1.8-default-settings.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -ur calamares-3.1.8/settings.conf calamares-3.1.8-default-settings/settings.conf ---- calamares-3.1.8/settings.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/settings.conf 2017-11-14 16:53:50.562464805 +0100 -@@ -80,21 +80,22 @@ - - locale - - keyboard - - localecfg --# - luksbootkeyfile -+ - luksbootkeyfile - # - luksopenswaphookcfg --# - dracutlukscfg --# - plymouthcfg -- - initcpiocfg -- - initcpio -+ - dracutlukscfg -+ - plymouthcfg -+# - initcpiocfg -+# - initcpio - - users - - displaymanager - - networkcfg - - hwclock - - services --# - dracut -- - initramfs --# - grubcfg -+ - dracut -+# - initramfs -+ - grubcfg - - bootloader -+ - packages - - umount - - show: - # - webview@owncloud -@@ -109,7 +110,7 @@ - # Only the name of the branding component (directory) should be specified here, Calamares - # then takes care of finding it and loading the contents. - # YAML: string. --branding: default -+branding: auto - - # If this is set to true, Calamares will show an "Are you sure?" prompt right before - # each execution phase, i.e. at points of no return. If this is set to false, no prompt -diff -ur calamares-3.1.8/src/modules/bootloader/bootloader.conf calamares-3.1.8-default-settings/src/modules/bootloader/bootloader.conf ---- calamares-3.1.8/src/modules/bootloader/bootloader.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/bootloader/bootloader.conf 2017-11-14 16:53:50.641463674 +0100 -@@ -17,11 +17,13 @@ - - # GRUB 2 binary names and boot directory - # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. --grubInstall: "grub-install" --grubMkconfig: "grub-mkconfig" --grubCfg: "/boot/grub/grub.cfg" -+grubInstall: "grub2-install" -+grubMkconfig: "grub2-mkconfig" -+grubCfg: "/boot/grub2/grub.cfg" - # Optionally set the --bootloader-id to use for EFI. If not set, this defaults - # to the bootloaderEntryName from branding.desc with problematic characters - # replaced. If an efiBootloaderId is specified here, it is taken to already be a - # valid directory name, so no such postprocessing is done in this case. --# efiBootloaderId: "dirname" -+# PACKAGER NOTE: If you really want to change this value, you will also have to -+# change the hardcoded directory name in the grub2(-efi) package. -+efiBootloaderId: "fedora" -diff -ur calamares-3.1.8/src/modules/keyboard/keyboard.conf calamares-3.1.8-default-settings/src/modules/keyboard/keyboard.conf ---- calamares-3.1.8/src/modules/keyboard/keyboard.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/keyboard/keyboard.conf 2017-11-14 16:53:50.721462529 +0100 -@@ -11,4 +11,4 @@ - # Write keymap configuration to /etc/default/keyboard, usually - # found on Debian-related systems. - # Defaults to true if nothing is set. --#writeEtcDefaultKeyboard: true -+writeEtcDefaultKeyboard: false -diff -ur calamares-3.1.8/src/modules/license/license.conf calamares-3.1.8-default-settings/src/modules/license/license.conf ---- calamares-3.1.8/src/modules/license/license.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/license/license.conf 2017-11-14 16:53:50.721462529 +0100 -@@ -3,21 +3,9 @@ - --- - # YAML: list of maps. - entries: --- id: nvidia # Entry identifier, must be unique. Not user visible. YAML: string. -- name: Nvidia # Pretty name for the software product, user visible and untranslatable. YAML: string. -- vendor: Nvidia Corporation # Pretty name for the software vendor, user visible and untranslatable. YAML: string, optional, default is empty. -+- id: evil # Entry identifier, must be unique. Not user visible. YAML: string. -+ name: Evil # Pretty name for the software product, user visible and untranslatable. YAML: string. -+ vendor: Evil Corporation # Pretty name for the software vendor, user visible and untranslatable. YAML: string, optional, default is empty. - type: driver # Package type for presentation, not user visible but affects user visible strings. YAML: string, allowed values: driver, gpudriver, browserplugin, codec, package, software; optional, default is software. -- url: http://developer.download.nvidia.com/cg/Cg_3.0/license.pdf # Url of license text to display in a web view. YAML: string. -+ url: http://www.example.com/evil_666.0/license.pdf # Url of license text to display in a web view. YAML: string. - required: false # If set to true, the user cannot proceed without accepting this license. YAML: boolean, optional, default is false. --- id: amd -- name: Catalyst -- vendor: "Advanced Micro Devices, Inc." -- type: gpudriver -- url: http://support.amd.com/en-us/download/eula -- required: false --- id: flashplugin -- name: Adobe Flash -- vendor: Adobe Systems Incorporated -- type: browserplugin -- url: http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combined… -- required: true -diff -ur calamares-3.1.8/src/modules/netinstall/netinstall.conf calamares-3.1.8-default-settings/src/modules/netinstall/netinstall.conf ---- calamares-3.1.8/src/modules/netinstall/netinstall.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/netinstall/netinstall.conf 2017-11-14 16:53:50.787461586 +0100 -@@ -1,7 +1,10 @@ - --- - # This is the URL that is retrieved to get the netinstall groups-and-packages - # data (which should be in the format described in netinstall.yaml). --groupsUrl: http://chakraos.org/netinstall.php -+# Packager note: If you want to enable the netinstall module, you will also have -+# to create such a file (see the example in the source code). -+groupsUrl: file:///etc/calamares/modules/netinstall.yaml -+#groupsUrl: http://example.com/netinstall.yaml - - # If the installation can proceed without netinstall (e.g. the Live CD - # can create a working installed system, but netinstall is preferred -diff -ur calamares-3.1.8/src/modules/packages/packages.conf calamares-3.1.8-default-settings/src/modules/packages/packages.conf ---- calamares-3.1.8/src/modules/packages/packages.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/packages/packages.conf 2017-11-14 16:53:50.788461571 +0100 -@@ -12,12 +12,12 @@ - # - entropy - Sabayon package manager - # - dummy - Dummy manager, only logs - # --backend: dummy -+backend: dnf - - # If set to true, a package-manager specific update procedure - # is run first (only if there is internet) to update the list - # of packages and dependencies. --update_db: true -+update_db: false - - # - # List of maps with package operations such as install or remove. -@@ -112,11 +112,5 @@ - # of packages, this can lead to a considerable time savings. - # - operations: -- - install: -- - vi -- - wget -- - binutils -- - remove: -- - vi -- - wget -- - binutils -+ - try_remove: -+ - calamares -diff -ur calamares-3.1.8/src/modules/partition/partition.conf calamares-3.1.8-default-settings/src/modules/partition/partition.conf ---- calamares-3.1.8/src/modules/partition/partition.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/partition/partition.conf 2017-11-14 16:53:50.862460511 +0100 -@@ -21,7 +21,7 @@ - neverCreateSwap: false - - # Correctly draw nested (e.g. logical) partitions as such. --drawNestedPartitions: false -+drawNestedPartitions: true - - # Show/hide partition labels on manual partitioning page. - alwaysShowPartitionLabels: true -diff -ur calamares-3.1.8/src/modules/services/services.conf calamares-3.1.8-default-settings/src/modules/services/services.conf ---- calamares-3.1.8/src/modules/services/services.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/services/services.conf 2017-11-14 16:53:50.863460497 +0100 -@@ -12,9 +12,4 @@ - - name: "graphical" - mandatory: true - --disable: -- - name: "pacman-init" -- mandatory: false -- --# Example to express an empty list: --# disable: [] -+disable: [] -diff -ur calamares-3.1.8/src/modules/umount/umount.conf calamares-3.1.8-default-settings/src/modules/umount/umount.conf ---- calamares-3.1.8/src/modules/umount/umount.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/umount/umount.conf 2017-11-14 16:53:50.863460497 +0100 -@@ -1,9 +1,6 @@ - --- --#srcLog: "/path/to/installation.log" --#destLog: "/var/log/installation.log" --# example when using the Calamares created log: --#srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" --#destLog: "/var/log/Calamares.log" -+srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" -+destLog: "/var/log/calamares.log" - # example when creating with a sudo calamares -d log: --#srcLog: "/home/live/installation.log" -+#srcLog: "/home/liveuser/installation.log" - #destLog: "/var/log/installation.log" -diff -ur calamares-3.1.8/src/modules/unpackfs/unpackfs.conf calamares-3.1.8-default-settings/src/modules/unpackfs/unpackfs.conf ---- calamares-3.1.8/src/modules/unpackfs/unpackfs.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/unpackfs/unpackfs.conf 2017-11-14 16:53:50.863460497 +0100 -@@ -33,6 +33,10 @@ - - # You can list filesystem source paths relative to the Calamares run - # directory, if you use -d (this is only useful for testing, though). -- - source: ./example.sqfs -- sourcefs: squashfs -+# - source: ./example.sqfs -+# sourcefs: squashfs -+# destination: "" -+ -+ - source: "/dev/mapper/live-base" -+ sourcefs: "ext4" - destination: "" -diff -ur calamares-3.1.8/src/modules/users/users.conf calamares-3.1.8-default-settings/src/modules/users/users.conf ---- calamares-3.1.8/src/modules/users/users.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/users/users.conf 2017-11-14 16:53:50.863460497 +0100 -@@ -15,15 +15,15 @@ - - users - - lp - - video -- - network -- - storage -+ - dialout - - wheel - - audio - autologinGroup: autologin --doAutologin: true -+doAutologin: false - --# remove the following line to avoid creating /etc/sudoers.d/10-installer --sudoersGroup: wheel -+# this is already the default in /etc/sudoers, so do NOT set it here, as that -+# would create a confusing /etc/sudoers.d/10-installer file that sets it again -+# sudoersGroup: wheel - - setRootPassword: true - doReusePassword: true -diff -ur calamares-3.1.8/src/modules/welcome/welcome.conf calamares-3.1.8-default-settings/src/modules/welcome/welcome.conf ---- calamares-3.1.8/src/modules/welcome/welcome.conf 2017-11-14 16:18:58.000000000 +0100 -+++ calamares-3.1.8-default-settings/src/modules/welcome/welcome.conf 2017-11-14 16:53:50.864460483 +0100 -@@ -6,7 +6,7 @@ - requirements: - requiredStorage: 5.5 - requiredRam: 1.0 -- internetCheckUrl: http://google.com -+ internetCheckUrl: http://fedoraproject.org/static/hotspot.txt - - # List conditions to check. Each listed condition will be - # probed in some way, and yields true or false according to diff --git a/calamares-3.1.8-fix-version.patch b/calamares-3.1.8-fix-version.patch deleted file mode 100644 index 40bb192..0000000 --- a/calamares-3.1.8-fix-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 848d532a5800de40ca398a6d06cb91edef12c92b Mon Sep 17 00:00:00 2001 -Message-Id: <848d532a5800de40ca398a6d06cb91edef12c92b.1510674994.git.kevin.kofler(a)chello.at> -From: Adriaan de Groot <groot(a)kde.org> -Date: Tue, 14 Nov 2017 10:18:58 -0500 -Subject: [PATCH] CMake: drop -rc status - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9913436..7c0af9c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -167,7 +167,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX - set( CALAMARES_VERSION_MAJOR 3 ) - set( CALAMARES_VERSION_MINOR 1 ) - set( CALAMARES_VERSION_PATCH 8 ) --set( CALAMARES_VERSION_RC 1 ) -+set( CALAMARES_VERSION_RC 0 ) - - set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) - set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) --- -2.9.5 - diff --git a/calamares-3.2.7-default-settings.patch b/calamares-3.2.7-default-settings.patch new file mode 100644 index 0000000..5b6d4d5 --- /dev/null +++ b/calamares-3.2.7-default-settings.patch @@ -0,0 +1,335 @@ +diff -ur calamares-3.2.7/CMakeLists.txt calamares-3.2.7-default-settings/CMakeLists.txt +--- calamares-3.2.7/CMakeLists.txt 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/CMakeLists.txt 2019-05-05 13:36:50.504240246 +0200 +@@ -44,7 +44,7 @@ + + ### OPTIONS + # +-option( INSTALL_CONFIG "Install configuration files" OFF ) ++option( INSTALL_CONFIG "Install configuration files" ON ) + option( INSTALL_POLKIT "Install Polkit configuration" ON ) + option( BUILD_TESTING "Build the testing tree." ON ) + option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) +diff -ur calamares-3.2.7/settings.conf calamares-3.2.7-default-settings/settings.conf +--- calamares-3.2.7/settings.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/settings.conf 2019-05-05 15:49:51.132001547 +0200 +@@ -92,21 +92,22 @@ + - locale + - keyboard + - localecfg +-# - luksbootkeyfile ++ - luksbootkeyfile + # - luksopenswaphookcfg +-# - dracutlukscfg ++ - dracutlukscfg + # - plymouthcfg +- - initcpiocfg +- - initcpio ++# - initcpiocfg ++# - initcpio + - users + - displaymanager + - networkcfg + - hwclock + - services-systemd +-# - dracut +- - initramfs +-# - grubcfg ++ - dracut ++# - initramfs ++ - grubcfg + - bootloader ++ - packages + - umount + - show: + # - webview@owncloud +@@ -124,7 +125,7 @@ + # here, Calamares then takes care of finding it and loading the contents. + # + # YAML: string. +-branding: default ++branding: auto + + # If this is set to true, Calamares will show an "Are you sure?" prompt right + # before each execution phase, i.e. at points of no return. If this is set to +diff -ur calamares-3.2.7/src/modules/bootloader/bootloader.conf calamares-3.2.7-default-settings/src/modules/bootloader/bootloader.conf +--- calamares-3.2.7/src/modules/bootloader/bootloader.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/bootloader/bootloader.conf 2019-05-05 14:59:12.992331162 +0200 +@@ -4,7 +4,7 @@ + --- + # Define which bootloader you want to use for EFI installations + # Possible options are 'grub', 'sb-shim' and 'systemd-boot'. +-efiBootLoader: "grub" ++efiBootLoader: "sb-shim" + + # systemd-boot configuration files settings, set kernel and initramfs file names + # and amount of time before default selection boots +@@ -26,10 +26,10 @@ + # GRUB functionality (notably grub-probe) to work. As needed, you may use + # complete paths like `/usr/bin/efibootmgr` for the executables. + # +-grubInstall: "grub-install" +-grubMkconfig: "grub-mkconfig" +-grubCfg: "/boot/grub/grub.cfg" +-grubProbe: "grub-probe" ++grubInstall: "grub2-install" ++grubMkconfig: "grub2-mkconfig" ++grubCfg: "/boot/grub2/grub.cfg" ++grubProbe: "grub2-probe" + efiBootMgr: "efibootmgr" + + # Optionally set the bootloader ID to use for EFI. This is passed to +@@ -43,7 +43,9 @@ + # setting the option here, keep in mind that the name is sanitized + # (problematic characters, see above, are replaced). + # +-# efiBootloaderId: "dirname" ++# PACKAGER NOTE: If you really want to change this value, you will also have to ++# change the hardcoded directory name in the grub2(-efi) package. ++efiBootloaderId: "fedora" + + # Optionally install a copy of the GRUB EFI bootloader as the EFI + # fallback loader (either bootia32.efi or bootx64.efi depending on +diff -ur calamares-3.2.7/src/modules/keyboard/keyboard.conf calamares-3.2.7-default-settings/src/modules/keyboard/keyboard.conf +--- calamares-3.2.7/src/modules/keyboard/keyboard.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/keyboard/keyboard.conf 2019-05-05 13:38:14.200062500 +0200 +@@ -13,4 +13,4 @@ + # Write keymap configuration to /etc/default/keyboard, usually + # found on Debian-related systems. + # Defaults to true if nothing is set. +-#writeEtcDefaultKeyboard: true ++writeEtcDefaultKeyboard: false +diff -ur calamares-3.2.7/src/modules/license/license.conf calamares-3.2.7-default-settings/src/modules/license/license.conf +--- calamares-3.2.7/src/modules/license/license.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/license/license.conf 2019-05-05 17:44:32.369155950 +0200 +@@ -15,24 +15,12 @@ + # URL (i.e. file:///) assumes that the contents are HTML or plain text, and + # displays the license in-line. YAML: string, mandatory. + entries: +-- id: nvidia +- name: Nvidia +- vendor: Nvidia Corporation ++- id: evil ++ name: Evil ++ vendor: Evil Corporation + type: driver +- url: http://developer.download.nvidia.com/cg/Cg_3.0/license.pdf ++ url: http://www.example.com/evil_666.0/license.pdf + required: false +-- id: amd +- name: Catalyst +- vendor: "Advanced Micro Devices, Inc." +- type: gpudriver +- url: http://support.amd.com/en-us/download/eula +- required: false +-- id: flashplugin +- name: Adobe Flash +- vendor: Adobe Systems Incorporated +- type: browserplugin +- url: http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combined… +- required: true + # This example uses a file: link. This example uses a relative link, which + # is relative to where you run Calamares. Assuming you run it from build/ + # as part of your testing, you'll get the LICENSE text for Calamares +diff -ur calamares-3.2.7/src/modules/netinstall/netinstall.conf calamares-3.2.7-default-settings/src/modules/netinstall/netinstall.conf +--- calamares-3.2.7/src/modules/netinstall/netinstall.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/netinstall/netinstall.conf 2019-05-05 15:19:42.480153258 +0200 +@@ -5,6 +5,9 @@ + # or it can be a locally installed file: + # groupsUrl: file:///usr/share/calamares/netinstall.yaml + # groupsUrl: file:///usr/share/calamares/netinstall.yaml ++# Packager note: If you want to enable the netinstall module, you will also have ++# to create such a file (see the example in the source code). ++groupsUrl: file:///etc/calamares/modules/netinstall.yaml + + # If the installation can proceed without netinstall (e.g. the Live CD + # can create a working installed system, but netinstall is preferred +diff -ur calamares-3.2.7/src/modules/packages/packages.conf calamares-3.2.7-default-settings/src/modules/packages/packages.conf +--- calamares-3.2.7/src/modules/packages/packages.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/packages/packages.conf 2019-05-05 15:29:59.264557922 +0200 +@@ -12,7 +12,7 @@ + # - entropy - Sabayon package manager + # - dummy - Dummy manager, only logs + # +-backend: dummy ++backend: dnf + + # + # Often package installation needs an internet connection. +@@ -36,7 +36,7 @@ + # Therefore set also "update_system" to 'true'. + # + skip_if_no_internet: false +-update_db: true ++update_db: false + update_system: false + + # +@@ -143,12 +143,5 @@ + # of packages, this can lead to a considerable time savings. + # + operations: +- - install: +- - vi +- - vi-${LOCALE} +- - wget +- - binutils +- - remove: +- - vi +- - wget +- - binutils ++ - try_remove: ++ - calamares +diff -ur calamares-3.2.7/src/modules/partition/partition.conf calamares-3.2.7-default-settings/src/modules/partition/partition.conf +--- calamares-3.2.7/src/modules/partition/partition.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/partition/partition.conf 2019-05-05 13:38:14.201062486 +0200 +@@ -40,7 +40,7 @@ + # neverCreateSwap: false + + # Correctly draw nested (e.g. logical) partitions as such. +-drawNestedPartitions: false ++drawNestedPartitions: true + + # Show/hide partition labels on manual partitioning page. + alwaysShowPartitionLabels: true +diff -ur calamares-3.2.7/src/modules/plasmalnf/plasmalnf.conf calamares-3.2.7-default-settings/src/modules/plasmalnf/plasmalnf.conf +--- calamares-3.2.7/src/modules/plasmalnf/plasmalnf.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/plasmalnf/plasmalnf.conf 2019-05-05 18:40:21.937760778 +0200 +@@ -19,7 +19,7 @@ + # to the originating username; the lnftool will be run through + # "sudo -H -u <liveuser>" instead of directly. + # +-# liveuser: "live" ++liveuser: "liveuser" + + # You can limit the list of Plasma look-and-feel themes by listing ids + # here. If this key is not present, all of the installed themes are listed. +@@ -47,20 +47,20 @@ + # The image screenshot is resized to 12x8 the current font size, with + # a minimum of 120x80 pixels. This allows the screenshot to scale up + # on HiDPI displays where the fonts are larger (in pixels). +-themes: +- - org.kde.fuzzy-pig.desktop +- - theme: org.kde.breeze.desktop +- image: "breeze.png" +- - theme: org.kde.breezedark.desktop +- image: "breeze-dark.png" +- - org.kde.fluffy-bunny.desktop ++#themes: ++# - org.kde.fuzzy-pig.desktop ++# - theme: org.kde.breeze.desktop ++# image: "breeze.png" ++# - theme: org.kde.breezedark.desktop ++# image: "breeze-dark.png" ++# - org.kde.fluffy-bunny.desktop + + # If *showAll* is true, then all installed themes are shown in the + # UI for selection, even if they are not listed in *themes*. This + # allows selection of all themes even while not all of them are + # listed in *themes* -- which is useful to show screenshots for those + # you do have a screenshot for. +-showAll: false ++showAll: true + + # You can pre-select one of the themes; it is not applied + # immediately, but its radio-button is switched on to indicate +diff -ur calamares-3.2.7/src/modules/tracking/tracking.conf calamares-3.2.7-default-settings/src/modules/tracking/tracking.conf +--- calamares-3.2.7/src/modules/tracking/tracking.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/tracking/tracking.conf 2019-05-05 17:18:29.470734115 +0200 +@@ -54,7 +54,7 @@ + + # This is the default level to enable for tracking. If commented out, + # empty, or otherwise invalid, "none" is used, so no tracking by default. +-default: user ++default: none + + # The install area has one specific configuration key: + # url: this URL (remember to include the protocol, and prefer https) +diff -ur calamares-3.2.7/src/modules/umount/umount.conf calamares-3.2.7-default-settings/src/modules/umount/umount.conf +--- calamares-3.2.7/src/modules/umount/umount.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/umount/umount.conf 2019-05-05 17:20:19.852211125 +0200 +@@ -35,8 +35,8 @@ + --- + # example when using the normal Calamares log: + srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" +-destLog: "/var/log/Calamares.log" ++destLog: "/var/log/calamares.log" + + # example when using a log created by `sudo calamares -d`: +-#srcLog: "/home/live/installation.log" ++#srcLog: "/home/liveuser/installation.log" + #destLog: "/var/log/installation.log" +diff -ur calamares-3.2.7/src/modules/unpackfs/unpackfs.conf calamares-3.2.7-default-settings/src/modules/unpackfs/unpackfs.conf +--- calamares-3.2.7/src/modules/unpackfs/unpackfs.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/unpackfs/unpackfs.conf 2019-05-05 13:38:42.980657503 +0200 +@@ -33,6 +33,10 @@ + + # You can list filesystem source paths relative to the Calamares run + # directory, if you use -d (this is only useful for testing, though). +- - source: ./example.sqfs +- sourcefs: squashfs ++# - source: ./example.sqfs ++# sourcefs: squashfs ++# destination: "" ++ ++ - source: "/dev/mapper/live-base" ++ sourcefs: "ext4" + destination: "" +diff -ur calamares-3.2.7/src/modules/users/users.conf calamares-3.2.7-default-settings/src/modules/users/users.conf +--- calamares-3.2.7/src/modules/users/users.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/users/users.conf 2019-05-05 17:34:39.281336143 +0200 +@@ -17,8 +17,7 @@ + - users + - lp + - video +- - network +- - storage ++ - dialout + - wheel + - audio + +@@ -29,7 +28,7 @@ + autologinGroup: autologin + # You can control the initial state for the 'autologin checkbox' in UsersViewStep here. + # Possible values are: true to enable or false to disable the checkbox by default +-doAutologin: true ++doAutologin: false + + # When set to a non-empty string, Calamares creates a sudoers file for the user. + # /etc/sudoers.d/10-installer +@@ -39,7 +38,7 @@ + # remove this setting (delete or comment out the line below). Otherwise, + # the setting will be duplicated in the /etc/sudoers.d/10-installer file, + # potentially confusing users. +-sudoersGroup: wheel ++#sudoersGroup: wheel + + # Setting this to false , causes the root account to be disabled. + setRootPassword: true +@@ -82,4 +81,4 @@ + # and rely on a correct configuration file in /etc/default/useradd + # - set, non-empty, use that path as shell. No validation is done + # that the shell actually exists or is executable. +-# userShell: /bin/bash ++userShell: "" +diff -ur calamares-3.2.7/src/modules/welcome/welcome.conf calamares-3.2.7-default-settings/src/modules/welcome/welcome.conf +--- calamares-3.2.7/src/modules/welcome/welcome.conf 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-default-settings/src/modules/welcome/welcome.conf 2019-05-05 17:40:52.754174665 +0200 +@@ -25,7 +25,7 @@ + + # To check for internet connectivity, Calamares does a HTTP GET + # on this URL; on success (e.g. HTTP code 200) internet is OK. +- internetCheckUrl: http://google.com ++ internetCheckUrl: https://fedoraproject.org/static/hotspot.txt + + # List conditions to check. Each listed condition will be + # probed in some way, and yields true or false according to +@@ -44,6 +44,6 @@ + # If any of these conditions are not met, the user cannot + # continue past the welcome page. + required: +- # - storage ++ - storage + - ram +- # - root ++ - root diff --git a/calamares-3.2.7-kdesu.patch b/calamares-3.2.7-kdesu.patch new file mode 100644 index 0000000..fec2800 --- /dev/null +++ b/calamares-3.2.7-kdesu.patch @@ -0,0 +1,97 @@ +diff -Nur calamares-3.2.7/calamares.desktop calamares-3.2.7-kdesu/calamares.desktop +--- calamares-3.2.7/calamares.desktop 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-kdesu/calamares.desktop 2019-05-05 13:30:15.193847592 +0200 +@@ -5,7 +5,7 @@ + GenericName=System Installer + Keywords=calamares;system;installer + TryExec=calamares +-Exec=pkexec /usr/bin/calamares ++Exec=kdesu /usr/bin/calamares + Comment=Calamares System Installer + Icon=calamares + Terminal=false +diff -Nur calamares-3.2.7/calamares.desktop.in calamares-3.2.7-kdesu/calamares.desktop.in +--- calamares-3.2.7/calamares.desktop.in 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-kdesu/calamares.desktop.in 2019-05-05 13:31:41.331620769 +0200 +@@ -5,7 +5,7 @@ + GenericName=System Installer + Keywords=calamares;system;installer + TryExec=calamares +-Exec=pkexec /usr/bin/calamares ++Exec=kdesu /usr/bin/calamares + Comment=Calamares System Installer + Icon=calamares + Terminal=false +diff -Nur calamares-3.2.7/CMakeLists.txt calamares-3.2.7-kdesu/CMakeLists.txt +--- calamares-3.2.7/CMakeLists.txt 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-kdesu/CMakeLists.txt 2019-05-05 13:33:35.673992717 +0200 +@@ -45,7 +45,6 @@ + ### OPTIONS + # + option( INSTALL_CONFIG "Install configuration files" ON ) +-option( INSTALL_POLKIT "Install Polkit configuration" ON ) + option( BUILD_TESTING "Build the testing tree." ON ) + option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) + option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." ON ) +@@ -244,18 +243,6 @@ + # + find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core Gui Widgets LinguistTools Svg Quick QuickWidgets ) + find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED ) +-if( INSTALL_POLKIT ) +- find_package( PolkitQt5-1 REQUIRED ) +-else() +- # Find it anyway, for dependencies-reporting +- find_package( PolkitQt5-1 ) +-endif() +-set_package_properties( +- PolkitQt5-1 PROPERTIES +- DESCRIPTION "Qt5 support for Polkit" +- URL "https://cgit.kde.org/polkit-qt-1.git" +- PURPOSE "PolkitQt5-1 helps with installing Polkit configuration" +-) + + # Find ECM once, and add it to the module search path; Calamares + # modules that need ECM can do +@@ -534,15 +521,6 @@ + ) + endif() + +-if( INSTALL_POLKIT ) +- install( +- FILES +- com.github.calamares.calamares.policy +- DESTINATION +- "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" +- ) +-endif() +- + install( + FILES + calamares.desktop +diff -Nur calamares-3.2.7/com.github.calamares.calamares.policy calamares-3.2.7-kdesu/com.github.calamares.calamares.policy +--- calamares-3.2.7/com.github.calamares.calamares.policy 2019-04-27 20:12:03.000000000 +0200 ++++ calamares-3.2.7-kdesu/com.github.calamares.calamares.policy 1970-01-01 01:00:00.000000000 +0100 +@@ -1,22 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8"?> +-<!DOCTYPE policyconfig PUBLIC +-"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" +-"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> +-<policyconfig> +- +- <vendor>Calamares</vendor> +- <vendor_url>https://github.com/calamares</vendor_url> +- +- <action id="com.github.calamares.calamares.pkexec.run"> +- <description>Run Installer</description> +- <message>Authentication is required to run the installation program</message> +- <icon_name>drive-harddisk</icon_name> +- <defaults> +- <allow_any>no</allow_any> +- <allow_inactive>no</allow_inactive> +- <allow_active>auth_admin</allow_active> +- </defaults> +- <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/calamares</annotate> +- <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> +- </action> +-</policyconfig> +\ No newline at end of file diff --git a/calamares.spec b/calamares.spec index afdb869..e7f58db 100644 --- a/calamares.spec +++ b/calamares.spec @@ -7,15 +7,19 @@ #global prerelease beta2 -%ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64} +# do not use QtWebEngine because it no longer works with QtWebEngine >= 5.11 +# (it now refuses to run as root unless "export QTWEBENGINE_DISABLE_SANDBOX=1") +# https://github.com/calamares/calamares/issues/1051 +%if 0 +#ifarch %{?qt5_qtwebengine_arches}%{!?qt5_qtwebengine_arches:%{ix86} x86_64} # use QtWebEngine instead of QtWebKit for the optional webview module # only possible on qt5_qtwebengine_arches, which for livearches means only x86 %global webview_qtwebengine 1 %endif Name: calamares -Version: 3.1.8 -Release: 13%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist} +Version: 3.2.7 +Release: 1%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist} Summary: Installer from a live CD/DVD/USB to disk License: GPLv3+ @@ -36,57 +40,64 @@ Source4: calamares-auto_de.ts Source5: calamares-auto_it.ts # adjust some default settings (default shipped .conf files) -Patch0: calamares-3.1.8-default-settings.patch +Patch0: calamares-3.2.7-default-settings.patch # use kdesu instead of pkexec (works around #1171779) -Patch1: calamares-3.1.5-kdesu.patch +Patch1: calamares-3.2.7-kdesu.patch # Calamares is only supported where live images (and GRUB) are. (#1171380) # This list matches the livearches global from anaconda.spec ExclusiveArch: %{ix86} x86_64 +# Macros BuildRequires: kf5-rpm-macros -BuildRequires: gcc-c++ >= 4.9.0 +# Compilation tools BuildRequires: cmake >= 3.2 -BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: extra-cmake-modules >= 5.18 +BuildRequires: gcc-c++ >= 4.9.0 +BuildRequires: pkgconfig + +# Other build-time tools +BuildRequires: desktop-file-utils +BuildRequires: gettext -BuildRequires: qt5-qtbase-devel >= 5.6 -BuildRequires: qt5-qtdeclarative-devel >= 5.6 -BuildRequires: qt5-qtsvg-devel >= 5.6 -BuildRequires: qt5-qttools-devel >= 5.6 +# Qt 5 +BuildRequires: qt5-qtbase-devel >= 5.10 +BuildRequires: qt5-qtdeclarative-devel >= 5.10 +BuildRequires: qt5-qtlinguist >= 5.10 +BuildRequires: qt5-qtsvg-devel >= 5.10 %if 0%{?webview_qtwebengine} -BuildRequires: qt5-qtwebengine-devel >= 5.6 +BuildRequires: qt5-qtwebengine-devel >= 5.10 %global webview_force_webkit OFF %global webview_engine QtWebEngine %else -BuildRequires: qt5-qtwebkit-devel >= 5.6 +BuildRequires: qt5-qtwebkit-devel >= 5.212 %global webview_force_webkit ON %global webview_engine Qt5WebKit %endif +# KF5 BuildRequires: kf5-kconfig-devel BuildRequires: kf5-kcoreaddons-devel +BuildRequires: kf5-kcrash-devel BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kiconthemes-devel -BuildRequires: kf5-kio-devel +BuildRequires: kf5-kpackage-devel BuildRequires: kf5-kparts-devel BuildRequires: kf5-kservice-devel +BuildRequires: kf5-kwidgetaddons-devel +BuildRequires: kf5-plasma-devel -BuildRequires: pkgconfig -BuildRequires: gettext - +# Python 3 BuildRequires: python3-devel >= 3.3 -BuildRequires: boost-python3-devel >= 1.54.0 +BuildRequires: boost-python3-devel >= 1.55.0 %global __python %{__python3} +# Other libraries +BuildRequires: kpmcore-devel >= 3.3 +BuildRequires: libpwquality-devel +BuildRequires: libxcrypt-devel BuildRequires: yaml-cpp-devel >= 0.5.1 -BuildRequires: libblkid-devel -BuildRequires: libatasmart-devel -BuildRequires: parted-devel -BuildRequires: kpmcore-devel >= 3.0.3 - -BuildRequires: desktop-file-utils # for automatic branding setup Requires(post): system-release @@ -95,7 +106,6 @@ Requires: system-logos Requires: coreutils Requires: util-linux -Requires: dmidecode Requires: upower Requires: NetworkManager Requires: dracut @@ -118,7 +128,6 @@ Requires: grub2-efi-modules %endif Requires: console-setup Requires: xorg-x11-xkb-utils -Requires: NetworkManager Requires: os-prober Requires: e2fsprogs Requires: dosfstools @@ -160,6 +169,17 @@ Optional interactiveterminal module for the Calamares installer, based on the KonsolePart (from Konsole 5) +%package plasmalnf +Summary: Calamares plasmalnf module +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: plasma-desktop + +%description plasmalnf +Optional plasmalnf module for the Calamares installer, based on the KDE Plasma +Desktop Workspace and its KDE Frameworks (KConfig, KPackage, Plasma) + + %package webview Summary: Calamares webview module Requires: %{name} = %{version}-%{release} @@ -189,7 +209,7 @@ rm -f src/modules/*/*.conf.default-settings %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} -DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" .. +%{cmake_kf5} -DBUILD_TESTING:BOOL=OFF -DWITH_PYTHONQT:BOOL=OFF -DWEBVIEW_FORCE_WEBKIT:BOOL="%{webview_force_webkit}" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -294,6 +314,7 @@ EOF %{_datadir}/calamares/branding/auto/lang/ %{_datadir}/calamares/modules/ %exclude %{_datadir}/calamares/modules/interactiveterminal.conf +%exclude %{_datadir}/calamares/modules/plasmalnf.conf %exclude %{_datadir}/calamares/modules/webview.conf %{_datadir}/calamares/qml/ %{_datadir}/applications/calamares.desktop @@ -308,12 +329,17 @@ EOF %{_libdir}/libcalamaresui.so.* %{_libdir}/calamares/ %exclude %{_libdir}/calamares/modules/interactiveterminal/ +%exclude %{_libdir}/calamares/modules/plasmalnf/ %exclude %{_libdir}/calamares/modules/webview/ %files interactiveterminal %{_datadir}/calamares/modules/interactiveterminal.conf %{_libdir}/calamares/modules/interactiveterminal/ +%files plasmalnf +%{_datadir}/calamares/modules/plasmalnf.conf +%{_libdir}/calamares/modules/plasmalnf/ + %files webview %{_datadir}/calamares/modules/webview.conf %{_libdir}/calamares/modules/webview/ @@ -326,6 +352,21 @@ EOF %changelog +* Sun May 05 2019 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 3.2.7-1 +- Update to 3.2.7 and update BuildRequires and Requires +- Add plasmalnf subpackage for the new plasmalnf module requiring plasma-desktop +- Switch webview from QtWebEngine to QtWebKit to work around upstream issue 1051 +- Rebase default-settings patch and update some settings: + - enable INSTALL_CONFIG by default (we patch it in place, so install it) + - disable plymouthcfg by default (now only needed to change the default theme) + - bootloader.conf: enable sb-shim (UEFI "Secure Boot" support) + - plasmalnf.conf (note: module disabled by default): fix default liveuser + - plasmalnf.conf (note: module disabled by default): default: show all themes + - tracking.conf (note: module disabled by default): default tracking to none + - users.conf: default to honoring the default shell from /etc/default/useradd + - welcome.conf: use https for internetCheckUrl (catches more captive portals) +- Rebase kdesu patch + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.8-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 0cb03e5..03b2364 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (calamares-3.1.8.tar.gz) = f5fe3e92357d2f7492298b26826da420862438e55f91be6f8d9414d332c2f4b74d382d1c128d78e453609a9a2bc79b423c5e331a295479d169ed76a7028f0375 +SHA512 (calamares-3.2.7.tar.gz) = b7b8b54254f629056b3b074b47275752672046342e19db876a9807108bf0b66481fec1db2225ddea2f7c0cd1bfe83901e5cea5c3e8fe907bef1bf6a8ba890d60

1 0

Architecture specific change in rpms/rust-gstreamer-base-sys.git
by githook-noreply＠fedoraproject.org 05 May '19

05 May '19

The package rpms/rust-gstreamer-base-sys.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-gstreamer-base-sys.git/commit/…. Change: +ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit 0c2f54ef602865e50e54be6eb06936745ca8fc97 Author: Artem Polishchuk <ego.cordatus(a)gmail.com> Date: Sun May 5 18:02:35 2019 +0300 Initial import (#1706584). diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f43dfa6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/gstreamer-base-sys-0.7.0.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..a3548ed --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,29 @@ +[DEFAULT] +buildrequires = + pkgconfig(gstreamer-base-1.0) >= 1.0 +lib.requires = + pkgconfig(gstreamer-base-1.0) >= 1.0 +lib+v1_0_1.requires = + pkgconfig(gstreamer-base-1.0) >= 1.0.1 +lib+v1_2.requires = + pkgconfig(gstreamer-base-1.0) >= 1.2 +lib+v1_4.requires = + pkgconfig(gstreamer-base-1.0) >= 1.4 +lib+v1_6.requires = + pkgconfig(gstreamer-base-1.0) >= 1.6 +lib+v1_8.requires = + pkgconfig(gstreamer-base-1.0) >= 1.8 +lib+v1_10.requires = + pkgconfig(gstreamer-base-1.0) >= 1.10 +lib+v1_12.requires = + pkgconfig(gstreamer-base-1.0) >= 1.12 +lib+v1_12_1.requires = + pkgconfig(gstreamer-base-1.0) >= 1.12.1 +lib+v1_14.requires = + pkgconfig(gstreamer-base-1.0) >= 1.14 +lib+v1_14_1.requires = + pkgconfig(gstreamer-base-1.0) >= 1.14.1 +lib+v1_14_3.requires = + pkgconfig(gstreamer-base-1.0) >= 1.14.3 +lib+v1_16.requires = + pkgconfig(gstreamer-base-1.0) >= 1.16 diff --git a/rust-gstreamer-base-sys.spec b/rust-gstreamer-base-sys.spec new file mode 100644 index 0000000..fa6785a --- /dev/null +++ b/rust-gstreamer-base-sys.spec @@ -0,0 +1,247 @@ +# Generated by rust2rpm +%bcond_without check +%global debug_package %{nil} + +%global crate gstreamer-base-sys + +Name: rust-%{crate} +Version: 0.7.0 +Release: 1%{?dist} +Summary: Rust FFI bindings for GStreamer (Base library) + +License: MIT +URL: https://crates.io/crates/gstreamer-base-sys +Source: %{crates_source} + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging +BuildRequires: (crate(glib-sys/default) >= 0.8.0 with crate(glib-sys/default) < 0.9.0) +BuildRequires: (crate(gobject-sys/default) >= 0.8.0 with crate(gobject-sys/default) < 0.9.0) +BuildRequires: (crate(gstreamer-sys/default) >= 0.7.0 with crate(gstreamer-sys/default) < 0.8.0) +BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0) +BuildRequires: (crate(pkg-config/default) >= 0.3.7 with crate(pkg-config/default) < 0.4.0) +%if %{with check} +BuildRequires: (crate(shell-words/default) >= 0.1.0 with crate(shell-words/default) < 0.2.0) +BuildRequires: (crate(tempdir/default) >= 0.3.0 with crate(tempdir/default) < 0.4.0) +%endif +BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.0 + +%global _description \ +GStreamer (Base library) bindings for Rust.\ +\ +These bindings are providing unsafe FFI API that can be used to interface with\ +GStreamer. Generally they are meant to be used as the building block for\ +higher-level abstractions like:\ +\ + Bindings for GStreamer applications and plugins:\ +https://gitlab.freedesktop.org/gstreamer/gstreamer-rs\ +\ + Various GStreamer plugins written in Rust:\ +https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs\ +\ +The bindings are autogenerated with gir based on the GObject-Introspection API\ +metadata provided by the GStreamer project. + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.0 + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%doc README.md +%license LICENSE +%{cargo_registry}/%{crate}-%{version}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+dox-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dox-devel %{_description} + +This package contains library source intended for building other packages +which use "dox" feature of "%{crate}" crate. + +%files -n %{name}+dox-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_0_1-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.0.1 + +%description -n %{name}+v1_0_1-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_0_1" feature of "%{crate}" crate. + +%files -n %{name}+v1_0_1-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_10-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.10 + +%description -n %{name}+v1_10-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_10" feature of "%{crate}" crate. + +%files -n %{name}+v1_10-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_12-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.12 + +%description -n %{name}+v1_12-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_12" feature of "%{crate}" crate. + +%files -n %{name}+v1_12-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_12_1-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.12.1 + +%description -n %{name}+v1_12_1-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_12_1" feature of "%{crate}" crate. + +%files -n %{name}+v1_12_1-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_14-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.14 + +%description -n %{name}+v1_14-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_14" feature of "%{crate}" crate. + +%files -n %{name}+v1_14-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_14_1-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.14.1 + +%description -n %{name}+v1_14_1-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_14_1" feature of "%{crate}" crate. + +%files -n %{name}+v1_14_1-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_14_3-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.14.3 + +%description -n %{name}+v1_14_3-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_14_3" feature of "%{crate}" crate. + +%files -n %{name}+v1_14_3-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_2-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.2 + +%description -n %{name}+v1_2-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_2" feature of "%{crate}" crate. + +%files -n %{name}+v1_2-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_4-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.4 + +%description -n %{name}+v1_4-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_4" feature of "%{crate}" crate. + +%files -n %{name}+v1_4-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_6-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.6 + +%description -n %{name}+v1_6-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_6" feature of "%{crate}" crate. + +%files -n %{name}+v1_6-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+v1_8-devel +Summary: %{summary} +BuildArch: noarch +Requires: pkgconfig(gstreamer-base-1.0) >= 1.8 + +%description -n %{name}+v1_8-devel %{_description} + +This package contains library source intended for building other packages +which use "v1_8" feature of "%{crate}" crate. + +%files -n %{name}+v1_8-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Sun May 05 17:04:25 EEST 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.7.0-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..8939941 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (gstreamer-base-sys-0.7.0.crate) = 2d624e9d083665f38ab3b59db07ae8f9ec1dcfe6c7a098c9bdcc3b957bb993685f09afa0857de8a32bac6131d5089a5400b7e04b769dc2e5b950a3fbe806d3c2

1 0

Architecture specific change in rpms/netatalk.git
by githook-noreply＠fedoraproject.org 05 May '19

05 May '19

The package rpms/netatalk.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=81611ededd7… https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=ec9b0d14276… https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=aeac6e0b1a2… https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=69ac297e5b2… https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=b32e39fb363… https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=c036a8ff40c… https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=f6bbe96ceec… https://src.fedoraproject.org/cgit/rpms/netatalk.git/commit/?id=e3e403eaa35…. Change: -%ifarch ppc ppc64 s390 s390x +%ifarch ppc ppc64 s390 s390x +%ifarch x86_64 +%ifarch ppc ppc64 s390 s390x +%ifnarch x86_64 -%ifarch x86_64 -%ifnarch x86_64 -%ifarch ppc ppc64 s390 s390x Thanks. Full change: ============ commit 9b286a9cb91421e9ed4aebe201f2eaacdf5aef9d Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Sun Mar 10 19:54:46 2019 -0500 use python2 binary for el7 compat, use python3 binary everywhere else diff --git a/netatalk.conf b/netatalk.conf index 2a4f83b..715cfee 100644 --- a/netatalk.conf +++ b/netatalk.conf @@ -1 +1 @@ -D /var/run/lock/netatalk 755 root root +D /run/lock/netatalk 755 root root diff --git a/netatalk.spec b/netatalk.spec index a31bea7..fa6e2a4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -26,10 +26,17 @@ %global ldconfig /sbin/ldconfig %endif +# set path to python binary per fedora packaging guidelines +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global python_bin /usr/bin/python3 +%else +%global python_bin /usr/bin/python2 +%endif + Name: netatalk Epoch: 5 Version: 3.1.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Source Apple Filing Protocol(AFP) File Server License: GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and BSD and FSFUL and MIT # Project is also mirrored at https://github.com/Netatalk/Netatalk @@ -161,13 +168,8 @@ install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/netatalk install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf find %{buildroot} -name '*.la' -delete -print - # Fix python shebang -%if 0%{?fedora} || 0%{?rhel} >= 8 -sed -i 's\^#!/usr/bin/env python$\#!/usr/bin/python3\' %{buildroot}/usr/bin/afpstats -%else -sed -i 's\^#!/usr/bin/env python$\#!/usr/bin/python\' %{buildroot}/usr/bin/afpstats -%endif +sed -i 's\^#!/usr/bin/env python$\#!%{python_bin}\' %{buildroot}/usr/bin/afpstats %check sh test/afpd/test.sh @@ -211,6 +213,9 @@ sh test/afpd/test.sh %{_mandir}/man*/netatalk-config.1* %changelog +* Sun Mar 10 2019 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 5:3.1.12-4 +- use python2 binary for el7 compat, use python3 binary everywhere else + * Sun Mar 03 2019 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 5:3.1.12-3 - execstartpre instead of runtimedirectory in service file for el7 compat commit a515c3081f31b75a0f9fea61992c97a9f9b127ab Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen(a)kolabsys.com> Date: Sun Mar 10 18:44:39 2019 +0100 Fix typo diff --git a/netatalk.spec b/netatalk.spec index c5c18e3..a31bea7 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -163,7 +163,7 @@ install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf find %{buildroot} -name '*.la' -delete -print # Fix python shebang -%if 0%{%?fedora} || 0%{?rhel} >= 8 +%if 0%{?fedora} || 0%{?rhel} >= 8 sed -i 's\^#!/usr/bin/env python$\#!/usr/bin/python3\' %{buildroot}/usr/bin/afpstats %else sed -i 's\^#!/usr/bin/env python$\#!/usr/bin/python\' %{buildroot}/usr/bin/afpstats commit 9e48c206af16009087a65239ffeb92edbad70a2a Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen(a)kolabsys.com> Date: Sun Mar 10 18:41:05 2019 +0100 EPEL 7 Python 3.6 change compat, and EPEL 8 compat diff --git a/netatalk.spec b/netatalk.spec index e6af55a..c5c18e3 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -161,8 +161,13 @@ install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/netatalk install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf find %{buildroot} -name '*.la' -delete -print + # Fix python shebang +%if 0%{%?fedora} || 0%{?rhel} >= 8 sed -i 's\^#!/usr/bin/env python$\#!/usr/bin/python3\' %{buildroot}/usr/bin/afpstats +%else +sed -i 's\^#!/usr/bin/env python$\#!/usr/bin/python\' %{buildroot}/usr/bin/afpstats +%endif %check sh test/afpd/test.sh commit 54fc3e1240b71fe4c8c0f65505c63e5389f1058a Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Sun Mar 3 16:08:15 2019 -0600 execstartpre instead of runtimedirectory in service file for el7 compat diff --git a/netatalk-systemd-execstartpre.patch b/netatalk-systemd-execstartpre.patch new file mode 100644 index 0000000..e88acea --- /dev/null +++ b/netatalk-systemd-execstartpre.patch @@ -0,0 +1,21 @@ +From e3cfccda2f8f12b7e173d007f43698038c4a2cfa Mon Sep 17 00:00:00 2001 +From: Andrew Bauer <knnniggett(a)hotmail.com> +Date: Sun, 3 Mar 2019 15:05:12 -0600 +Subject: [PATCH] use execstartpre to create netatalk tmpfile config + +--- + distrib/initscripts/service.systemd.tmpl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/distrib/initscripts/service.systemd.tmpl b/distrib/initscripts/service.systemd.tmpl +index 670f1445..76f38b22 100644 +--- a/distrib/initscripts/service.systemd.tmpl ++++ b/distrib/initscripts/service.systemd.tmpl +@@ -9,6 +9,7 @@ After=syslog.target network.target avahi-daemon.service + [Service] + Type=forking + GuessMainPID=no ++ExecStartPre=-/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/netatalk.conf + ExecStart=:SBINDIR:/netatalk + PIDFile=:PATH_NETATALK_LOCK: + ExecReload=/bin/kill -HUP $MAINPID diff --git a/netatalk-systemd-runtimedirectory.patch b/netatalk-systemd-runtimedirectory.patch deleted file mode 100644 index 57fb3d6..0000000 --- a/netatalk-systemd-runtimedirectory.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 49c003d821dbe179a58dbd8abe5716de01b76d21 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer <zonexpertconsulting(a)outlook.com> -Date: Thu, 6 Dec 2018 08:48:14 -0600 -Subject: [PATCH] add runtimedirectoy to systemd unit file - ---- - distrib/initscripts/service.systemd.tmpl | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/distrib/initscripts/service.systemd.tmpl b/distrib/initscripts/service.systemd.tmpl -index 670f1445..244bcfe6 100644 ---- a/distrib/initscripts/service.systemd.tmpl -+++ b/distrib/initscripts/service.systemd.tmpl -@@ -14,6 +14,7 @@ PIDFile=:PATH_NETATALK_LOCK: - ExecReload=/bin/kill -HUP $MAINPID - Restart=always - RestartSec=1 -+RuntimeDirectory=lock/netatalk - - [Install] - WantedBy=multi-user.target diff --git a/netatalk.conf b/netatalk.conf new file mode 100644 index 0000000..2a4f83b --- /dev/null +++ b/netatalk.conf @@ -0,0 +1 @@ +D /var/run/lock/netatalk 755 root root diff --git a/netatalk.spec b/netatalk.spec index 7b8f033..e6af55a 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -29,17 +29,18 @@ Name: netatalk Epoch: 5 Version: 3.1.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Source Apple Filing Protocol(AFP) File Server License: GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and BSD and FSFUL and MIT # Project is also mirrored at https://github.com/Netatalk/Netatalk URL: http://netatalk.sourceforge.net Source0: https://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: netatalk.pam-system-auth +Source2: netatalk.conf # From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm Patch0: netatalk-3.0.1-basedir.patch -Patch1: netatalk-systemd-runtimedirectory.patch +Patch1: netatalk-systemd-execstartpre.patch # https://github.com/Netatalk/Netatalk/pull/110 Patch2: netatalk-fix-incorrect-fsf-address.patch # https://github.com/Netatalk/Netatalk/pull/113 @@ -156,6 +157,9 @@ sed -i 's\-systemctl daemon-reload\\g' distrib/initscripts/Makefile.in # Use specific pam conf. install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/netatalk +# install our tmpfiles config +install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf + find %{buildroot} -name '*.la' -delete -print # Fix python shebang sed -i 's\^#!/usr/bin/env python$\#!/usr/bin/python3\' %{buildroot}/usr/bin/afpstats @@ -191,6 +195,7 @@ sh test/afpd/test.sh %exclude %{_mandir}/man*/netatalk-config* %{_sbindir}/* %{_unitdir}/netatalk.service +%{_tmpfilesdir}/netatalk.conf %{_localstatedir}/lib/netatalk %files devel @@ -201,6 +206,9 @@ sh test/afpd/test.sh %{_mandir}/man*/netatalk-config.1* %changelog +* Sun Mar 03 2019 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 5:3.1.12-3 +- execstartpre instead of runtimedirectory in service file for el7 compat + * Sun Feb 03 2019 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 5:3.1.12-2 - fix license - buildrequire perl-generators, require perl version commit 1139360999d9f4b0a5de8a9ffd9554ed390ee3a4 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Sat Feb 23 07:37:04 2019 -0600 Initial import (#1658199) diff --git a/.gitignore b/.gitignore index 8302d47..a5c35e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /netatalk-3.1.7.tar.bz2 +/netatalk-3.1.12.tar.bz2 diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch new file mode 100644 index 0000000..f289baa --- /dev/null +++ b/netatalk-3.0.1-basedir.patch @@ -0,0 +1,11 @@ +--- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 ++++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 +@@ -6,7 +6,7 @@ + ; Global server settings + + ; [Homes] +-; basedir regex = /xxxx ++; basedir regex = /home + + ; [My AFP Volume] + ; path = /path/to/volume diff --git a/netatalk-afpstats-python3-compat.patch b/netatalk-afpstats-python3-compat.patch new file mode 100644 index 0000000..f4ebc72 --- /dev/null +++ b/netatalk-afpstats-python3-compat.patch @@ -0,0 +1,22 @@ +From d2262267537fbe301e218901656b582f021bf67f Mon Sep 17 00:00:00 2001 +From: Andrew Bauer <knnniggett(a)hotmail.com> +Date: Wed, 12 Dec 2018 10:19:29 -0600 +Subject: [PATCH] make afpstats python 3 compatible + +--- + contrib/shell_utils/afpstats | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/shell_utils/afpstats b/contrib/shell_utils/afpstats +index 8c5413c8..08092208 100755 +--- a/contrib/shell_utils/afpstats ++++ b/contrib/shell_utils/afpstats +@@ -23,7 +23,7 @@ def main(): + + reply = iface.GetUsers() + for name in reply: +- print name ++ print(name) + + if __name__ == '__main__': + main() diff --git a/netatalk-fix-incorrect-fsf-address.patch b/netatalk-fix-incorrect-fsf-address.patch new file mode 100644 index 0000000..2dd0916 --- /dev/null +++ b/netatalk-fix-incorrect-fsf-address.patch @@ -0,0 +1,627 @@ +From 3298a8bd5a67d410ba60a3044dd0aab05d523c40 Mon Sep 17 00:00:00 2001 +From: Andrew Bauer <zonexpertconsulting(a)outlook.com> +Date: Wed, 28 Nov 2018 08:52:00 -0600 +Subject: [PATCH 1/2] update gpl mailing address + +--- + COPYING | 4 ++-- + etc/afpd/afprun.c | 2 +- + include/atalk/byteorder.h | 2 +- + include/atalk/ftw.h | 4 ++-- + include/atalk/queue.h | 2 +- + include/atalk/vfs.h | 2 +- + libatalk/adouble/ad_recvfile.c | 2 +- + libatalk/adouble/ad_sendfile.c | 2 +- + libatalk/compat/strlcpy.c | 2 +- + libatalk/unicode/charcnv.c | 2 +- + libatalk/unicode/charsets/generic_cjk.c | 2 +- + libatalk/unicode/charsets/generic_cjk.h | 2 +- + libatalk/unicode/charsets/generic_mb.c | 2 +- + libatalk/unicode/charsets/mac_centraleurope.c | 2 +- + libatalk/unicode/charsets/mac_chinese_simp.c | 2 +- + libatalk/unicode/charsets/mac_chinese_simp.h | 2 +- + libatalk/unicode/charsets/mac_chinese_trad.c | 2 +- + libatalk/unicode/charsets/mac_chinese_trad.h | 2 +- + libatalk/unicode/charsets/mac_cyrillic.c | 2 +- + libatalk/unicode/charsets/mac_greek.c | 2 +- + libatalk/unicode/charsets/mac_hebrew.c | 2 +- + libatalk/unicode/charsets/mac_japanese.c | 2 +- + libatalk/unicode/charsets/mac_japanese.h | 2 +- + libatalk/unicode/charsets/mac_korean.c | 2 +- + libatalk/unicode/charsets/mac_korean.h | 2 +- + libatalk/unicode/charsets/mac_roman.c | 2 +- + libatalk/unicode/charsets/mac_roman.h | 2 +- + libatalk/unicode/charsets/mac_turkish.c | 2 +- + libatalk/unicode/iconv.c | 2 +- + libatalk/unicode/utf8.c | 2 +- + libatalk/util/fault.c | 2 +- + libatalk/util/ftw.c | 4 ++-- + libatalk/vfs/extattr.c | 2 +- + libatalk/vfs/vfs.c | 2 +- + 34 files changed, 35 insertions(+), 35 deletions(-) + +diff --git a/COPYING b/COPYING +index d60c31a9..f7962229 100644 +--- a/COPYING ++++ b/COPYING +@@ -2,7 +2,7 @@ + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + Also add information on how to contact you by electronic and paper mail. +diff --git a/etc/afpd/afprun.c b/etc/afpd/afprun.c +index ed412476..daba5d7f 100644 +--- a/etc/afpd/afprun.c ++++ b/etc/afpd/afprun.c +@@ -15,7 +15,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + modified for netatalk dgautheron(a)magic.fr + */ +diff --git a/include/atalk/byteorder.h b/include/atalk/byteorder.h +index 0ea3972f..1ad33607 100644 +--- a/include/atalk/byteorder.h ++++ b/include/atalk/byteorder.h +@@ -15,7 +15,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifndef _BYTEORDER_H +diff --git a/include/atalk/ftw.h b/include/atalk/ftw.h +index 157efc50..9d0ae339 100644 +--- a/include/atalk/ftw.h ++++ b/include/atalk/ftw.h +@@ -13,8 +13,8 @@ + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ ++ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301 USA. */ + + /* + * X/Open Portability Guide 4.2: ftw.h +diff --git a/include/atalk/queue.h b/include/atalk/queue.h +index a3f433eb..92d8b91e 100644 +--- a/include/atalk/queue.h ++++ b/include/atalk/queue.h +@@ -13,7 +13,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifndef ATALK_QUEUE_H +diff --git a/include/atalk/vfs.h b/include/atalk/vfs.h +index 580c22b2..4f16de72 100644 +--- a/include/atalk/vfs.h ++++ b/include/atalk/vfs.h +@@ -13,7 +13,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + vfs layer for afp + */ +diff --git a/libatalk/adouble/ad_recvfile.c b/libatalk/adouble/ad_recvfile.c +index 1703ee83..224ffcd9 100644 +--- a/libatalk/adouble/ad_recvfile.c ++++ b/libatalk/adouble/ad_recvfile.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/adouble/ad_sendfile.c b/libatalk/adouble/ad_sendfile.c +index 2730644b..cf61e15a 100644 +--- a/libatalk/adouble/ad_sendfile.c ++++ b/libatalk/adouble/ad_sendfile.c +@@ -22,7 +22,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/compat/strlcpy.c b/libatalk/compat/strlcpy.c +index 314b039c..487865a3 100644 +--- a/libatalk/compat/strlcpy.c ++++ b/libatalk/compat/strlcpy.c +@@ -17,7 +17,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + strlcpy strlcat functions. + */ +diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c +index 7242b576..9bfbe727 100644 +--- a/libatalk/unicode/charcnv.c ++++ b/libatalk/unicode/charcnv.c +@@ -18,7 +18,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + */ + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/unicode/charsets/generic_cjk.c b/libatalk/unicode/charsets/generic_cjk.c +index 461af345..2d43f038 100644 +--- a/libatalk/unicode/charsets/generic_cjk.c ++++ b/libatalk/unicode/charsets/generic_cjk.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/unicode/charsets/generic_cjk.h b/libatalk/unicode/charsets/generic_cjk.h +index 3c4a48c7..09eb3573 100644 +--- a/libatalk/unicode/charsets/generic_cjk.h ++++ b/libatalk/unicode/charsets/generic_cjk.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #include <atalk/unicode.h> +diff --git a/libatalk/unicode/charsets/generic_mb.c b/libatalk/unicode/charsets/generic_mb.c +index 0347c3e7..1efafba6 100644 +--- a/libatalk/unicode/charsets/generic_mb.c ++++ b/libatalk/unicode/charsets/generic_mb.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_centraleurope.c b/libatalk/unicode/charsets/mac_centraleurope.c +index 40784be3..37150992 100644 +--- a/libatalk/unicode/charsets/mac_centraleurope.c ++++ b/libatalk/unicode/charsets/mac_centraleurope.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_chinese_simp.c b/libatalk/unicode/charsets/mac_chinese_simp.c +index 2ff6c2a0..97ad8484 100644 +--- a/libatalk/unicode/charsets/mac_chinese_simp.c ++++ b/libatalk/unicode/charsets/mac_chinese_simp.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_chinese_simp.h b/libatalk/unicode/charsets/mac_chinese_simp.h +index 25216256..900eb858 100644 +--- a/libatalk/unicode/charsets/mac_chinese_simp.h ++++ b/libatalk/unicode/charsets/mac_chinese_simp.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_chinese_trad.c b/libatalk/unicode/charsets/mac_chinese_trad.c +index 116e8cd5..25710535 100644 +--- a/libatalk/unicode/charsets/mac_chinese_trad.c ++++ b/libatalk/unicode/charsets/mac_chinese_trad.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_chinese_trad.h b/libatalk/unicode/charsets/mac_chinese_trad.h +index 00e0c518..851c7370 100644 +--- a/libatalk/unicode/charsets/mac_chinese_trad.h ++++ b/libatalk/unicode/charsets/mac_chinese_trad.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_cyrillic.c b/libatalk/unicode/charsets/mac_cyrillic.c +index fde64861..57faf472 100644 +--- a/libatalk/unicode/charsets/mac_cyrillic.c ++++ b/libatalk/unicode/charsets/mac_cyrillic.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_greek.c b/libatalk/unicode/charsets/mac_greek.c +index e48237b6..987b2c7a 100644 +--- a/libatalk/unicode/charsets/mac_greek.c ++++ b/libatalk/unicode/charsets/mac_greek.c +@@ -17,7 +17,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_hebrew.c b/libatalk/unicode/charsets/mac_hebrew.c +index 34d96902..ffdf8495 100644 +--- a/libatalk/unicode/charsets/mac_hebrew.c ++++ b/libatalk/unicode/charsets/mac_hebrew.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_japanese.c b/libatalk/unicode/charsets/mac_japanese.c +index 9f32f662..29a24874 100644 +--- a/libatalk/unicode/charsets/mac_japanese.c ++++ b/libatalk/unicode/charsets/mac_japanese.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_japanese.h b/libatalk/unicode/charsets/mac_japanese.h +index e27e450d..03510bb1 100644 +--- a/libatalk/unicode/charsets/mac_japanese.h ++++ b/libatalk/unicode/charsets/mac_japanese.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_korean.c b/libatalk/unicode/charsets/mac_korean.c +index 26f387d7..08356109 100644 +--- a/libatalk/unicode/charsets/mac_korean.c ++++ b/libatalk/unicode/charsets/mac_korean.c +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_korean.h b/libatalk/unicode/charsets/mac_korean.h +index 2febaa28..acb2d7b1 100644 +--- a/libatalk/unicode/charsets/mac_korean.h ++++ b/libatalk/unicode/charsets/mac_korean.h +@@ -14,7 +14,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Reference + * http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ +diff --git a/libatalk/unicode/charsets/mac_roman.c b/libatalk/unicode/charsets/mac_roman.c +index 34ccaaf9..b615540a 100644 +--- a/libatalk/unicode/charsets/mac_roman.c ++++ b/libatalk/unicode/charsets/mac_roman.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/charsets/mac_roman.h b/libatalk/unicode/charsets/mac_roman.h +index 5d2c72e6..096583c6 100644 +--- a/libatalk/unicode/charsets/mac_roman.h ++++ b/libatalk/unicode/charsets/mac_roman.h +@@ -13,7 +13,7 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * from GNU libiconv + * modified by Bjorn (Apple Logo 0xf0 to Apple unicode 0xf8ff ) +diff --git a/libatalk/unicode/charsets/mac_turkish.c b/libatalk/unicode/charsets/mac_turkish.c +index 619f4b01..c27a316f 100644 +--- a/libatalk/unicode/charsets/mac_turkish.c ++++ b/libatalk/unicode/charsets/mac_turkish.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/iconv.c b/libatalk/unicode/iconv.c +index c44df315..c7fb7b78 100644 +--- a/libatalk/unicode/iconv.c ++++ b/libatalk/unicode/iconv.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/unicode/utf8.c b/libatalk/unicode/utf8.c +index 04dbb9a2..54515d26 100644 +--- a/libatalk/unicode/utf8.c ++++ b/libatalk/unicode/utf8.c +@@ -16,7 +16,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + From samba 3.0 beta and GNU libiconv-1.8 + It's bad but most of the time we can't use libc iconv service: +diff --git a/libatalk/util/fault.c b/libatalk/util/fault.c +index 48c4fe05..7ce3c131 100644 +--- a/libatalk/util/fault.c ++++ b/libatalk/util/fault.c +@@ -15,7 +15,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + #ifdef HAVE_CONFIG_H +diff --git a/libatalk/util/ftw.c b/libatalk/util/ftw.c +index f0ac17f1..35bccac9 100644 +--- a/libatalk/util/ftw.c ++++ b/libatalk/util/ftw.c +@@ -15,8 +15,8 @@ + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ ++ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301 USA. */ + + #ifdef HAVE_CONFIG_H + #include "config.h" +diff --git a/libatalk/vfs/extattr.c b/libatalk/vfs/extattr.c +index 32cdc65d..39f4437b 100644 +--- a/libatalk/vfs/extattr.c ++++ b/libatalk/vfs/extattr.c +@@ -18,7 +18,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + sys_copyxattr modified from LGPL2.1 libattr copyright + Copyright (C) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. +diff --git a/libatalk/vfs/vfs.c b/libatalk/vfs/vfs.c +index 0d1961cf..236228cf 100644 +--- a/libatalk/vfs/vfs.c ++++ b/libatalk/vfs/vfs.c +@@ -14,7 +14,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + */ + #ifdef HAVE_CONFIG_H + +From 9ac8d1d49f6a214b609905eeecd67c698090e18a Mon Sep 17 00:00:00 2001 +From: Andrew Bauer <knnniggett(a)users.sourceforge.net> +Date: Wed, 28 Nov 2018 19:58:07 -0600 +Subject: [PATCH 2/2] update COPYING + +--- + COPYING | 41 ++++++++++++++++++++--------------------- + 1 file changed, 20 insertions(+), 21 deletions(-) + +diff --git a/COPYING b/COPYING +index f7962229..d159169d 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,12 +1,12 @@ +- GNU GENERAL PUBLIC LICENSE +- Version 2, June 1991 ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + +- Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +- Preamble ++ Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by +-the GNU Library General Public License instead.) You can apply it to ++the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not +@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. +- +- GNU GENERAL PUBLIC LICENSE ++ ++ GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) +- ++ + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in +@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. +- ++ + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is +@@ -225,7 +225,7 @@ impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. +- ++ + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License +@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + +- END OF TERMS AND CONDITIONS +- +- How to Apply These Terms to Your New Programs ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it +@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +- ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + +- Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. +@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the +-library. If this is what you want to do, use the GNU Library General ++library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. diff --git a/netatalk-systemd-runtimedirectory.patch b/netatalk-systemd-runtimedirectory.patch new file mode 100644 index 0000000..57fb3d6 --- /dev/null +++ b/netatalk-systemd-runtimedirectory.patch @@ -0,0 +1,21 @@ +From 49c003d821dbe179a58dbd8abe5716de01b76d21 Mon Sep 17 00:00:00 2001 +From: Andrew Bauer <zonexpertconsulting(a)outlook.com> +Date: Thu, 6 Dec 2018 08:48:14 -0600 +Subject: [PATCH] add runtimedirectoy to systemd unit file + +--- + distrib/initscripts/service.systemd.tmpl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/distrib/initscripts/service.systemd.tmpl b/distrib/initscripts/service.systemd.tmpl +index 670f1445..244bcfe6 100644 +--- a/distrib/initscripts/service.systemd.tmpl ++++ b/distrib/initscripts/service.systemd.tmpl +@@ -14,6 +14,7 @@ PIDFile=:PATH_NETATALK_LOCK: + ExecReload=/bin/kill -HUP $MAINPID + Restart=always + RestartSec=1 ++RuntimeDirectory=lock/netatalk + + [Install] + WantedBy=multi-user.target diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth new file mode 100644 index 0000000..2cced33 --- /dev/null +++ b/netatalk.pam-system-auth @@ -0,0 +1,16 @@ +#%PAM-1.0 +auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +# pam_selinux.so close should be the first session rule +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +# pam_selinux.so open should only be followed by sessions to be executed in the user context +session required pam_selinux.so open +session required pam_namespace.so +session optional pam_keyinit.so force revoke +session include system-auth +-session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec new file mode 100644 index 0000000..7b8f033 --- /dev/null +++ b/netatalk.spec @@ -0,0 +1,756 @@ +%global _hardened_build 1 + +%global pkgver $(rpm -qls tracker-devel.%{_target_cpu} | grep sparql | grep pc | cut -d"-" -f3 | cut -d"." -f1-2|sort -u) +%global with_tracker 1 +%global xslver $(rpm -q --queryformat "%%{VERSION}" docbook-style-xsl) +%global with_acls 1 +%global with_bdb 1 +%global with_cracklib 1 +%global with_docbook 1 +%global with_dbus 1 +%global with_dtrace 1 +%global with_ldap 1 +%global with_libevent 1 +%global with_mysql 1 +%global with_procpsng 1 +%global with_quota 1 +%global without_openafs 1 + +# tcp_wrappers deprecated fedora >= 28 +%if 0%{?fedora} >= 28 +%global without_tcp_wrappers 1 +%endif + +# rhel need to call ldconfig +%if 0%{?rhel} +%global ldconfig /sbin/ldconfig +%endif + +Name: netatalk +Epoch: 5 +Version: 3.1.12 +Release: 2%{?dist} +Summary: Open Source Apple Filing Protocol(AFP) File Server +License: GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and BSD and FSFUL and MIT +# Project is also mirrored at https://github.com/Netatalk/Netatalk +URL: http://netatalk.sourceforge.net +Source0: https://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 +Source1: netatalk.pam-system-auth + +# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm +Patch0: netatalk-3.0.1-basedir.patch +Patch1: netatalk-systemd-runtimedirectory.patch +# https://github.com/Netatalk/Netatalk/pull/110 +Patch2: netatalk-fix-incorrect-fsf-address.patch +# https://github.com/Netatalk/Netatalk/pull/113 +Patch3: netatalk-afpstats-python3-compat.patch + +BuildRequires: rpm +BuildRequires: grep +BuildRequires: perl-interpreter +BuildRequires: perl-generators +BuildRequires: sed +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: gcc +BuildRequires: avahi-devel +BuildRequires: bison +BuildRequires: flex +BuildRequires: libattr-devel +BuildRequires: libgcrypt-devel +BuildRequires: krb5-devel +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: systemd +BuildRequires: libtdb-devel + +%{?with_cracklib:BuildRequires: cracklib-devel} +%{?with_dbus:BuildRequires: dbus-devel} +%{?with_dbus:BuildRequires: dbus-glib-devel} +%{?with_docbook:BuildRequires: docbook-style-xsl} +%{?with_acls:BuildRequires: libacl-devel} +%{?with_bdb:BuildRequires: libdb-devel} +%{!?with_bdb:BuildRequires: db4-devel} +%{?with_libevent:BuildRequires: libevent-devel} +%{?with_docbook:BuildRequires: libxslt} +%{?with_mysql:BuildRequires: mysql-devel} +%{?with_ldap:BuildRequires: openldap-devel} +%{?with_procpsng:BuildRequires: procps-ng} +%{!?with_procng:BuildRequires: procps} +%{?with_quota:BuildRequires: quota-devel} +%{?with_dtrace:BuildRequires: systemtap-sdt-devel} +%{?with_tracker:BuildRequires: tracker-devel} +%{!?without_openafs:BuildRequires: openafs-devel} +%{!?without_tcp_wrappers:BuildRequires: tcp_wrappers-devel} + +Requires: dbus-python +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%{?with_tracker:Requires: dconf} +%{?ldconfig:Requires(post): %{ldconfig}} +%{?ldconfig:Requires(postun): %{ldconfig}} +%{?systemd_requires} + +%description +Netatalk is a freely-available Open Source AFP file server. A *NIX/*BSD +system running Netatalk is capable of serving many Macintosh clients +simultaneously as an AppleShare file server (AFP). + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description devel +This package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -p 1 +%{?with_libevent:rm -frv libevent/} + +# Avoid re-running the autotools +touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 + +# fix permissions +find include $ -name '*.h' -a -executable $ -exec chmod -x {} \; + +# Don't call systemctl daemon-reload during the build +sed -i 's\-systemctl daemon-reload\\g' distrib/initscripts/Makefile.in + +%build + +%configure \ + --localstatedir=%{_localstatedir}/lib \ + --with-kerberos \ + --with-libgcrypt \ + --with-pam \ + --with-pkgconfdir=%{_sysconfdir}/netatalk/ \ + --with-shadow \ + --with-tbd=no \ + --with-uams-path=%{_libdir}/netatalk \ + --enable-pgp-uam \ + --enable-shared \ + --enable-krbV-uam \ + --enable-overwrite \ + --with-init-style=redhat-systemd \ + --without-tdb \ + --with-bdb \ + --with-lockfile=%{_rundir}/lock/netatalk/netatalk \ + --disable-silent-rules \ + --disable-static \ + %{?with_acls:--with-acl} \ + %{?with_cracklib:--with-cracklib} \ + %{?with_docbook:--with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets-%{xslver}} \ + %{?with_tracker:--with-spotlight} \ + %{?with_tracker:--with-tracker-pkgconfig-version=%{pkgver}} \ + %{?with_tracker:--with-dbus-daemon=%{_bindir}/dbus-daemon} \ + %{?with_libevent:--without-libevent} \ + %{?with_libevent:--with-libevent-header=%{_includedir}} \ + %{?with_libevent:--with-libevent-lib=%{_libdir}} + +%make_build +# Build the local docs. +%make_build -C doc/manual html-local + +%install +%make_install +# Use specific pam conf. +install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/netatalk + +find %{buildroot} -name '*.la' -delete -print +# Fix python shebang +sed -i 's\^#!/usr/bin/env python$\#!/usr/bin/python3\' %{buildroot}/usr/bin/afpstats + +%check +sh test/afpd/test.sh + +%post +%systemd_post %{name}.service +%{?ldconfig} + +%preun +%systemd_preun %{name}.service + +%postun +%systemd_postun_with_restart %{name}.service +%{?ldconfig} + +%files +%license COPYING COPYRIGHT +%doc AUTHORS CONTRIBUTORS NEWS doc/manual/*.html +%dir %{_sysconfdir}/netatalk +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf +%config(noreplace) %{_sysconfdir}/netatalk/afp.conf +%config(noreplace) %{_sysconfdir}/netatalk/dbus-session.conf +%config(noreplace) %{_sysconfdir}/netatalk/extmap.conf +%config(noreplace) %{_sysconfdir}/pam.d/netatalk +%{_bindir}/* +%exclude %{_bindir}/netatalk-config +%{_libdir}/netatalk/ +%{_libdir}/libatalk.so.* +%{_mandir}/man*/* +%exclude %{_mandir}/man*/netatalk-config* +%{_sbindir}/* +%{_unitdir}/netatalk.service +%{_localstatedir}/lib/netatalk + +%files devel +%{_bindir}/netatalk-config +%{_datadir}/aclocal/netatalk.m4 +%{_includedir}/atalk/ +%{_libdir}/libatalk.so +%{_mandir}/man*/netatalk-config.1* + +%changelog +* Sun Feb 03 2019 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 5:3.1.12-2 +- fix license +- buildrequire perl-generators, require perl version +- fix epoch + +* Wed Jan 09 2019 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 5:3.1.12-1 +- Netatalk 3.1.12 release + +* Wed Dec 12 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 5:3.1.11-2 +- Refactor specfile +- remove sysv init support +- let systemd manage lockfile folder +- call ldconfig only for el7 +- patch afpstats for python3 + +* Wed Oct 31 2018 HAT <hat(a)fa2.so-net.ne.jp> - 5:3.1.11-1.4 +- always buildrequres gcc + +* Tue Apr 03 2018 HAT <hat(a)fa2.so-net.ne.jp> - 5:3.1.11-1.3 +- always buildrequres perl-interpreter + +* Thu Mar 22 2018 HAT <hat(a)fa2.so-net.ne.jp> - 5:3.1.11-1.2 +- If Fedora >=28, don't use tcp_wrappers +- If Fedora >=28, buildrequres perl-interpreter + +* Tue Mar 20 2018 HAT <hat(a)fa2.so-net.ne.jp> - 5:3.1.11-1.1 +- pam_ck_connector.so isn't always installed (RHBZ#1246465) +- require dconf package (RHBZ#1248157) +- require perl-IO-Socket-INET6 for asip-status.pl script +- define with_ldap (RHBZ#1249403) +- The UAM path should be netatalk, not atalk (RHBZ#1249404) +- fix multilib conflict of tracker-devel (SF BUG#637) +- If el6, use "make %%{?_smp_mflags}", not "%%make_build" macro +- If el6, disable tracker +- If el6, use db4-devel, not libdb-devel +- If el6, use bundled libevent2, not libevent1 package +- If el6, use procps, not procps-ng + +* Fri Dec 01 2017 Ryan Breaker <ryan(a)breaker.rocks> - 3.1.11-1 +- Revival of package from abandonment. +- Update to 3.1.11 +- Remove patch previously applied to 3.1.7, is now applied to upstream of project + +* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 5:3.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 5:3.1.7-1 +- Increment epoch. Missed to reset %%release in previous change. + +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.7-7 +- Upstream update to 3.1.7 (RHBZ#1134783). +- Remove doc from *-devel. +- Add %%license. +- Update %%description from + http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. + +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.3-4 +- Address F23FTBFS, RHBZ#1239711: + - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). + - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, + netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, + netatalk-2.2.3-sigterm.patch (Unused) + - Add netatalk-3.0.1-basedir.patch. + - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. + - Fix permissions on include-files. + - Remove duplicate %%global with_mysql. + - Enable dbus. + - Add missing "fi" in %%preun. + - Run /sbin/ldconfig in %%postun, %%preun. + - Reflect /var/lock/netatalk is hard-coded into the sources. + - Set --localstatedir=/var/lib (/var/netatalk violates FHS). + +* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 04 2014 Christopher Meng <rpm(a)cicku.me> - 4:3.1.3-1 +- Update to 3.1.3 + +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 24 2014 Tom Mrz <tmraz(a)redhat.com> - 4:2.2.3-10 +- Rebuild for new libgcrypt + +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar <ppisar(a)redhat.com> - 4:2.2.3-8 +- Perl 5.18 rebuild + +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Aug 23 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-6 +- Scriptlets replaced with new systemd macros + +* Fri Jul 27 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-5 +- fixed build issue on f18 + +* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 16 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-3 +- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX + client, crashes Finder netatalk-2.2.2-1 + +* Tue Jun 12 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-2 +- fixes: #831001 - netatalk pam configuration has invalid entry + +* Mon Jun 04 2012 Lukas Nykryn <lnykryn(a)redhat.com> 4:2.2.3-1 +- fixes #828205 - update to latest upstream netatalk-2.2.3 + +* Mon Jan 16 2012 Jiri Skala <jskala(a)redhat.com> - 4:2.2.2-1 +- fixes #782049 - update to latest upstream netatalk-2.2.2 + +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-2 +- fixes #501144 - updated and redirected pam config + +* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-1 +- update to latest upstream netatalk-2.2.1 + +* Fri Aug 19 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-4 +- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel + +* Fri Aug 05 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-3 +- fixed missing epoch in sysvinit subpackage and triggers + +* Thu Aug 04 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-2 +- fixes #714448 - systemd-service +- moves SysV initscript to subpackage + +* Fri Jul 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-1 +- update to latest upstream netatalk-2.2.0 + +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 03 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.1.5-1 +- updated to latest upstream version netatalk-2.1.5 + +* Mon Oct 18 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.4-1 +- updated to latest upstream version + +* Mon Jul 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.3-1 +- updated to latest upstream version +- added license texts to devel subpackage + +* Wed Jun 30 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.2-1 +- updated to latest upstream version + +* Fri May 28 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.1-1 +- updated to latest upstream version +- fixes #594999 - Summary and Description are old-fashioned +- renamed initscript +- initscript modified to be POSIX compliant + +* Wed May 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1-1 +- updated to latest upstream version + +* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-2 +- oops forgot upload new sources => shifted release number + +* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-1 +- updated to latest upstream version + +* Mon Nov 23 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-5 +- added BuildRequires: ... libgcrypt-devel +- removed outdated atalk.init + +* Tue Sep 15 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-4 +- fixed #473943 + +* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.4-3 +- rebuilt with new openssl + +* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 14 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-1 +- updated to latest upstream version + +* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 16 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-26 +- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability + +* Tue Jan 27 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-25 +- fixed epoch in the subpackage requires + +* Fri Jan 23 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-24 +- fix #473186 conflict timeout with coreutils + +* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.3-23 +- rebuild with new openssl + +* Wed Dec 03 2008 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-22 +- fix #473939 netatalk-2.0.3-21.fc10 disable quota + +* Mon Oct 13 2008 Jiri Skala <jskala(a)redhat.com> - 4:2.0.3-21 +- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches + +* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 4:2.0.3-20 +- fix license tag + +* Thu Mar 06 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-19 +- fix chmod o+x (#225085) +- increase the maximum number of cnid_dbd processes to 512 (#232805) +- papd now writes debugging output to stderr when invoked with -d (#150021) +- fix multiarch conflict for netatalk-devel (#342681) + +* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-18 +- make init script LSB compliant (#246993) + +* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-17 +- fix unowned directories (#233889) + +* Mon Feb 11 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-16 +- rebuild for gcc-4.3 + +* Tue Dec 04 2007 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-15.1 +- rebuild + +* Wed Sep 12 2007 Maros Barabas <mbarabas(a)redhat.com> -4:2.0.3-15 +- patch to build on FC, bad open call + +* Tue Sep 11 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-13 +- rebuild + +* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 +- Rebuild for selinux ppc32 issue. + +* Thu May 10 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.4-11 +- fix from merge review +- Resolves #226190 + +* Tue Apr 17 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-10 +- fix fiew problems in spec + +* Tue Jan 23 2007 Jindrich Novy <jnovy(a)redhat.com> - 4:2.0.3-9 +- rebuild against new db4 + +* Mon Dec 04 2006 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-8 +- BuildRequires changed from cracklib to cracklib-devel + +* Fri Aug 18 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-7 +- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* + (#203001) +- Add dist tag + +* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-6.fc6.1 +- rebuild + +* Fri Jun 09 2006 Jason Vas Dias <jvdias(a)redhat.com> - 4:2.0.3-6.fc6 +- rebuild for broken libgssapi deps and brew build + +* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-4.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jason Vas Dias <jvdias(a)redhat.com> +- rebuild for new gcc, glibc, glibc-kernheaders + +* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> +- rebuilt + +* Wed Nov 09 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Rebuild for new openssl dependencies + +* Thu Oct 13 2005 Tomas Mraz <tmraz(a)redhat.com> +- use include instead of pam_stack in pam config + +* Wed Jul 20 2005 Bill Nottingham <notting(a)redhat.com> +- don't run by default + +* Thu Jun 16 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Upgrade to upstream version 2.0.3 +- fix bug 160486: use netatalk's initscript + +* Wed Mar 30 2005 Florian La Roche <laroche(a)redhat.com> +- quick fix: rm -f /usr/include/netatalk/at.h until this + is resolved the correct way + +* Mon Mar 07 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Fix for gcc4 compilation: extern_ucreator.patch + +* Mon Feb 21 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Upgraded to upstream version 2.0.2 . + +* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com> +- rebuilt + +* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com> +- rebuilt + +* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com> +- rebuilt + +* Wed Jan 07 2004 Florian La Roche <Florian.LaRoche(a)redhat.de> +- 1.6.4 + +* Fri Aug 1 2003 Charlie Bennett <ccb(a)redhat.com> +- Update with 1.6.3 upstream sources + +* Tue Jul 29 2003 Elliot Lee <sopwith(a)redhat.com> +- Rebuild +- Fix perl multilib path editing +- Add pathcat patch + +* Thu May 1 2003 Elliot Lee <sopwith(a)redhat.com> 1.5.5-7 +- Make multilib generic +- Add builddep on quota (for rpcsvc/rquota.h) + +* Tue Feb 18 2003 Bill Nottingham <notting(a)redhat.com> 1.5.5-5 +- fix initscript error (#82118) + +* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com> +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai <nalin(a)redhat.com> 1.5.5-3 +- patch for compile errors with new ssl libs +- rebuildfedora + +* Mon Dec 02 2002 Florian La Roche <Florian.LaRoche(a)redhat.de> +- postun should never fail + +* Thu Nov 28 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.5-1 +- Updated to 1.5.5 + +* Tue Jun 25 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-4 +- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) +- Fixed missing /usr/share/netatalk dir (#67222) + +* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com> 1.5.3.1-2 +- automated rebuild + +* Tue Jun 18 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-1 +- Updated to latest version 1.5.3.1. +- Fixed bug for nls file lookup (#66300). + +* Mon May 27 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-4 +- Fixed initscript bug where you can't use blanks inside of names (#64926). + +* Wed Apr 10 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-3 +- Fixed initscript to use correct config files from /etc/atalk (#62803) +- Changed initscript to use $0 instead of direct string (#61734) +- Change Copyright to Licencse and switch from BSD to GPL (#61746) + +* Thu Mar 14 2002 Bill Nottingham <notting(a)redhat.com> +- don't run by default + +* Wed Mar 13 2002 Bill Nottingham <notting(a)redhat.com> +- it's back + +* Fri Mar 2 2001 Tim Powers <timp(a)redhat.com> +- rebuilt against openssl-0.9.6-1 + +* Sun Feb 25 2001 Tim Powers <timp(a)redhat.com> +- fixed bug 29370. This package is trying to include a file glibc already includes + +* Tue Jan 23 2001 Tim Powers <timp(a)redhat.com> +- updated initscript + +* Thu Jan 04 2001 Than Ngo <than(a)redhat.com> +- fixed uams-path +- added noreplace to %%config + +* Mon Nov 20 2000 Tim Powers <timp(a)redhat.com> +- rebuilt to fix bad dir perms + +* Fri Nov 10 2000 Than Ngo <than(a)redhat.com> +- update to 1.5pre2 (bug #19737, #20397) +- update Url and ftp site +- clean up specfile +- netatalk-1.4b2+asun obsolete + +* Mon Aug 07 2000 Than Ngo <than(a)redhat.de> +- fix dependency with glibc-devel (Bug #15589) +- fix typo in description (Bug #15479) + +* Wed Aug 2 2000 Tim Powers <timp(a)redhat.com> +- fix symlinks not being relative. + +* Fri Jul 28 2000 Than Ngo <than(a)redhat.de> +- add missing restart function in startup script + +* Fri Jul 28 2000 Tim Powers <timp(a)redhat.com> +- fixed initscripts so that condrestart doesn't return 1 when the test fails + +* Mon Jul 24 2000 Prospector <prospector(a)redhat.com> +- rebuilt + +* Sun Jul 23 2000 Tim Powers <timp(a)redhat.com> +- rebuilt + +* Mon Jul 17 2000 Tim Powers <timp(a)redhat.com> +- inits back to rc.d/init.d, using service to start inits + +* Wed Jul 12 2000 Than Ngo <than(a)redhat.de> +- rebuilt + +* Thu Jul 06 2000 Tim Powers <timp(a)redhat.com> +- fixed broken PreReq, now PreReq's /etc/init.d + +* Tue Jun 27 2000 Than Ngo <than(a)redhat.de> +- remove prereq initscripts, add requires initscripts +- clean up specfile + +* Mon Jun 26 2000 Than Ngo <than(a)redhat.de> +- /etc/rc.d/init.d -> /etc/init.d +- add condrestart directive +- fix post/preun/postun scripts +- prereq initscripts >= 5.20 + +* Tue Jun 20 2000 Tim Powers <timp(a)redhat.com> +- fixed bug 11420 concerning the building with -O2. + +* Thu Jun 8 2000 Tim Powers <timp(a)redhat.com> +- fix bug #11978 +- fix man page locations to be FHS compliant + +* Thu Jun 1 2000 Nalin Dahyabhai <nalin(a)redhat.com> +- modify PAM setup to use system-auth + +* Thu Dec 16 1999 Tim Powers <timp(a)redhat.com> +- renewed source so it is pristine, delete the problematic files in spec file + instead +- general spec file cleanups, create buildroot and dirs in the %%install + section +- strip binaries +- gzip man pages +- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too +- changed group +- added %%defattr to %%files section + +* Tue Aug 3 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- rpm-3.0 needs to remove vogus files from source. + Removed files: etc/papd/.#magics.c, etc/.#diff + +* Fri Jul 30 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Change Copyright tag to BSD. + Add /usr/bin/adv1tov2. + +* Thu Apr 22 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Correct librpcsvc.patch. Move %%changelog section last. + Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since + LinuxPPC may need. + +* Wed Mar 31 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. + +* Sat Mar 20 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Correct symbolic links to psf. + + Remove asciize function from nbplkup so as to display Japanese hostname. +* Thu Mar 11 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> + +- Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping + containd in Internet Config Preference. + +* Tue Mar 2 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- [asun2.1.3] + +* Mon Feb 15 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2-8] + +* Sun Feb 7 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2-6] + +* Mon Jan 25 1999 iNOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2-3] + +* Thu Dec 17 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2] + Remove crlf patch. It is now a server's option. + +* Thu Dec 3 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz + Add uams directory + +* Sat Nov 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.1-3 source. + +* Mon Nov 23 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.1-2 source. + +* Mon Nov 16 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Fix rcX.d's symbolic links. + +* Wed Oct 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. + +* Sat Oct 24 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. + +* Mon Oct 5 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-10a source. + +* Sat Sep 19 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-8 source. Add chkconfig support. + +* Sat Sep 12 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Comment out -DCRLF. Use RPM_OPT_FLAGS. + +* Tue Sep 8 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. + +* Sat Aug 22 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-6 source. + +* Mon Jul 27 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-5 source. + +* Tue Jul 21 1998 INOUE Koichi <inoue(a)ma.ns.musashi-techa.c.jp> +- Use pre-asun2.1.0-3 source. + +* Tue Jul 7 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Add afpovertcp entries to /etc/services +- Remove BuildRoot in man8 pages + +* Mon Jun 29 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun + <asun(a)saul9.u.washington.edu> to provide an AppleShareIP file server + +- Included AppleVolumes.system file maintained by Johnson + <johnson(a)stpt.usf.edu> + +* Mon Aug 25 1997 David Gibson <D.Gibson(a)student.anu.edu.au> +- Used a buildroot +- Use RPM_OPT_FLAGS +- Moved configuration parameters/files from atalk.init to /etc/atalk +- Separated devel package +- Built with shared libraries + +* Sun Jul 13 1997 Paul H. Hargrove <hargrove(a)sccm.Stanford.EDU> +- Updated sources from 1.3.3 to 1.4b2 +- Included endian patch for Linux/SPARC +- Use all the configuration files supplied in the source. This has the + following advantages over the ones in the previous rpm release: + + The printer 'lp' isn't automatically placed in papd.conf + + The default file conversion is binary rather than text. +- Automatically add and remove DDP services from /etc/services +- Placed the recommended /etc/services in the documentation +- Changed atalk.init to give daemons a soft kill +- Changed atalk.init to make configuration easier + +* Wed May 28 1997 Mark Cornick <mcornick(a)zorak.gsfc.nasa.gov> +- Updated for /etc/pam.d diff --git a/sources b/sources index b8bf15d..f9760a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -831ec8bf9e084b64f965d16c528af299 netatalk-3.1.7.tar.bz2 +SHA512 (netatalk-3.1.12.tar.bz2) = 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759 commit e3e403eaa35d5b0ed7abf88f4ae6bf675f5073dd Author: Andrew Bauer <zonexpertconsulting(a)outlook.com> Date: Sat Feb 23 07:35:13 2019 -0600 remove former netatalk files diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch deleted file mode 100644 index f289baa..0000000 --- a/netatalk-3.0.1-basedir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 -+++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 -@@ -6,7 +6,7 @@ - ; Global server settings - - ; [Homes] --; basedir regex = /xxxx -+; basedir regex = /home - - ; [My AFP Volume] - ; path = /path/to/volume diff --git a/netatalk-3.1.7-autotools.patch b/netatalk-3.1.7-autotools.patch deleted file mode 100644 index e4b8b28..0000000 --- a/netatalk-3.1.7-autotools.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur netatalk-3.1.7.orig/configure netatalk-3.1.7/configure ---- netatalk-3.1.7.orig/configure 2014-08-29 12:32:50.000000000 +0200 -+++ netatalk-3.1.7/configure 2015-07-23 06:42:17.245794650 +0200 -@@ -17226,8 +17226,8 @@ - - if test x"$compilegssapi" != x"no" ; then - if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then -- export CFLAGS="-I$withval/include" -- export LDFLAGS="-L$withval/${atalk_libname}" -+ export CFLAGS="$CFLAGS -I$withval/include" -+ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI support in $compilegssapi" >&5 - $as_echo "$as_me: checking for GSSAPI support in $compilegssapi" >&6;} - fi -@@ -17382,8 +17382,8 @@ - - if test x"$FOUND_GSSAPI" = x"yes" ; then - # check for functions -- export CFLAGS="$GSSAPI_CFLAGS" -- export LIBS="$GSSAPI_LIBS" -+ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ export LIBS="$LIBS $GSSAPI_LIBS" - ac_fn_c_check_func "$LINENO" "gss_acquire_cred" "ac_cv_func_gss_acquire_cred" - if test "x$ac_cv_func_gss_acquire_cred" = xyes; then : - -diff -Naur netatalk-3.1.7.orig/macros/gssapi-check.m4 netatalk-3.1.7/macros/gssapi-check.m4 ---- netatalk-3.1.7.orig/macros/gssapi-check.m4 2013-10-28 14:43:14.000000000 +0100 -+++ netatalk-3.1.7/macros/gssapi-check.m4 2015-07-23 06:42:12.475826699 +0200 -@@ -18,8 +18,8 @@ - - if test x"$compilegssapi" != x"no" ; then - if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then -- export CFLAGS="-I$withval/include" -- export LDFLAGS="-L$withval/${atalk_libname}" -+ export CFLAGS="$CFLAGS -I$withval/include" -+ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" - AC_MSG_NOTICE([checking for GSSAPI support in $compilegssapi]) - fi - -@@ -64,8 +64,8 @@ - - if test x"$FOUND_GSSAPI" = x"yes" ; then - # check for functions -- export CFLAGS="$GSSAPI_CFLAGS" -- export LIBS="$GSSAPI_LIBS" -+ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ export LIBS="$LIBS $GSSAPI_LIBS" - AC_CHECK_FUNC(gss_acquire_cred, [], [AC_MSG_ERROR([GSSAPI: required function gss_acquire_cred missing])]) - - # Heimdal/MIT compatibility fix diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth deleted file mode 100644 index 2c0c0b2..0000000 --- a/netatalk.pam-system-auth +++ /dev/null @@ -1,16 +0,0 @@ -#%PAM-1.0 -auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so -auth include system-auth -account required pam_nologin.so -account include system-auth -password include system-auth -# pam_selinux.so close should be the first session rule -session required pam_selinux.so close -session required pam_loginuid.so -session optional pam_console.so -# pam_selinux.so open should only be followed by sessions to be executed in the user context -session required pam_selinux.so open -session required pam_namespace.so -session optional pam_keyinit.so force revoke -session include system-auth -session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec deleted file mode 100644 index 65977c9..0000000 --- a/netatalk.spec +++ /dev/null @@ -1,770 +0,0 @@ -%global pkgver $(rpm -qls tracker-devel | grep sparql | grep pc | cut -d"-" -f3 | cut -d"." -f1-2) - -%global xslver $(rpm -q --queryformat "%%{VERSION}" docbook-style-xsl) - -%global _hardened_build 1 - -%global with_acls 1 - -%global with_bdb 1 - -%global with_cracklib 1 - -%global with_docbook 1 - -%global with_dbus 1 - -%global with_dtrace 1 - -%global with_mysql 1 - -%global with_openafs 0 - -%global with_quota 1 - -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global with_systemd 1 -%else -%global with_systemd 0 -%endif - -%global with_tcp_wrappers 1 - -%global with_tracker 1 - -Name: netatalk -Epoch: 5 -Version: 3.1.7 -Release: 2%{?dist} -Summary: Open Source Apple Filing Protocol(AFP) fileserver -License: GPLv2+ -URL: http://netatalk.sourceforge.net/ -Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 -Source1: netatalk.pam-system-auth -# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm -Patch0: netatalk-3.0.1-basedir.patch -# Let macros/gssapi-check.m4 honor CFLAGS/LDFLAGS -Patch1: netatalk-3.1.7-autotools.patch - -BuildRequires: avahi-devel -BuildRequires: bison -%if 0%{?with_cracklib} -BuildRequires: cracklib-devel -%endif -%if 0%{?with_dbus} -BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel -%endif -%if 0%{?with_docbook} -BuildRequires: docbook-style-xsl -%endif -BuildRequires: flex -%if 0%{?with_acls} -BuildRequires: libacl-devel -%endif -BuildRequires: libattr-devel -%if 0%{?with_bdb} -BuildRequires: libdb-devel -%endif -BuildRequires: libevent-devel -BuildRequires: libgcrypt-devel -%if 0%{?with_docbook} -BuildRequires: libxslt -%endif -BuildRequires: krb5-devel -%if 0%{?with_mysql} -BuildRequires: mysql-devel -%endif -%if 0%{?with_openafs} -BuildRequires: openafs-devel -%endif -%if 0%{?with_ldap} -BuildRequires: openldap-devel -%endif -BuildRequires: openssl-devel -BuildRequires: procps-ng -BuildRequires: pam-devel -%if 0%{?with_quota} -BuildRequires: quota-devel -%endif -%if 0%{?with_systemd} -BuildRequires: systemd -%endif -%if 0%{?with_dtrace} -BuildRequires: systemtap-sdt-devel -%endif -%if 0%{?with_tcp_wrappers} -BuildRequires: tcp_wrappers-devel -%endif -BuildRequires: libtdb-devel -%if 0%{?with_tracker} -BuildRequires: tracker-devel -%endif -Requires: dbus-python -%if 0%{?with_systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -%endif - -%description -Netatalk is a freely-available Open Source AFP fileserver. A *NIX/*BSD -system running Netatalk is capable of serving many Macintosh clients -simultaneously as an AppleShare file server (AFP). - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description devel -This package contains libraries and header files for -developing applications that use %{name}. - -%prep -%setup -q -rm -frv libevent/ -%patch0 -p1 -%patch1 -p1 - -# Avoid re-running the autotools -touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 - -# fix permissions -find include $ -name '*.h' -a -executable $ -exec chmod -x {} \; - -%build -%ifarch ppc ppc64 s390 s390x -export CFLAGS="$CFLAGS -fsigned-char" -%endif - -%configure \ - --localstatedir=%{_localstatedir}/lib \ -%if 0%{?with_acls} - --with-acl \ -%endif -%if 0%{?with_cracklib} - --with-cracklib \ -%endif -%if 0%{?with_docbook} - --with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets-%{xslver} \ -%endif - --with-kerberos \ - --with-libgcrypt \ - --with-pam \ - --with-pkgconfdir=%{_sysconfdir}/netatalk/ \ - --with-shadow \ - --with-spotlight \ - --with-tbd=no \ - --with-uams-path=%{_libdir}/atalk \ - --enable-pgp-uam \ - --enable-shared \ - --enable-krbV-uam \ - --enable-overwrite \ -%if 0%{?with_systemd} - --with-init-style=redhat-systemd \ -%else - --with-init-style=redhat-sysv \ -%endif -%if 0%{?with_tracker} - --with-tracker-pkgconfig-version=%{pkgver} \ -%endif - --without-libevent \ - --without-tdb \ - --with-bdb \ - --with-libevent-header=%{_includedir} \ - --with-libevent-lib=%{_libdir} \ - --disable-silent-rules \ - --disable-static - -%make_build -# Build the local docs. -make -C doc/manual html-local - -%install -%make_install -# Ghost lock dir. -mkdir -p %{buildroot}/var/lock/netatalk -# Use specific pam conf. -install -pm644 %{S:1} %{buildroot}%{_sysconfdir}/pam.d/netatalk - -find %{buildroot} -name '*.la' -delete -print - -%check -sh test/afpd/test.sh - -%post -%if 0%{?with_systemd} -%systemd_post netatalk.service -%else -chkconfig --add netatalk -%endif -/sbin/ldconfig - -%preun -%if 0%{?with_systemd} -%systemd_preun netatalk.service -%else -if [ $1 -eq 0 ] ; then - service netatalk stop &> /dev/null - chkconfig --del netatalk &> /dev/null -fi -%endif - -%postun -%if 0%{?with_systemd} -%systemd_postun_with_restart netatalk.service -%else -if [ "$1" -ge "1" ] ; then - service netatalk condrestart >/dev/null 2>&1 || : -fi -%endif -/sbin/ldconfig - -%files -%doc AUTHORS CONTRIBUTORS NEWS -%license COPYING COPYRIGHT -%doc doc/manual/*.html -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf -%dir %{_sysconfdir}/netatalk -%config(noreplace) %{_sysconfdir}/netatalk/afp.conf -%config(noreplace) %{_sysconfdir}/netatalk/dbus-session.conf -%config(noreplace) %{_sysconfdir}/netatalk/extmap.conf -%config(noreplace) %{_sysconfdir}/pam.d/netatalk -%{_bindir}/* -%exclude %{_bindir}/netatalk-config -%{_libdir}/atalk/ -%{_libdir}/libatalk.so.* -%{_mandir}/man*/* -%exclude %{_mandir}/man*/netatalk-config* -%{_sbindir}/* -%if 0%{?with_systemd} -%{_unitdir}/netatalk.service -%else -%{_initrddir}/netatalk -%endif -%ghost %dir /var/lock/netatalk -%{_localstatedir}/lib - -%files devel -%{_bindir}/netatalk-config -%{_datadir}/aclocal/netatalk.m4 -%{_includedir}/atalk/ -%{_libdir}/libatalk.so -%{_mandir}/man*/netatalk-config.1* - -%changelog -* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 5:3.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 5:3.1.7-1 -- Increment epoch. Missed to reset %%release in previous change. - -* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.7-7 -- Upstream update to 3.1.7 (RHBZ#1134783). -- Remove doc from *-devel. -- Add %%license. -- Update %%description from - http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. - -* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.3-4 -- Address F23FTBFS, RHBZ#1239711: - - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). - - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, - netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, - netatalk-2.2.3-sigterm.patch (Unused) - - Add netatalk-3.0.1-basedir.patch. - - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. - - Fix permissions on include-files. - - Remove duplicate %%global with_mysql. - - Enable dbus. - - Add missing "fi" in %%preun. - - Run /sbin/ldconfig in %%postun, %%preun. - - Reflect /var/lock/netatalk is hard-coded into the sources. - - Set --localstatedir=/var/lib (/var/netatalk violates FHS). - -* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 04 2014 Christopher Meng <rpm(a)cicku.me> - 4:3.1.3-1 -- Update to 3.1.3 - -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 24 2014 Tom Mrz <tmraz(a)redhat.com> - 4:2.2.3-10 -- Rebuild for new libgcrypt - -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 17 2013 Petr Pisar <ppisar(a)redhat.com> - 4:2.2.3-8 -- Perl 5.18 rebuild - -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Aug 23 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-6 -- Scriptlets replaced with new systemd macros - -* Fri Jul 27 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-5 -- fixed build issue on f18 - -* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 16 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-3 -- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX - client, crashes Finder netatalk-2.2.2-1 - -* Tue Jun 12 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-2 -- fixes: #831001 - netatalk pam configuration has invalid entry - -* Mon Jun 04 2012 Lukas Nykryn <lnykryn(a)redhat.com> 4:2.2.3-1 -- fixes #828205 - update to latest upstream netatalk-2.2.3 - -* Mon Jan 16 2012 Jiri Skala <jskala(a)redhat.com> - 4:2.2.2-1 -- fixes #782049 - update to latest upstream netatalk-2.2.2 - -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-2 -- fixes #501144 - updated and redirected pam config - -* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-1 -- update to latest upstream netatalk-2.2.1 - -* Fri Aug 19 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-4 -- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel - -* Fri Aug 05 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-3 -- fixed missing epoch in sysvinit subpackage and triggers - -* Thu Aug 04 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-2 -- fixes #714448 - systemd-service -- moves SysV initscript to subpackage - -* Fri Jul 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-1 -- update to latest upstream netatalk-2.2.0 - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 03 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.1.5-1 -- updated to latest upstream version netatalk-2.1.5 - -* Mon Oct 18 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.4-1 -- updated to latest upstream version - -* Mon Jul 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.3-1 -- updated to latest upstream version -- added license texts to devel subpackage - -* Wed Jun 30 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.2-1 -- updated to latest upstream version - -* Fri May 28 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.1-1 -- updated to latest upstream version -- fixes #594999 - Summary and Description are old-fashioned -- renamed initscript -- initscript modified to be POSIX compliant - -* Wed May 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1-1 -- updated to latest upstream version - -* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-2 -- oops forgot upload new sources => shifted release number - -* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-1 -- updated to latest upstream version - -* Mon Nov 23 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-5 -- added BuildRequires: ... libgcrypt-devel -- removed outdated atalk.init - -* Tue Sep 15 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-4 -- fixed #473943 - -* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.4-3 -- rebuilt with new openssl - -* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 14 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-1 -- updated to latest upstream version - -* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.3-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 16 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-26 -- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability - -* Tue Jan 27 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-25 -- fixed epoch in the subpackage requires - -* Fri Jan 23 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-24 -- fix #473186 conflict timeout with coreutils - -* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.3-23 -- rebuild with new openssl - -* Wed Dec 03 2008 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-22 -- fix #473939 netatalk-2.0.3-21.fc10 disable quota - -* Mon Oct 13 2008 Jiri Skala <jskala(a)redhat.com> - 4:2.0.3-21 -- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches - -* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 4:2.0.3-20 -- fix license tag - -* Thu Mar 06 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-19 -- fix chmod o+x (#225085) -- increase the maximum number of cnid_dbd processes to 512 (#232805) -- papd now writes debugging output to stderr when invoked with -d (#150021) -- fix multiarch conflict for netatalk-devel (#342681) - -* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-18 -- make init script LSB compliant (#246993) - -* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-17 -- fix unowned directories (#233889) - -* Mon Feb 11 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-16 -- rebuild for gcc-4.3 - -* Tue Dec 04 2007 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-15.1 -- rebuild - -* Wed Sep 12 2007 Maros Barabas <mbarabas(a)redhat.com> -4:2.0.3-15 -- patch to build on FC, bad open call - -* Tue Sep 11 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-13 -- rebuild - -* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 -- Rebuild for selinux ppc32 issue. - -* Thu May 10 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.4-11 -- fix from merge review -- Resolves #226190 - -* Tue Apr 17 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-10 -- fix fiew problems in spec - -* Tue Jan 23 2007 Jindrich Novy <jnovy(a)redhat.com> - 4:2.0.3-9 -- rebuild against new db4 - -* Mon Dec 04 2006 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-8 -- BuildRequires changed from cracklib to cracklib-devel - -* Fri Aug 18 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-7 -- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* - (#203001) -- Add dist tag - -* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-6.fc6.1 -- rebuild - -* Fri Jun 09 2006 Jason Vas Dias <jvdias(a)redhat.com> - 4:2.0.3-6.fc6 -- rebuild for broken libgssapi deps and brew build - -* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-4.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jason Vas Dias <jvdias(a)redhat.com> -- rebuild for new gcc, glibc, glibc-kernheaders - -* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> -- rebuilt - -* Wed Nov 09 2005 Jason Vas Dias <jvdias(a)redhat.com> -- Rebuild for new openssl dependencies - -* Thu Oct 13 2005 Tomas Mraz <tmraz(a)redhat.com> -- use include instead of pam_stack in pam config - -* Wed Jul 20 2005 Bill Nottingham <notting(a)redhat.com> -- don't run by default - -* Thu Jun 16 2005 Jason Vas Dias <jvdias(a)redhat.com> -- Upgrade to upstream version 2.0.3 -- fix bug 160486: use netatalk's initscript - -* Wed Mar 30 2005 Florian La Roche <laroche(a)redhat.com> -- quick fix: rm -f /usr/include/netatalk/at.h until this - is resolved the correct way - -* Mon Mar 07 2005 Jason Vas Dias <jvdias(a)redhat.com> -- Fix for gcc4 compilation: extern_ucreator.patch - -* Mon Feb 21 2005 Jason Vas Dias <jvdias(a)redhat.com> -- Upgraded to upstream version 2.0.2 . - -* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Wed Jan 07 2004 Florian La Roche <Florian.LaRoche(a)redhat.de> -- 1.6.4 - -* Fri Aug 1 2003 Charlie Bennett <ccb(a)redhat.com> -- Update with 1.6.3 upstream sources - -* Tue Jul 29 2003 Elliot Lee <sopwith(a)redhat.com> -- Rebuild -- Fix perl multilib path editing -- Add pathcat patch - -* Thu May 1 2003 Elliot Lee <sopwith(a)redhat.com> 1.5.5-7 -- Make multilib generic -- Add builddep on quota (for rpcsvc/rquota.h) - -* Tue Feb 18 2003 Bill Nottingham <notting(a)redhat.com> 1.5.5-5 -- fix initscript error (#82118) - -* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com> -- rebuilt - -* Tue Jan 7 2003 Nalin Dahyabhai <nalin(a)redhat.com> 1.5.5-3 -- patch for compile errors with new ssl libs -- rebuildfedora - -* Mon Dec 02 2002 Florian La Roche <Florian.LaRoche(a)redhat.de> -- postun should never fail - -* Thu Nov 28 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.5-1 -- Updated to 1.5.5 - -* Tue Jun 25 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-4 -- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) -- Fixed missing /usr/share/netatalk dir (#67222) - -* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com> 1.5.3.1-2 -- automated rebuild - -* Tue Jun 18 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-1 -- Updated to latest version 1.5.3.1. -- Fixed bug for nls file lookup (#66300). - -* Mon May 27 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-4 -- Fixed initscript bug where you can't use blanks inside of names (#64926). - -* Wed Apr 10 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-3 -- Fixed initscript to use correct config files from /etc/atalk (#62803) -- Changed initscript to use $0 instead of direct string (#61734) -- Change Copyright to Licencse and switch from BSD to GPL (#61746) - -* Thu Mar 14 2002 Bill Nottingham <notting(a)redhat.com> -- don't run by default - -* Wed Mar 13 2002 Bill Nottingham <notting(a)redhat.com> -- it's back - -* Fri Mar 2 2001 Tim Powers <timp(a)redhat.com> -- rebuilt against openssl-0.9.6-1 - -* Sun Feb 25 2001 Tim Powers <timp(a)redhat.com> -- fixed bug 29370. This package is trying to include a file glibc already includes - -* Tue Jan 23 2001 Tim Powers <timp(a)redhat.com> -- updated initscript - -* Thu Jan 04 2001 Than Ngo <than(a)redhat.com> -- fixed uams-path -- added noreplace to %%config - -* Mon Nov 20 2000 Tim Powers <timp(a)redhat.com> -- rebuilt to fix bad dir perms - -* Fri Nov 10 2000 Than Ngo <than(a)redhat.com> -- update to 1.5pre2 (bug #19737, #20397) -- update Url and ftp site -- clean up specfile -- netatalk-1.4b2+asun obsolete - -* Mon Aug 07 2000 Than Ngo <than(a)redhat.de> -- fix dependency with glibc-devel (Bug #15589) -- fix typo in description (Bug #15479) - -* Wed Aug 2 2000 Tim Powers <timp(a)redhat.com> -- fix symlinks not being relative. - -* Fri Jul 28 2000 Than Ngo <than(a)redhat.de> -- add missing restart function in startup script - -* Fri Jul 28 2000 Tim Powers <timp(a)redhat.com> -- fixed initscripts so that condrestart doesn't return 1 when the test fails - -* Mon Jul 24 2000 Prospector <prospector(a)redhat.com> -- rebuilt - -* Sun Jul 23 2000 Tim Powers <timp(a)redhat.com> -- rebuilt - -* Mon Jul 17 2000 Tim Powers <timp(a)redhat.com> -- inits back to rc.d/init.d, using service to start inits - -* Wed Jul 12 2000 Than Ngo <than(a)redhat.de> -- rebuilt - -* Thu Jul 06 2000 Tim Powers <timp(a)redhat.com> -- fixed broken PreReq, now PreReq's /etc/init.d - -* Tue Jun 27 2000 Than Ngo <than(a)redhat.de> -- remove prereq initscripts, add requires initscripts -- clean up specfile - -* Mon Jun 26 2000 Than Ngo <than(a)redhat.de> -- /etc/rc.d/init.d -> /etc/init.d -- add condrestart directive -- fix post/preun/postun scripts -- prereq initscripts >= 5.20 - -* Tue Jun 20 2000 Tim Powers <timp(a)redhat.com> -- fixed bug 11420 concerning the building with -O2. - -* Thu Jun 8 2000 Tim Powers <timp(a)redhat.com> -- fix bug #11978 -- fix man page locations to be FHS compliant - -* Thu Jun 1 2000 Nalin Dahyabhai <nalin(a)redhat.com> -- modify PAM setup to use system-auth - -* Thu Dec 16 1999 Tim Powers <timp(a)redhat.com> -- renewed source so it is pristine, delete the problematic files in spec file - instead -- general spec file cleanups, create buildroot and dirs in the %%install - section -- strip binaries -- gzip man pages -- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too -- changed group -- added %%defattr to %%files section - -* Tue Aug 3 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- rpm-3.0 needs to remove vogus files from source. - Removed files: etc/papd/.#magics.c, etc/.#diff - -* Fri Jul 30 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- Change Copyright tag to BSD. - Add /usr/bin/adv1tov2. - -* Thu Apr 22 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- Correct librpcsvc.patch. Move %%changelog section last. - Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since - LinuxPPC may need. - -* Wed Mar 31 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. - -* Sat Mar 20 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- Correct symbolic links to psf. - - Remove asciize function from nbplkup so as to display Japanese hostname. -* Thu Mar 11 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - -- Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping - containd in Internet Config Preference. - -* Tue Mar 2 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- [asun2.1.3] - -* Mon Feb 15 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- [pre-asun2.1.2-8] - -* Sun Feb 7 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- [pre-asun2.1.2-6] - -* Mon Jan 25 1999 iNOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- [pre-asun2.1.2-3] - -* Thu Dec 17 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- [pre-asun2.1.2] - Remove crlf patch. It is now a server's option. - -* Thu Dec 3 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz - Add uams directory - -* Sat Nov 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.1-3 source. - -* Mon Nov 23 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.1-2 source. - -* Mon Nov 16 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Fix rcX.d's symbolic links. - -* Wed Oct 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. - -* Sat Oct 24 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. - -* Mon Oct 5 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-10a source. - -* Sat Sep 19 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-8 source. Add chkconfig support. - -* Sat Sep 12 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Comment out -DCRLF. Use RPM_OPT_FLAGS. - -* Tue Sep 8 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. - -* Sat Aug 22 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-6 source. - -* Mon Jul 27 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-5 source. - -* Tue Jul 21 1998 INOUE Koichi <inoue(a)ma.ns.musashi-techa.c.jp> -- Use pre-asun2.1.0-3 source. - -* Tue Jul 7 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Add afpovertcp entries to /etc/services -- Remove BuildRoot in man8 pages - -* Mon Jun 29 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun - <asun(a)saul9.u.washington.edu> to provide an AppleShareIP file server - -- Included AppleVolumes.system file maintained by Johnson - <johnson(a)stpt.usf.edu> - -* Mon Aug 25 1997 David Gibson <D.Gibson(a)student.anu.edu.au> -- Used a buildroot -- Use RPM_OPT_FLAGS -- Moved configuration parameters/files from atalk.init to /etc/atalk -- Separated devel package -- Built with shared libraries - -* Sun Jul 13 1997 Paul H. Hargrove <hargrove(a)sccm.Stanford.EDU> -- Updated sources from 1.3.3 to 1.4b2 -- Included endian patch for Linux/SPARC -- Use all the configuration files supplied in the source. This has the - following advantages over the ones in the previous rpm release: - + The printer 'lp' isn't automatically placed in papd.conf - + The default file conversion is binary rather than text. -- Automatically add and remove DDP services from /etc/services -- Placed the recommended /etc/services in the documentation -- Changed atalk.init to give daemons a soft kill -- Changed atalk.init to make configuration easier - -* Wed May 28 1997 Mark Cornick <mcornick(a)zorak.gsfc.nasa.gov> -- Updated for /etc/pam.d commit ec9b0d142769facb9402612075fd30ef66110453 Author: Mohan Boddu <mboddu(a)bhujji.com> Date: Thu Feb 21 15:51:51 2019 -0500 Revert "2016-05-19: Retired orphaned package, because it was orphaned for" Unretirement for https://pagure.io/releng/issue/7984 This reverts commit 81611ededd7b668145715779723c60d84ef74003. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8302d47 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/netatalk-3.1.7.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index 164cb9a..0000000 --- a/dead.package +++ /dev/null @@ -1,3 +0,0 @@ -2016-05-19: Retired orphaned package, because it was orphaned for -more than six weeks. - diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch new file mode 100644 index 0000000..f289baa --- /dev/null +++ b/netatalk-3.0.1-basedir.patch @@ -0,0 +1,11 @@ +--- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 ++++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 +@@ -6,7 +6,7 @@ + ; Global server settings + + ; [Homes] +-; basedir regex = /xxxx ++; basedir regex = /home + + ; [My AFP Volume] + ; path = /path/to/volume diff --git a/netatalk-3.1.7-autotools.patch b/netatalk-3.1.7-autotools.patch new file mode 100644 index 0000000..e4b8b28 --- /dev/null +++ b/netatalk-3.1.7-autotools.patch @@ -0,0 +1,50 @@ +diff -Naur netatalk-3.1.7.orig/configure netatalk-3.1.7/configure +--- netatalk-3.1.7.orig/configure 2014-08-29 12:32:50.000000000 +0200 ++++ netatalk-3.1.7/configure 2015-07-23 06:42:17.245794650 +0200 +@@ -17226,8 +17226,8 @@ + + if test x"$compilegssapi" != x"no" ; then + if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then +- export CFLAGS="-I$withval/include" +- export LDFLAGS="-L$withval/${atalk_libname}" ++ export CFLAGS="$CFLAGS -I$withval/include" ++ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI support in $compilegssapi" >&5 + $as_echo "$as_me: checking for GSSAPI support in $compilegssapi" >&6;} + fi +@@ -17382,8 +17382,8 @@ + + if test x"$FOUND_GSSAPI" = x"yes" ; then + # check for functions +- export CFLAGS="$GSSAPI_CFLAGS" +- export LIBS="$GSSAPI_LIBS" ++ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ export LIBS="$LIBS $GSSAPI_LIBS" + ac_fn_c_check_func "$LINENO" "gss_acquire_cred" "ac_cv_func_gss_acquire_cred" + if test "x$ac_cv_func_gss_acquire_cred" = xyes; then : + +diff -Naur netatalk-3.1.7.orig/macros/gssapi-check.m4 netatalk-3.1.7/macros/gssapi-check.m4 +--- netatalk-3.1.7.orig/macros/gssapi-check.m4 2013-10-28 14:43:14.000000000 +0100 ++++ netatalk-3.1.7/macros/gssapi-check.m4 2015-07-23 06:42:12.475826699 +0200 +@@ -18,8 +18,8 @@ + + if test x"$compilegssapi" != x"no" ; then + if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then +- export CFLAGS="-I$withval/include" +- export LDFLAGS="-L$withval/${atalk_libname}" ++ export CFLAGS="$CFLAGS -I$withval/include" ++ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" + AC_MSG_NOTICE([checking for GSSAPI support in $compilegssapi]) + fi + +@@ -64,8 +64,8 @@ + + if test x"$FOUND_GSSAPI" = x"yes" ; then + # check for functions +- export CFLAGS="$GSSAPI_CFLAGS" +- export LIBS="$GSSAPI_LIBS" ++ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ export LIBS="$LIBS $GSSAPI_LIBS" + AC_CHECK_FUNC(gss_acquire_cred, [], [AC_MSG_ERROR([GSSAPI: required function gss_acquire_cred missing])]) + + # Heimdal/MIT compatibility fix diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth new file mode 100644 index 0000000..2c0c0b2 --- /dev/null +++ b/netatalk.pam-system-auth @@ -0,0 +1,16 @@ +#%PAM-1.0 +auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +# pam_selinux.so close should be the first session rule +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +# pam_selinux.so open should only be followed by sessions to be executed in the user context +session required pam_selinux.so open +session required pam_namespace.so +session optional pam_keyinit.so force revoke +session include system-auth +session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec new file mode 100644 index 0000000..65977c9 --- /dev/null +++ b/netatalk.spec @@ -0,0 +1,770 @@ +%global pkgver $(rpm -qls tracker-devel | grep sparql | grep pc | cut -d"-" -f3 | cut -d"." -f1-2) + +%global xslver $(rpm -q --queryformat "%%{VERSION}" docbook-style-xsl) + +%global _hardened_build 1 + +%global with_acls 1 + +%global with_bdb 1 + +%global with_cracklib 1 + +%global with_docbook 1 + +%global with_dbus 1 + +%global with_dtrace 1 + +%global with_mysql 1 + +%global with_openafs 0 + +%global with_quota 1 + +%if 0%{?fedora} || 0%{?rhel} >= 7 +%global with_systemd 1 +%else +%global with_systemd 0 +%endif + +%global with_tcp_wrappers 1 + +%global with_tracker 1 + +Name: netatalk +Epoch: 5 +Version: 3.1.7 +Release: 2%{?dist} +Summary: Open Source Apple Filing Protocol(AFP) fileserver +License: GPLv2+ +URL: http://netatalk.sourceforge.net/ +Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 +Source1: netatalk.pam-system-auth +# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm +Patch0: netatalk-3.0.1-basedir.patch +# Let macros/gssapi-check.m4 honor CFLAGS/LDFLAGS +Patch1: netatalk-3.1.7-autotools.patch + +BuildRequires: avahi-devel +BuildRequires: bison +%if 0%{?with_cracklib} +BuildRequires: cracklib-devel +%endif +%if 0%{?with_dbus} +BuildRequires: dbus-devel +BuildRequires: dbus-glib-devel +%endif +%if 0%{?with_docbook} +BuildRequires: docbook-style-xsl +%endif +BuildRequires: flex +%if 0%{?with_acls} +BuildRequires: libacl-devel +%endif +BuildRequires: libattr-devel +%if 0%{?with_bdb} +BuildRequires: libdb-devel +%endif +BuildRequires: libevent-devel +BuildRequires: libgcrypt-devel +%if 0%{?with_docbook} +BuildRequires: libxslt +%endif +BuildRequires: krb5-devel +%if 0%{?with_mysql} +BuildRequires: mysql-devel +%endif +%if 0%{?with_openafs} +BuildRequires: openafs-devel +%endif +%if 0%{?with_ldap} +BuildRequires: openldap-devel +%endif +BuildRequires: openssl-devel +BuildRequires: procps-ng +BuildRequires: pam-devel +%if 0%{?with_quota} +BuildRequires: quota-devel +%endif +%if 0%{?with_systemd} +BuildRequires: systemd +%endif +%if 0%{?with_dtrace} +BuildRequires: systemtap-sdt-devel +%endif +%if 0%{?with_tcp_wrappers} +BuildRequires: tcp_wrappers-devel +%endif +BuildRequires: libtdb-devel +%if 0%{?with_tracker} +BuildRequires: tracker-devel +%endif +Requires: dbus-python +%if 0%{?with_systemd} +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%else +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +Requires(postun): initscripts +%endif + +%description +Netatalk is a freely-available Open Source AFP fileserver. A *NIX/*BSD +system running Netatalk is capable of serving many Macintosh clients +simultaneously as an AppleShare file server (AFP). + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description devel +This package contains libraries and header files for +developing applications that use %{name}. + +%prep +%setup -q +rm -frv libevent/ +%patch0 -p1 +%patch1 -p1 + +# Avoid re-running the autotools +touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 + +# fix permissions +find include $ -name '*.h' -a -executable $ -exec chmod -x {} \; + +%build +%ifarch ppc ppc64 s390 s390x +export CFLAGS="$CFLAGS -fsigned-char" +%endif + +%configure \ + --localstatedir=%{_localstatedir}/lib \ +%if 0%{?with_acls} + --with-acl \ +%endif +%if 0%{?with_cracklib} + --with-cracklib \ +%endif +%if 0%{?with_docbook} + --with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets-%{xslver} \ +%endif + --with-kerberos \ + --with-libgcrypt \ + --with-pam \ + --with-pkgconfdir=%{_sysconfdir}/netatalk/ \ + --with-shadow \ + --with-spotlight \ + --with-tbd=no \ + --with-uams-path=%{_libdir}/atalk \ + --enable-pgp-uam \ + --enable-shared \ + --enable-krbV-uam \ + --enable-overwrite \ +%if 0%{?with_systemd} + --with-init-style=redhat-systemd \ +%else + --with-init-style=redhat-sysv \ +%endif +%if 0%{?with_tracker} + --with-tracker-pkgconfig-version=%{pkgver} \ +%endif + --without-libevent \ + --without-tdb \ + --with-bdb \ + --with-libevent-header=%{_includedir} \ + --with-libevent-lib=%{_libdir} \ + --disable-silent-rules \ + --disable-static + +%make_build +# Build the local docs. +make -C doc/manual html-local + +%install +%make_install +# Ghost lock dir. +mkdir -p %{buildroot}/var/lock/netatalk +# Use specific pam conf. +install -pm644 %{S:1} %{buildroot}%{_sysconfdir}/pam.d/netatalk + +find %{buildroot} -name '*.la' -delete -print + +%check +sh test/afpd/test.sh + +%post +%if 0%{?with_systemd} +%systemd_post netatalk.service +%else +chkconfig --add netatalk +%endif +/sbin/ldconfig + +%preun +%if 0%{?with_systemd} +%systemd_preun netatalk.service +%else +if [ $1 -eq 0 ] ; then + service netatalk stop &> /dev/null + chkconfig --del netatalk &> /dev/null +fi +%endif + +%postun +%if 0%{?with_systemd} +%systemd_postun_with_restart netatalk.service +%else +if [ "$1" -ge "1" ] ; then + service netatalk condrestart >/dev/null 2>&1 || : +fi +%endif +/sbin/ldconfig + +%files +%doc AUTHORS CONTRIBUTORS NEWS +%license COPYING COPYRIGHT +%doc doc/manual/*.html +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf +%dir %{_sysconfdir}/netatalk +%config(noreplace) %{_sysconfdir}/netatalk/afp.conf +%config(noreplace) %{_sysconfdir}/netatalk/dbus-session.conf +%config(noreplace) %{_sysconfdir}/netatalk/extmap.conf +%config(noreplace) %{_sysconfdir}/pam.d/netatalk +%{_bindir}/* +%exclude %{_bindir}/netatalk-config +%{_libdir}/atalk/ +%{_libdir}/libatalk.so.* +%{_mandir}/man*/* +%exclude %{_mandir}/man*/netatalk-config* +%{_sbindir}/* +%if 0%{?with_systemd} +%{_unitdir}/netatalk.service +%else +%{_initrddir}/netatalk +%endif +%ghost %dir /var/lock/netatalk +%{_localstatedir}/lib + +%files devel +%{_bindir}/netatalk-config +%{_datadir}/aclocal/netatalk.m4 +%{_includedir}/atalk/ +%{_libdir}/libatalk.so +%{_mandir}/man*/netatalk-config.1* + +%changelog +* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 5:3.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 5:3.1.7-1 +- Increment epoch. Missed to reset %%release in previous change. + +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.7-7 +- Upstream update to 3.1.7 (RHBZ#1134783). +- Remove doc from *-devel. +- Add %%license. +- Update %%description from + http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. + +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.3-4 +- Address F23FTBFS, RHBZ#1239711: + - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). + - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, + netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, + netatalk-2.2.3-sigterm.patch (Unused) + - Add netatalk-3.0.1-basedir.patch. + - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. + - Fix permissions on include-files. + - Remove duplicate %%global with_mysql. + - Enable dbus. + - Add missing "fi" in %%preun. + - Run /sbin/ldconfig in %%postun, %%preun. + - Reflect /var/lock/netatalk is hard-coded into the sources. + - Set --localstatedir=/var/lib (/var/netatalk violates FHS). + +* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 04 2014 Christopher Meng <rpm(a)cicku.me> - 4:3.1.3-1 +- Update to 3.1.3 + +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 24 2014 Tom Mrz <tmraz(a)redhat.com> - 4:2.2.3-10 +- Rebuild for new libgcrypt + +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar <ppisar(a)redhat.com> - 4:2.2.3-8 +- Perl 5.18 rebuild + +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Aug 23 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-6 +- Scriptlets replaced with new systemd macros + +* Fri Jul 27 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-5 +- fixed build issue on f18 + +* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 16 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-3 +- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX + client, crashes Finder netatalk-2.2.2-1 + +* Tue Jun 12 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-2 +- fixes: #831001 - netatalk pam configuration has invalid entry + +* Mon Jun 04 2012 Lukas Nykryn <lnykryn(a)redhat.com> 4:2.2.3-1 +- fixes #828205 - update to latest upstream netatalk-2.2.3 + +* Mon Jan 16 2012 Jiri Skala <jskala(a)redhat.com> - 4:2.2.2-1 +- fixes #782049 - update to latest upstream netatalk-2.2.2 + +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-2 +- fixes #501144 - updated and redirected pam config + +* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-1 +- update to latest upstream netatalk-2.2.1 + +* Fri Aug 19 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-4 +- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel + +* Fri Aug 05 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-3 +- fixed missing epoch in sysvinit subpackage and triggers + +* Thu Aug 04 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-2 +- fixes #714448 - systemd-service +- moves SysV initscript to subpackage + +* Fri Jul 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-1 +- update to latest upstream netatalk-2.2.0 + +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 03 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.1.5-1 +- updated to latest upstream version netatalk-2.1.5 + +* Mon Oct 18 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.4-1 +- updated to latest upstream version + +* Mon Jul 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.3-1 +- updated to latest upstream version +- added license texts to devel subpackage + +* Wed Jun 30 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.2-1 +- updated to latest upstream version + +* Fri May 28 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.1-1 +- updated to latest upstream version +- fixes #594999 - Summary and Description are old-fashioned +- renamed initscript +- initscript modified to be POSIX compliant + +* Wed May 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1-1 +- updated to latest upstream version + +* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-2 +- oops forgot upload new sources => shifted release number + +* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-1 +- updated to latest upstream version + +* Mon Nov 23 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-5 +- added BuildRequires: ... libgcrypt-devel +- removed outdated atalk.init + +* Tue Sep 15 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-4 +- fixed #473943 + +* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.4-3 +- rebuilt with new openssl + +* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 14 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-1 +- updated to latest upstream version + +* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 16 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-26 +- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability + +* Tue Jan 27 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-25 +- fixed epoch in the subpackage requires + +* Fri Jan 23 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-24 +- fix #473186 conflict timeout with coreutils + +* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.3-23 +- rebuild with new openssl + +* Wed Dec 03 2008 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-22 +- fix #473939 netatalk-2.0.3-21.fc10 disable quota + +* Mon Oct 13 2008 Jiri Skala <jskala(a)redhat.com> - 4:2.0.3-21 +- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches + +* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 4:2.0.3-20 +- fix license tag + +* Thu Mar 06 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-19 +- fix chmod o+x (#225085) +- increase the maximum number of cnid_dbd processes to 512 (#232805) +- papd now writes debugging output to stderr when invoked with -d (#150021) +- fix multiarch conflict for netatalk-devel (#342681) + +* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-18 +- make init script LSB compliant (#246993) + +* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-17 +- fix unowned directories (#233889) + +* Mon Feb 11 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-16 +- rebuild for gcc-4.3 + +* Tue Dec 04 2007 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-15.1 +- rebuild + +* Wed Sep 12 2007 Maros Barabas <mbarabas(a)redhat.com> -4:2.0.3-15 +- patch to build on FC, bad open call + +* Tue Sep 11 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-13 +- rebuild + +* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 +- Rebuild for selinux ppc32 issue. + +* Thu May 10 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.4-11 +- fix from merge review +- Resolves #226190 + +* Tue Apr 17 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-10 +- fix fiew problems in spec + +* Tue Jan 23 2007 Jindrich Novy <jnovy(a)redhat.com> - 4:2.0.3-9 +- rebuild against new db4 + +* Mon Dec 04 2006 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-8 +- BuildRequires changed from cracklib to cracklib-devel + +* Fri Aug 18 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-7 +- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* + (#203001) +- Add dist tag + +* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-6.fc6.1 +- rebuild + +* Fri Jun 09 2006 Jason Vas Dias <jvdias(a)redhat.com> - 4:2.0.3-6.fc6 +- rebuild for broken libgssapi deps and brew build + +* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-4.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jason Vas Dias <jvdias(a)redhat.com> +- rebuild for new gcc, glibc, glibc-kernheaders + +* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> +- rebuilt + +* Wed Nov 09 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Rebuild for new openssl dependencies + +* Thu Oct 13 2005 Tomas Mraz <tmraz(a)redhat.com> +- use include instead of pam_stack in pam config + +* Wed Jul 20 2005 Bill Nottingham <notting(a)redhat.com> +- don't run by default + +* Thu Jun 16 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Upgrade to upstream version 2.0.3 +- fix bug 160486: use netatalk's initscript + +* Wed Mar 30 2005 Florian La Roche <laroche(a)redhat.com> +- quick fix: rm -f /usr/include/netatalk/at.h until this + is resolved the correct way + +* Mon Mar 07 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Fix for gcc4 compilation: extern_ucreator.patch + +* Mon Feb 21 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Upgraded to upstream version 2.0.2 . + +* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com> +- rebuilt + +* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com> +- rebuilt + +* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com> +- rebuilt + +* Wed Jan 07 2004 Florian La Roche <Florian.LaRoche(a)redhat.de> +- 1.6.4 + +* Fri Aug 1 2003 Charlie Bennett <ccb(a)redhat.com> +- Update with 1.6.3 upstream sources + +* Tue Jul 29 2003 Elliot Lee <sopwith(a)redhat.com> +- Rebuild +- Fix perl multilib path editing +- Add pathcat patch + +* Thu May 1 2003 Elliot Lee <sopwith(a)redhat.com> 1.5.5-7 +- Make multilib generic +- Add builddep on quota (for rpcsvc/rquota.h) + +* Tue Feb 18 2003 Bill Nottingham <notting(a)redhat.com> 1.5.5-5 +- fix initscript error (#82118) + +* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com> +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai <nalin(a)redhat.com> 1.5.5-3 +- patch for compile errors with new ssl libs +- rebuildfedora + +* Mon Dec 02 2002 Florian La Roche <Florian.LaRoche(a)redhat.de> +- postun should never fail + +* Thu Nov 28 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.5-1 +- Updated to 1.5.5 + +* Tue Jun 25 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-4 +- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) +- Fixed missing /usr/share/netatalk dir (#67222) + +* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com> 1.5.3.1-2 +- automated rebuild + +* Tue Jun 18 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-1 +- Updated to latest version 1.5.3.1. +- Fixed bug for nls file lookup (#66300). + +* Mon May 27 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-4 +- Fixed initscript bug where you can't use blanks inside of names (#64926). + +* Wed Apr 10 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-3 +- Fixed initscript to use correct config files from /etc/atalk (#62803) +- Changed initscript to use $0 instead of direct string (#61734) +- Change Copyright to Licencse and switch from BSD to GPL (#61746) + +* Thu Mar 14 2002 Bill Nottingham <notting(a)redhat.com> +- don't run by default + +* Wed Mar 13 2002 Bill Nottingham <notting(a)redhat.com> +- it's back + +* Fri Mar 2 2001 Tim Powers <timp(a)redhat.com> +- rebuilt against openssl-0.9.6-1 + +* Sun Feb 25 2001 Tim Powers <timp(a)redhat.com> +- fixed bug 29370. This package is trying to include a file glibc already includes + +* Tue Jan 23 2001 Tim Powers <timp(a)redhat.com> +- updated initscript + +* Thu Jan 04 2001 Than Ngo <than(a)redhat.com> +- fixed uams-path +- added noreplace to %%config + +* Mon Nov 20 2000 Tim Powers <timp(a)redhat.com> +- rebuilt to fix bad dir perms + +* Fri Nov 10 2000 Than Ngo <than(a)redhat.com> +- update to 1.5pre2 (bug #19737, #20397) +- update Url and ftp site +- clean up specfile +- netatalk-1.4b2+asun obsolete + +* Mon Aug 07 2000 Than Ngo <than(a)redhat.de> +- fix dependency with glibc-devel (Bug #15589) +- fix typo in description (Bug #15479) + +* Wed Aug 2 2000 Tim Powers <timp(a)redhat.com> +- fix symlinks not being relative. + +* Fri Jul 28 2000 Than Ngo <than(a)redhat.de> +- add missing restart function in startup script + +* Fri Jul 28 2000 Tim Powers <timp(a)redhat.com> +- fixed initscripts so that condrestart doesn't return 1 when the test fails + +* Mon Jul 24 2000 Prospector <prospector(a)redhat.com> +- rebuilt + +* Sun Jul 23 2000 Tim Powers <timp(a)redhat.com> +- rebuilt + +* Mon Jul 17 2000 Tim Powers <timp(a)redhat.com> +- inits back to rc.d/init.d, using service to start inits + +* Wed Jul 12 2000 Than Ngo <than(a)redhat.de> +- rebuilt + +* Thu Jul 06 2000 Tim Powers <timp(a)redhat.com> +- fixed broken PreReq, now PreReq's /etc/init.d + +* Tue Jun 27 2000 Than Ngo <than(a)redhat.de> +- remove prereq initscripts, add requires initscripts +- clean up specfile + +* Mon Jun 26 2000 Than Ngo <than(a)redhat.de> +- /etc/rc.d/init.d -> /etc/init.d +- add condrestart directive +- fix post/preun/postun scripts +- prereq initscripts >= 5.20 + +* Tue Jun 20 2000 Tim Powers <timp(a)redhat.com> +- fixed bug 11420 concerning the building with -O2. + +* Thu Jun 8 2000 Tim Powers <timp(a)redhat.com> +- fix bug #11978 +- fix man page locations to be FHS compliant + +* Thu Jun 1 2000 Nalin Dahyabhai <nalin(a)redhat.com> +- modify PAM setup to use system-auth + +* Thu Dec 16 1999 Tim Powers <timp(a)redhat.com> +- renewed source so it is pristine, delete the problematic files in spec file + instead +- general spec file cleanups, create buildroot and dirs in the %%install + section +- strip binaries +- gzip man pages +- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too +- changed group +- added %%defattr to %%files section + +* Tue Aug 3 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- rpm-3.0 needs to remove vogus files from source. + Removed files: etc/papd/.#magics.c, etc/.#diff + +* Fri Jul 30 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Change Copyright tag to BSD. + Add /usr/bin/adv1tov2. + +* Thu Apr 22 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Correct librpcsvc.patch. Move %%changelog section last. + Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since + LinuxPPC may need. + +* Wed Mar 31 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. + +* Sat Mar 20 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Correct symbolic links to psf. + + Remove asciize function from nbplkup so as to display Japanese hostname. +* Thu Mar 11 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> + +- Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping + containd in Internet Config Preference. + +* Tue Mar 2 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- [asun2.1.3] + +* Mon Feb 15 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2-8] + +* Sun Feb 7 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2-6] + +* Mon Jan 25 1999 iNOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2-3] + +* Thu Dec 17 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2] + Remove crlf patch. It is now a server's option. + +* Thu Dec 3 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz + Add uams directory + +* Sat Nov 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.1-3 source. + +* Mon Nov 23 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.1-2 source. + +* Mon Nov 16 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Fix rcX.d's symbolic links. + +* Wed Oct 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. + +* Sat Oct 24 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. + +* Mon Oct 5 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-10a source. + +* Sat Sep 19 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-8 source. Add chkconfig support. + +* Sat Sep 12 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Comment out -DCRLF. Use RPM_OPT_FLAGS. + +* Tue Sep 8 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. + +* Sat Aug 22 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-6 source. + +* Mon Jul 27 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-5 source. + +* Tue Jul 21 1998 INOUE Koichi <inoue(a)ma.ns.musashi-techa.c.jp> +- Use pre-asun2.1.0-3 source. + +* Tue Jul 7 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Add afpovertcp entries to /etc/services +- Remove BuildRoot in man8 pages + +* Mon Jun 29 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun + <asun(a)saul9.u.washington.edu> to provide an AppleShareIP file server + +- Included AppleVolumes.system file maintained by Johnson + <johnson(a)stpt.usf.edu> + +* Mon Aug 25 1997 David Gibson <D.Gibson(a)student.anu.edu.au> +- Used a buildroot +- Use RPM_OPT_FLAGS +- Moved configuration parameters/files from atalk.init to /etc/atalk +- Separated devel package +- Built with shared libraries + +* Sun Jul 13 1997 Paul H. Hargrove <hargrove(a)sccm.Stanford.EDU> +- Updated sources from 1.3.3 to 1.4b2 +- Included endian patch for Linux/SPARC +- Use all the configuration files supplied in the source. This has the + following advantages over the ones in the previous rpm release: + + The printer 'lp' isn't automatically placed in papd.conf + + The default file conversion is binary rather than text. +- Automatically add and remove DDP services from /etc/services +- Placed the recommended /etc/services in the documentation +- Changed atalk.init to give daemons a soft kill +- Changed atalk.init to make configuration easier + +* Wed May 28 1997 Mark Cornick <mcornick(a)zorak.gsfc.nasa.gov> +- Updated for /etc/pam.d diff --git a/sources b/sources new file mode 100644 index 0000000..b8bf15d --- /dev/null +++ b/sources @@ -0,0 +1 @@ +831ec8bf9e084b64f965d16c528af299 netatalk-3.1.7.tar.bz2 commit 81611ededd7b668145715779723c60d84ef74003 Author: Till Maas <opensource(a)till.name> Date: Thu May 19 22:34:18 2016 +0200 2016-05-19: Retired orphaned package, because it was orphaned for more than six weeks. diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8302d47..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/netatalk-3.1.7.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..164cb9a --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-05-19: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch deleted file mode 100644 index f289baa..0000000 --- a/netatalk-3.0.1-basedir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 -+++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 -@@ -6,7 +6,7 @@ - ; Global server settings - - ; [Homes] --; basedir regex = /xxxx -+; basedir regex = /home - - ; [My AFP Volume] - ; path = /path/to/volume diff --git a/netatalk-3.1.7-autotools.patch b/netatalk-3.1.7-autotools.patch deleted file mode 100644 index e4b8b28..0000000 --- a/netatalk-3.1.7-autotools.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur netatalk-3.1.7.orig/configure netatalk-3.1.7/configure ---- netatalk-3.1.7.orig/configure 2014-08-29 12:32:50.000000000 +0200 -+++ netatalk-3.1.7/configure 2015-07-23 06:42:17.245794650 +0200 -@@ -17226,8 +17226,8 @@ - - if test x"$compilegssapi" != x"no" ; then - if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then -- export CFLAGS="-I$withval/include" -- export LDFLAGS="-L$withval/${atalk_libname}" -+ export CFLAGS="$CFLAGS -I$withval/include" -+ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI support in $compilegssapi" >&5 - $as_echo "$as_me: checking for GSSAPI support in $compilegssapi" >&6;} - fi -@@ -17382,8 +17382,8 @@ - - if test x"$FOUND_GSSAPI" = x"yes" ; then - # check for functions -- export CFLAGS="$GSSAPI_CFLAGS" -- export LIBS="$GSSAPI_LIBS" -+ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ export LIBS="$LIBS $GSSAPI_LIBS" - ac_fn_c_check_func "$LINENO" "gss_acquire_cred" "ac_cv_func_gss_acquire_cred" - if test "x$ac_cv_func_gss_acquire_cred" = xyes; then : - -diff -Naur netatalk-3.1.7.orig/macros/gssapi-check.m4 netatalk-3.1.7/macros/gssapi-check.m4 ---- netatalk-3.1.7.orig/macros/gssapi-check.m4 2013-10-28 14:43:14.000000000 +0100 -+++ netatalk-3.1.7/macros/gssapi-check.m4 2015-07-23 06:42:12.475826699 +0200 -@@ -18,8 +18,8 @@ - - if test x"$compilegssapi" != x"no" ; then - if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then -- export CFLAGS="-I$withval/include" -- export LDFLAGS="-L$withval/${atalk_libname}" -+ export CFLAGS="$CFLAGS -I$withval/include" -+ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" - AC_MSG_NOTICE([checking for GSSAPI support in $compilegssapi]) - fi - -@@ -64,8 +64,8 @@ - - if test x"$FOUND_GSSAPI" = x"yes" ; then - # check for functions -- export CFLAGS="$GSSAPI_CFLAGS" -- export LIBS="$GSSAPI_LIBS" -+ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" -+ export LIBS="$LIBS $GSSAPI_LIBS" - AC_CHECK_FUNC(gss_acquire_cred, [], [AC_MSG_ERROR([GSSAPI: required function gss_acquire_cred missing])]) - - # Heimdal/MIT compatibility fix diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth deleted file mode 100644 index 2c0c0b2..0000000 --- a/netatalk.pam-system-auth +++ /dev/null @@ -1,16 +0,0 @@ -#%PAM-1.0 -auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so -auth include system-auth -account required pam_nologin.so -account include system-auth -password include system-auth -# pam_selinux.so close should be the first session rule -session required pam_selinux.so close -session required pam_loginuid.so -session optional pam_console.so -# pam_selinux.so open should only be followed by sessions to be executed in the user context -session required pam_selinux.so open -session required pam_namespace.so -session optional pam_keyinit.so force revoke -session include system-auth -session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec deleted file mode 100644 index 65977c9..0000000 --- a/netatalk.spec +++ /dev/null @@ -1,770 +0,0 @@ -%global pkgver $(rpm -qls tracker-devel | grep sparql | grep pc | cut -d"-" -f3 | cut -d"." -f1-2) - -%global xslver $(rpm -q --queryformat "%%{VERSION}" docbook-style-xsl) - -%global _hardened_build 1 - -%global with_acls 1 - -%global with_bdb 1 - -%global with_cracklib 1 - -%global with_docbook 1 - -%global with_dbus 1 - -%global with_dtrace 1 - -%global with_mysql 1 - -%global with_openafs 0 - -%global with_quota 1 - -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global with_systemd 1 -%else -%global with_systemd 0 -%endif - -%global with_tcp_wrappers 1 - -%global with_tracker 1 - -Name: netatalk -Epoch: 5 -Version: 3.1.7 -Release: 2%{?dist} -Summary: Open Source Apple Filing Protocol(AFP) fileserver -License: GPLv2+ -URL: http://netatalk.sourceforge.net/ -Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 -Source1: netatalk.pam-system-auth -# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm -Patch0: netatalk-3.0.1-basedir.patch -# Let macros/gssapi-check.m4 honor CFLAGS/LDFLAGS -Patch1: netatalk-3.1.7-autotools.patch - -BuildRequires: avahi-devel -BuildRequires: bison -%if 0%{?with_cracklib} -BuildRequires: cracklib-devel -%endif -%if 0%{?with_dbus} -BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel -%endif -%if 0%{?with_docbook} -BuildRequires: docbook-style-xsl -%endif -BuildRequires: flex -%if 0%{?with_acls} -BuildRequires: libacl-devel -%endif -BuildRequires: libattr-devel -%if 0%{?with_bdb} -BuildRequires: libdb-devel -%endif -BuildRequires: libevent-devel -BuildRequires: libgcrypt-devel -%if 0%{?with_docbook} -BuildRequires: libxslt -%endif -BuildRequires: krb5-devel -%if 0%{?with_mysql} -BuildRequires: mysql-devel -%endif -%if 0%{?with_openafs} -BuildRequires: openafs-devel -%endif -%if 0%{?with_ldap} -BuildRequires: openldap-devel -%endif -BuildRequires: openssl-devel -BuildRequires: procps-ng -BuildRequires: pam-devel -%if 0%{?with_quota} -BuildRequires: quota-devel -%endif -%if 0%{?with_systemd} -BuildRequires: systemd -%endif -%if 0%{?with_dtrace} -BuildRequires: systemtap-sdt-devel -%endif -%if 0%{?with_tcp_wrappers} -BuildRequires: tcp_wrappers-devel -%endif -BuildRequires: libtdb-devel -%if 0%{?with_tracker} -BuildRequires: tracker-devel -%endif -Requires: dbus-python -%if 0%{?with_systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -%endif - -%description -Netatalk is a freely-available Open Source AFP fileserver. A *NIX/*BSD -system running Netatalk is capable of serving many Macintosh clients -simultaneously as an AppleShare file server (AFP). - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description devel -This package contains libraries and header files for -developing applications that use %{name}. - -%prep -%setup -q -rm -frv libevent/ -%patch0 -p1 -%patch1 -p1 - -# Avoid re-running the autotools -touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 - -# fix permissions -find include $ -name '*.h' -a -executable $ -exec chmod -x {} \; - -%build -%ifarch ppc ppc64 s390 s390x -export CFLAGS="$CFLAGS -fsigned-char" -%endif - -%configure \ - --localstatedir=%{_localstatedir}/lib \ -%if 0%{?with_acls} - --with-acl \ -%endif -%if 0%{?with_cracklib} - --with-cracklib \ -%endif -%if 0%{?with_docbook} - --with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets-%{xslver} \ -%endif - --with-kerberos \ - --with-libgcrypt \ - --with-pam \ - --with-pkgconfdir=%{_sysconfdir}/netatalk/ \ - --with-shadow \ - --with-spotlight \ - --with-tbd=no \ - --with-uams-path=%{_libdir}/atalk \ - --enable-pgp-uam \ - --enable-shared \ - --enable-krbV-uam \ - --enable-overwrite \ -%if 0%{?with_systemd} - --with-init-style=redhat-systemd \ -%else - --with-init-style=redhat-sysv \ -%endif -%if 0%{?with_tracker} - --with-tracker-pkgconfig-version=%{pkgver} \ -%endif - --without-libevent \ - --without-tdb \ - --with-bdb \ - --with-libevent-header=%{_includedir} \ - --with-libevent-lib=%{_libdir} \ - --disable-silent-rules \ - --disable-static - -%make_build -# Build the local docs. -make -C doc/manual html-local - -%install -%make_install -# Ghost lock dir. -mkdir -p %{buildroot}/var/lock/netatalk -# Use specific pam conf. -install -pm644 %{S:1} %{buildroot}%{_sysconfdir}/pam.d/netatalk - -find %{buildroot} -name '*.la' -delete -print - -%check -sh test/afpd/test.sh - -%post -%if 0%{?with_systemd} -%systemd_post netatalk.service -%else -chkconfig --add netatalk -%endif -/sbin/ldconfig - -%preun -%if 0%{?with_systemd} -%systemd_preun netatalk.service -%else -if [ $1 -eq 0 ] ; then - service netatalk stop &> /dev/null - chkconfig --del netatalk &> /dev/null -fi -%endif - -%postun -%if 0%{?with_systemd} -%systemd_postun_with_restart netatalk.service -%else -if [ "$1" -ge "1" ] ; then - service netatalk condrestart >/dev/null 2>&1 || : -fi -%endif -/sbin/ldconfig - -%files -%doc AUTHORS CONTRIBUTORS NEWS -%license COPYING COPYRIGHT -%doc doc/manual/*.html -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf -%dir %{_sysconfdir}/netatalk -%config(noreplace) %{_sysconfdir}/netatalk/afp.conf -%config(noreplace) %{_sysconfdir}/netatalk/dbus-session.conf -%config(noreplace) %{_sysconfdir}/netatalk/extmap.conf -%config(noreplace) %{_sysconfdir}/pam.d/netatalk -%{_bindir}/* -%exclude %{_bindir}/netatalk-config -%{_libdir}/atalk/ -%{_libdir}/libatalk.so.* -%{_mandir}/man*/* -%exclude %{_mandir}/man*/netatalk-config* -%{_sbindir}/* -%if 0%{?with_systemd} -%{_unitdir}/netatalk.service -%else -%{_initrddir}/netatalk -%endif -%ghost %dir /var/lock/netatalk -%{_localstatedir}/lib - -%files devel -%{_bindir}/netatalk-config -%{_datadir}/aclocal/netatalk.m4 -%{_includedir}/atalk/ -%{_libdir}/libatalk.so -%{_mandir}/man*/netatalk-config.1* - -%changelog -* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 5:3.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 5:3.1.7-1 -- Increment epoch. Missed to reset %%release in previous change. - -* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.7-7 -- Upstream update to 3.1.7 (RHBZ#1134783). -- Remove doc from *-devel. -- Add %%license. -- Update %%description from - http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. - -* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.3-4 -- Address F23FTBFS, RHBZ#1239711: - - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). - - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, - netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, - netatalk-2.2.3-sigterm.patch (Unused) - - Add netatalk-3.0.1-basedir.patch. - - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. - - Fix permissions on include-files. - - Remove duplicate %%global with_mysql. - - Enable dbus. - - Add missing "fi" in %%preun. - - Run /sbin/ldconfig in %%postun, %%preun. - - Reflect /var/lock/netatalk is hard-coded into the sources. - - Set --localstatedir=/var/lib (/var/netatalk violates FHS). - -* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 04 2014 Christopher Meng <rpm(a)cicku.me> - 4:3.1.3-1 -- Update to 3.1.3 - -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 24 2014 Tom Mrz <tmraz(a)redhat.com> - 4:2.2.3-10 -- Rebuild for new libgcrypt - -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 17 2013 Petr Pisar <ppisar(a)redhat.com> - 4:2.2.3-8 -- Perl 5.18 rebuild - -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Aug 23 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-6 -- Scriptlets replaced with new systemd macros - -* Fri Jul 27 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-5 -- fixed build issue on f18 - -* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 16 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-3 -- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX - client, crashes Finder netatalk-2.2.2-1 - -* Tue Jun 12 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-2 -- fixes: #831001 - netatalk pam configuration has invalid entry - -* Mon Jun 04 2012 Lukas Nykryn <lnykryn(a)redhat.com> 4:2.2.3-1 -- fixes #828205 - update to latest upstream netatalk-2.2.3 - -* Mon Jan 16 2012 Jiri Skala <jskala(a)redhat.com> - 4:2.2.2-1 -- fixes #782049 - update to latest upstream netatalk-2.2.2 - -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-2 -- fixes #501144 - updated and redirected pam config - -* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-1 -- update to latest upstream netatalk-2.2.1 - -* Fri Aug 19 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-4 -- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel - -* Fri Aug 05 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-3 -- fixed missing epoch in sysvinit subpackage and triggers - -* Thu Aug 04 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-2 -- fixes #714448 - systemd-service -- moves SysV initscript to subpackage - -* Fri Jul 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-1 -- update to latest upstream netatalk-2.2.0 - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 03 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.1.5-1 -- updated to latest upstream version netatalk-2.1.5 - -* Mon Oct 18 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.4-1 -- updated to latest upstream version - -* Mon Jul 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.3-1 -- updated to latest upstream version -- added license texts to devel subpackage - -* Wed Jun 30 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.2-1 -- updated to latest upstream version - -* Fri May 28 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.1-1 -- updated to latest upstream version -- fixes #594999 - Summary and Description are old-fashioned -- renamed initscript -- initscript modified to be POSIX compliant - -* Wed May 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1-1 -- updated to latest upstream version - -* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-2 -- oops forgot upload new sources => shifted release number - -* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-1 -- updated to latest upstream version - -* Mon Nov 23 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-5 -- added BuildRequires: ... libgcrypt-devel -- removed outdated atalk.init - -* Tue Sep 15 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-4 -- fixed #473943 - -* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.4-3 -- rebuilt with new openssl - -* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 14 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-1 -- updated to latest upstream version - -* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.3-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 16 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-26 -- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability - -* Tue Jan 27 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-25 -- fixed epoch in the subpackage requires - -* Fri Jan 23 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-24 -- fix #473186 conflict timeout with coreutils - -* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.3-23 -- rebuild with new openssl - -* Wed Dec 03 2008 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-22 -- fix #473939 netatalk-2.0.3-21.fc10 disable quota - -* Mon Oct 13 2008 Jiri Skala <jskala(a)redhat.com> - 4:2.0.3-21 -- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches - -* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 4:2.0.3-20 -- fix license tag - -* Thu Mar 06 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-19 -- fix chmod o+x (#225085) -- increase the maximum number of cnid_dbd processes to 512 (#232805) -- papd now writes debugging output to stderr when invoked with -d (#150021) -- fix multiarch conflict for netatalk-devel (#342681) - -* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-18 -- make init script LSB compliant (#246993) - -* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-17 -- fix unowned directories (#233889) - -* Mon Feb 11 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-16 -- rebuild for gcc-4.3 - -* Tue Dec 04 2007 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-15.1 -- rebuild - -* Wed Sep 12 2007 Maros Barabas <mbarabas(a)redhat.com> -4:2.0.3-15 -- patch to build on FC, bad open call - -* Tue Sep 11 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-13 -- rebuild - -* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 -- Rebuild for selinux ppc32 issue. - -* Thu May 10 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.4-11 -- fix from merge review -- Resolves #226190 - -* Tue Apr 17 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-10 -- fix fiew problems in spec - -* Tue Jan 23 2007 Jindrich Novy <jnovy(a)redhat.com> - 4:2.0.3-9 -- rebuild against new db4 - -* Mon Dec 04 2006 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-8 -- BuildRequires changed from cracklib to cracklib-devel - -* Fri Aug 18 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-7 -- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* - (#203001) -- Add dist tag - -* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-6.fc6.1 -- rebuild - -* Fri Jun 09 2006 Jason Vas Dias <jvdias(a)redhat.com> - 4:2.0.3-6.fc6 -- rebuild for broken libgssapi deps and brew build - -* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-4.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jason Vas Dias <jvdias(a)redhat.com> -- rebuild for new gcc, glibc, glibc-kernheaders - -* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> -- rebuilt - -* Wed Nov 09 2005 Jason Vas Dias <jvdias(a)redhat.com> -- Rebuild for new openssl dependencies - -* Thu Oct 13 2005 Tomas Mraz <tmraz(a)redhat.com> -- use include instead of pam_stack in pam config - -* Wed Jul 20 2005 Bill Nottingham <notting(a)redhat.com> -- don't run by default - -* Thu Jun 16 2005 Jason Vas Dias <jvdias(a)redhat.com> -- Upgrade to upstream version 2.0.3 -- fix bug 160486: use netatalk's initscript - -* Wed Mar 30 2005 Florian La Roche <laroche(a)redhat.com> -- quick fix: rm -f /usr/include/netatalk/at.h until this - is resolved the correct way - -* Mon Mar 07 2005 Jason Vas Dias <jvdias(a)redhat.com> -- Fix for gcc4 compilation: extern_ucreator.patch - -* Mon Feb 21 2005 Jason Vas Dias <jvdias(a)redhat.com> -- Upgraded to upstream version 2.0.2 . - -* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Wed Jan 07 2004 Florian La Roche <Florian.LaRoche(a)redhat.de> -- 1.6.4 - -* Fri Aug 1 2003 Charlie Bennett <ccb(a)redhat.com> -- Update with 1.6.3 upstream sources - -* Tue Jul 29 2003 Elliot Lee <sopwith(a)redhat.com> -- Rebuild -- Fix perl multilib path editing -- Add pathcat patch - -* Thu May 1 2003 Elliot Lee <sopwith(a)redhat.com> 1.5.5-7 -- Make multilib generic -- Add builddep on quota (for rpcsvc/rquota.h) - -* Tue Feb 18 2003 Bill Nottingham <notting(a)redhat.com> 1.5.5-5 -- fix initscript error (#82118) - -* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com> -- rebuilt - -* Tue Jan 7 2003 Nalin Dahyabhai <nalin(a)redhat.com> 1.5.5-3 -- patch for compile errors with new ssl libs -- rebuildfedora - -* Mon Dec 02 2002 Florian La Roche <Florian.LaRoche(a)redhat.de> -- postun should never fail - -* Thu Nov 28 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.5-1 -- Updated to 1.5.5 - -* Tue Jun 25 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-4 -- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) -- Fixed missing /usr/share/netatalk dir (#67222) - -* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com> 1.5.3.1-2 -- automated rebuild - -* Tue Jun 18 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-1 -- Updated to latest version 1.5.3.1. -- Fixed bug for nls file lookup (#66300). - -* Mon May 27 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-4 -- Fixed initscript bug where you can't use blanks inside of names (#64926). - -* Wed Apr 10 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-3 -- Fixed initscript to use correct config files from /etc/atalk (#62803) -- Changed initscript to use $0 instead of direct string (#61734) -- Change Copyright to Licencse and switch from BSD to GPL (#61746) - -* Thu Mar 14 2002 Bill Nottingham <notting(a)redhat.com> -- don't run by default - -* Wed Mar 13 2002 Bill Nottingham <notting(a)redhat.com> -- it's back - -* Fri Mar 2 2001 Tim Powers <timp(a)redhat.com> -- rebuilt against openssl-0.9.6-1 - -* Sun Feb 25 2001 Tim Powers <timp(a)redhat.com> -- fixed bug 29370. This package is trying to include a file glibc already includes - -* Tue Jan 23 2001 Tim Powers <timp(a)redhat.com> -- updated initscript - -* Thu Jan 04 2001 Than Ngo <than(a)redhat.com> -- fixed uams-path -- added noreplace to %%config - -* Mon Nov 20 2000 Tim Powers <timp(a)redhat.com> -- rebuilt to fix bad dir perms - -* Fri Nov 10 2000 Than Ngo <than(a)redhat.com> -- update to 1.5pre2 (bug #19737, #20397) -- update Url and ftp site -- clean up specfile -- netatalk-1.4b2+asun obsolete - -* Mon Aug 07 2000 Than Ngo <than(a)redhat.de> -- fix dependency with glibc-devel (Bug #15589) -- fix typo in description (Bug #15479) - -* Wed Aug 2 2000 Tim Powers <timp(a)redhat.com> -- fix symlinks not being relative. - -* Fri Jul 28 2000 Than Ngo <than(a)redhat.de> -- add missing restart function in startup script - -* Fri Jul 28 2000 Tim Powers <timp(a)redhat.com> -- fixed initscripts so that condrestart doesn't return 1 when the test fails - -* Mon Jul 24 2000 Prospector <prospector(a)redhat.com> -- rebuilt - -* Sun Jul 23 2000 Tim Powers <timp(a)redhat.com> -- rebuilt - -* Mon Jul 17 2000 Tim Powers <timp(a)redhat.com> -- inits back to rc.d/init.d, using service to start inits - -* Wed Jul 12 2000 Than Ngo <than(a)redhat.de> -- rebuilt - -* Thu Jul 06 2000 Tim Powers <timp(a)redhat.com> -- fixed broken PreReq, now PreReq's /etc/init.d - -* Tue Jun 27 2000 Than Ngo <than(a)redhat.de> -- remove prereq initscripts, add requires initscripts -- clean up specfile - -* Mon Jun 26 2000 Than Ngo <than(a)redhat.de> -- /etc/rc.d/init.d -> /etc/init.d -- add condrestart directive -- fix post/preun/postun scripts -- prereq initscripts >= 5.20 - -* Tue Jun 20 2000 Tim Powers <timp(a)redhat.com> -- fixed bug 11420 concerning the building with -O2. - -* Thu Jun 8 2000 Tim Powers <timp(a)redhat.com> -- fix bug #11978 -- fix man page locations to be FHS compliant - -* Thu Jun 1 2000 Nalin Dahyabhai <nalin(a)redhat.com> -- modify PAM setup to use system-auth - -* Thu Dec 16 1999 Tim Powers <timp(a)redhat.com> -- renewed source so it is pristine, delete the problematic files in spec file - instead -- general spec file cleanups, create buildroot and dirs in the %%install - section -- strip binaries -- gzip man pages -- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too -- changed group -- added %%defattr to %%files section - -* Tue Aug 3 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- rpm-3.0 needs to remove vogus files from source. - Removed files: etc/papd/.#magics.c, etc/.#diff - -* Fri Jul 30 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- Change Copyright tag to BSD. - Add /usr/bin/adv1tov2. - -* Thu Apr 22 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- Correct librpcsvc.patch. Move %%changelog section last. - Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since - LinuxPPC may need. - -* Wed Mar 31 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. - -* Sat Mar 20 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- Correct symbolic links to psf. - - Remove asciize function from nbplkup so as to display Japanese hostname. -* Thu Mar 11 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - -- Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping - containd in Internet Config Preference. - -* Tue Mar 2 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- [asun2.1.3] - -* Mon Feb 15 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- [pre-asun2.1.2-8] - -* Sun Feb 7 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- [pre-asun2.1.2-6] - -* Mon Jan 25 1999 iNOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- [pre-asun2.1.2-3] - -* Thu Dec 17 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- [pre-asun2.1.2] - Remove crlf patch. It is now a server's option. - -* Thu Dec 3 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz - Add uams directory - -* Sat Nov 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.1-3 source. - -* Mon Nov 23 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.1-2 source. - -* Mon Nov 16 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Fix rcX.d's symbolic links. - -* Wed Oct 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. - -* Sat Oct 24 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. - -* Mon Oct 5 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-10a source. - -* Sat Sep 19 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-8 source. Add chkconfig support. - -* Sat Sep 12 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Comment out -DCRLF. Use RPM_OPT_FLAGS. - -* Tue Sep 8 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. - -* Sat Aug 22 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-6 source. - -* Mon Jul 27 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0-5 source. - -* Tue Jul 21 1998 INOUE Koichi <inoue(a)ma.ns.musashi-techa.c.jp> -- Use pre-asun2.1.0-3 source. - -* Tue Jul 7 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Add afpovertcp entries to /etc/services -- Remove BuildRoot in man8 pages - -* Mon Jun 29 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun - <asun(a)saul9.u.washington.edu> to provide an AppleShareIP file server - -- Included AppleVolumes.system file maintained by Johnson - <johnson(a)stpt.usf.edu> - -* Mon Aug 25 1997 David Gibson <D.Gibson(a)student.anu.edu.au> -- Used a buildroot -- Use RPM_OPT_FLAGS -- Moved configuration parameters/files from atalk.init to /etc/atalk -- Separated devel package -- Built with shared libraries - -* Sun Jul 13 1997 Paul H. Hargrove <hargrove(a)sccm.Stanford.EDU> -- Updated sources from 1.3.3 to 1.4b2 -- Included endian patch for Linux/SPARC -- Use all the configuration files supplied in the source. This has the - following advantages over the ones in the previous rpm release: - + The printer 'lp' isn't automatically placed in papd.conf - + The default file conversion is binary rather than text. -- Automatically add and remove DDP services from /etc/services -- Placed the recommended /etc/services in the documentation -- Changed atalk.init to give daemons a soft kill -- Changed atalk.init to make configuration easier - -* Wed May 28 1997 Mark Cornick <mcornick(a)zorak.gsfc.nasa.gov> -- Updated for /etc/pam.d diff --git a/sources b/sources deleted file mode 100644 index b8bf15d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -831ec8bf9e084b64f965d16c528af299 netatalk-3.1.7.tar.bz2 commit 45a0be55a701cfac4fa58d758147a8562994f420 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Feb 4 09:13:56 2016 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index affca66..65977c9 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -35,7 +35,7 @@ Name: netatalk Epoch: 5 Version: 3.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -258,6 +258,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 5:3.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 5:3.1.7-1 - Increment epoch. Missed to reset %%release in previous change. commit 96fd82a7380b100bd6e5cfebfef1c1cc56e7b663 Author: Ralf Corspius <corsepiu(a)fedoraproject.org> Date: Thu Jul 23 16:21:24 2015 +0200 Increment epoch. Missed to reset %release in previous change. diff --git a/netatalk.spec b/netatalk.spec index 5ae250f..affca66 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -33,9 +33,9 @@ %global with_tracker 1 Name: netatalk -Epoch: 4 +Epoch: 5 Version: 3.1.7 -Release: 7%{?dist} +Release: 1%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -258,7 +258,10 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog -* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.7-1 +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 5:3.1.7-1 +- Increment epoch. Missed to reset %%release in previous change. + +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.7-7 - Upstream update to 3.1.7 (RHBZ#1134783). - Remove doc from *-devel. - Add %%license. commit 1ea175cb2a2ee54ca5d2a2bbee3f173df26c68d4 Author: Ralf Corspius <corsepiu(a)fedoraproject.org> Date: Thu Jul 23 15:41:22 2015 +0200 Upstream update to 3.1.7 (RHBZ#1134783). - Remove doc from *-devel. - Add %license. - Update %description from http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. diff --git a/.gitignore b/.gitignore index 7ab92b6..8302d47 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/netatalk-3.1.3.tar.bz2 +/netatalk-3.1.7.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index 597c49b..5ae250f 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -22,7 +22,7 @@ %global with_quota 1 -%if 0%{?fedora} >= 15 || 0%{?el} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %global with_systemd 1 %else %global with_systemd 0 @@ -34,8 +34,8 @@ Name: netatalk Epoch: 4 -Version: 3.1.3 -Release: 4%{?dist} +Version: 3.1.7 +Release: 7%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -113,12 +113,9 @@ Requires(postun): initscripts %endif %description -Netatalk is a freely-available Open Source AFP fileserver. It also provides a -kernel level implementation of the AppleTalk Protocol Suite. A *NIX/*BSD system -running Netatalk is capable of serving many Macintosh clients simultaneously -as an AppleShare file server (AFP), AppleTalk router, *NIX/*BSD print server, -and for accessing AppleTalk printers via Printer Access Protocol (PAP). Included -are a number of minor printing and debugging utilities. +Netatalk is a freely-available Open Source AFP fileserver. A *NIX/*BSD +system running Netatalk is capable of serving many Macintosh clients +simultaneously as an AppleShare file server (AFP). %package devel Summary: Development files for %{name} @@ -229,7 +226,8 @@ fi /sbin/ldconfig %files -%doc AUTHORS CONTRIBUTORS COPYING COPYRIGHT NEWS +%doc AUTHORS CONTRIBUTORS NEWS +%license COPYING COPYRIGHT %doc doc/manual/*.html %config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf %dir %{_sysconfdir}/netatalk @@ -253,7 +251,6 @@ fi %{_localstatedir}/lib %files devel -%doc COPYRIGHT COPYING %{_bindir}/netatalk-config %{_datadir}/aclocal/netatalk.m4 %{_includedir}/atalk/ @@ -261,6 +258,13 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.7-1 +- Upstream update to 3.1.7 (RHBZ#1134783). +- Remove doc from *-devel. +- Add %%license. +- Update %%description from + http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm. + * Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.3-4 - Address F23FTBFS, RHBZ#1239711: - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). diff --git a/sources b/sources index 4844848..b8bf15d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac65dafa20d502a10438fec7e1116b1e netatalk-3.1.3.tar.bz2 +831ec8bf9e084b64f965d16c528af299 netatalk-3.1.7.tar.bz2 commit 04b28517537b7923508d213e0539a8ccf30ea312 Author: Ralf Corspius <corsepiu(a)fedoraproject.org> Date: Thu Jul 23 15:23:54 2015 +0200 Address F23FTBFS, RHBZ#1239711: - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, netatalk-2.2.3-sigterm.patch (Unused) - Add netatalk-3.0.1-basedir.patch. - Mark %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. - Fix permissions on include-files. - Remove duplicate %global with_mysql. - Enable dbus. - Add missing "fi" in %preun. - Run /sbin/ldconfig in %postun, %preun. - Reflect /var/lock/netatalk is hard-coded into the sources. - Set --localstatedir=/var/lib (/var/netatalk violates FHS). diff --git a/.gitignore b/.gitignore index 1b00f6f..7ab92b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1 @@ -netatalk-2.1.3.tar.bz2 -/netatalk-2.1.4.tar.bz2 -/netatalk-2.1.5.tar.bz2 -/netatalk-2.2.0.tar.bz2 -/netatalk-2.2.1.tar.bz2 -/netatalk-2.2.2.tar.bz2 -/netatalk-2.2.3.tar.bz2 /netatalk-3.1.3.tar.bz2 diff --git a/ICDumpSuffixMap b/ICDumpSuffixMap deleted file mode 100644 index 3a8283f..0000000 --- a/ICDumpSuffixMap +++ /dev/null @@ -1 +0,0 @@ -#!perl # # ICDumpMap # --- Dump suffix mappings from your Internet Config extension. # # iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> # use Mac::InternetConfig; open MAP, ">AppleVolumes"; printf MAP "%-9s \"%4s\" \"%4s\" %-30s %-25s %-15s\n\n", ".", "TEXT", "ttxt", "ASCII Text", "SimpleText", "text/plain"; print MAP "\# The following lines are extracted from Internet Config Preference.\n\n"; for my $entry (keys %InternetConfigMap) { next unless $entry->extension =~ /^\./; $_ = sprintf "%-9s \"%4s\" \"%4s\" %-30s %-25s %-15s", $entry->extension, $entry->file_type, $entry->file_creator, $entry->entry_name, $entry->creator_app_name, $entry->MIME_type; s/\s*$/\n/; print MAP; } close MAP; \ No newline at end of file diff --git a/netatalk-2.0.2-uams_no_pie.patch b/netatalk-2.0.2-uams_no_pie.patch deleted file mode 100644 index c41c66f..0000000 --- a/netatalk-2.0.2-uams_no_pie.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie netatalk-2.0.3/etc/uams/Makefile.am ---- netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 -+++ netatalk-2.0.3/etc/uams/Makefile.am 2008-10-10 10:32:59.000000000 +0200 -@@ -1,5 +1,5 @@ - # Makefile.am for etc/uams/ -- -+LDFLAGS = - SUBDIRS = uams_krb4 - - # -diff -up netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie netatalk-2.0.3/macros/gssapi-check.m4 ---- netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 -+++ netatalk-2.0.3/macros/gssapi-check.m4 2008-10-10 10:32:59.000000000 +0200 -@@ -126,7 +126,7 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK], - if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then - AC_DEFINE(HAVE_GSSAPI,1,[Whether to enable GSSAPI support]) - AC_MSG_RESULT([yes]) -- GSSAPI_LIBS="$LDFLAGS $LIBS" -+ GSSAPI_LIBS="$LIBS" - else - AC_MSG_RESULT([no]) - if test x"$compilegssapi" = x"yes"; then diff --git a/netatalk-2.0.4-extern_ucreator.patch b/netatalk-2.0.4-extern_ucreator.patch deleted file mode 100644 index 413ac08..0000000 --- a/netatalk-2.0.4-extern_ucreator.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.4/etc/afpd/desktop.c ---- netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator 2009-07-14 16:26:36.984610055 +0200 -+++ netatalk-2.0.4/etc/afpd/desktop.c 2009-07-14 16:27:01.607580009 +0200 -@@ -312,7 +312,7 @@ addicon_err: - } - - static const u_char utag[] = { 0, 0, 0, 0 }; --static const u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ -+u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ - static const u_char utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/ - static const short usize = 256; - diff --git a/netatalk-2.2.3-libdb4.patch b/netatalk-2.2.3-libdb4.patch deleted file mode 100644 index 0b5ea4c..0000000 --- a/netatalk-2.2.3-libdb4.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/configure b/configure -index eb879af..0e5b407 100755 ---- a/configure -+++ b/configure -@@ -18150,7 +18150,7 @@ if test "x$bdb_required" = "xyes"; then - trybdbdir="" - dobdbsearch=yes - bdb_search_dirs="/usr/local /usr" -- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" -+ search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4" - - bdbfound=no - savedcflags="$CFLAGS" -diff --git a/etc/cnid_dbd/dbd_add.c b/etc/cnid_dbd/dbd_add.c -index 6a818a3..bad57e7 100644 ---- a/etc/cnid_dbd/dbd_add.c -+++ b/etc/cnid_dbd/dbd_add.c -@@ -24,7 +24,7 @@ - #include <atalk/cnid_dbd_private.h> - #include <atalk/cnid.h> - #ifdef HAVE_DB4_DB_H --#include <db4/db.h> -+#include <libdb4/db.h> - #else - #include <db.h> - #endif -diff --git a/macros/db3-check.m4 b/macros/db3-check.m4 -index 2cc59cb..ef58e15 100644 ---- a/macros/db3-check.m4 -+++ b/macros/db3-check.m4 -@@ -87,7 +87,7 @@ AC_DEFUN([AC_PATH_BDB],[ - trybdbdir="" - dobdbsearch=yes - bdb_search_dirs="/usr/local /usr" -- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" -+ search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4" - - bdbfound=no - savedcflags="$CFLAGS" diff --git a/netatalk-2.2.3-sigterm.patch b/netatalk-2.2.3-sigterm.patch deleted file mode 100644 index 169a0d6..0000000 --- a/netatalk-2.2.3-sigterm.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 25e03ec9edd863136008881a4a57ea9a788d34b3 Mon Sep 17 00:00:00 2001 -From: Frank Lahm <franklahm(a)googlemail.com> -Date: Mon, 18 Jun 2012 16:26:28 +0200 -Subject: [PATCH] Block SIGTERM when calling pam_close_session - ---- - etc/afpd/afp_dsi.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c -index bf454e1..6c6bc7d 100644 ---- a/etc/afpd/afp_dsi.c -+++ b/etc/afpd/afp_dsi.c -@@ -80,7 +80,8 @@ static sigjmp_buf recon_jmp; - static void afp_dsi_close(AFPObj *obj) - { - DSI *dsi = obj->handle; -- -+ sigset_t sigs; -+ - close(obj->ipc_fd); - obj->ipc_fd = -1; - -@@ -97,8 +98,14 @@ static void afp_dsi_close(AFPObj *obj) - } - - close_all_vol(); -- if (obj->logout) -+ -+ if (obj->logout) { -+ /* Block SIGTERM, PAM might send us a SIGTERM in (*obj->logout)() -> pam_close_session() */ -+ pthread_sigmask(SIG_BLOCK, &sigs, NULL); -+ sigemptyset(&sigs); -+ sigaddset(&sigs, SIGTERM); - (*obj->logout)(); -+ } - - LOG(log_note, logtype_afpd, "AFP statistics: %.2f KB read, %.2f KB written", - dsi->read_count/1024.0, dsi->write_count/1024.0); --- -1.7.4.1 - -From d8f375c4fbff7a27768ce6efebec64ab193734ee Mon Sep 17 00:00:00 2001 -From: Frank Lahm <franklahm(a)googlemail.com> -Date: Wed, 20 Jun 2012 15:33:26 +0200 -Subject: [PATCH] Fix signal blocking, pthread_sigmask was called before mask initialisation. Also block all sigs instead of only SIGTERM (think I saw SIGHUP somewhere). - ---- - etc/afpd/afp_dsi.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c -index 6c6bc7d..7779b23 100644 ---- a/etc/afpd/afp_dsi.c -+++ b/etc/afpd/afp_dsi.c -@@ -100,10 +100,9 @@ static void afp_dsi_close(AFPObj *obj) - close_all_vol(); - - if (obj->logout) { -- /* Block SIGTERM, PAM might send us a SIGTERM in (*obj->logout)() -> pam_close_session() */ -+ /* Block sigs, PAM/systemd/whoever might send us a SIG??? in (*obj->logout)() -> pam_close_session() */ -+ sigfillset(&sigs); - pthread_sigmask(SIG_BLOCK, &sigs, NULL); -- sigemptyset(&sigs); -- sigaddset(&sigs, SIGTERM); - (*obj->logout)(); - } - --- -1.7.4.1 - diff --git a/netatalk-3.0.1-basedir.patch b/netatalk-3.0.1-basedir.patch new file mode 100644 index 0000000..f289baa --- /dev/null +++ b/netatalk-3.0.1-basedir.patch @@ -0,0 +1,11 @@ +--- netatalk-3.0.1/config/afp.conf.tmpl.basedir 2012-04-20 21:22:18.000000000 +0900 ++++ netatalk-3.0.1/config/afp.conf.tmpl 2013-01-10 01:17:47.345537233 +0900 +@@ -6,7 +6,7 @@ + ; Global server settings + + ; [Homes] +-; basedir regex = /xxxx ++; basedir regex = /home + + ; [My AFP Volume] + ; path = /path/to/volume diff --git a/netatalk-3.1.7-autotools.patch b/netatalk-3.1.7-autotools.patch new file mode 100644 index 0000000..e4b8b28 --- /dev/null +++ b/netatalk-3.1.7-autotools.patch @@ -0,0 +1,50 @@ +diff -Naur netatalk-3.1.7.orig/configure netatalk-3.1.7/configure +--- netatalk-3.1.7.orig/configure 2014-08-29 12:32:50.000000000 +0200 ++++ netatalk-3.1.7/configure 2015-07-23 06:42:17.245794650 +0200 +@@ -17226,8 +17226,8 @@ + + if test x"$compilegssapi" != x"no" ; then + if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then +- export CFLAGS="-I$withval/include" +- export LDFLAGS="-L$withval/${atalk_libname}" ++ export CFLAGS="$CFLAGS -I$withval/include" ++ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI support in $compilegssapi" >&5 + $as_echo "$as_me: checking for GSSAPI support in $compilegssapi" >&6;} + fi +@@ -17382,8 +17382,8 @@ + + if test x"$FOUND_GSSAPI" = x"yes" ; then + # check for functions +- export CFLAGS="$GSSAPI_CFLAGS" +- export LIBS="$GSSAPI_LIBS" ++ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ export LIBS="$LIBS $GSSAPI_LIBS" + ac_fn_c_check_func "$LINENO" "gss_acquire_cred" "ac_cv_func_gss_acquire_cred" + if test "x$ac_cv_func_gss_acquire_cred" = xyes; then : + +diff -Naur netatalk-3.1.7.orig/macros/gssapi-check.m4 netatalk-3.1.7/macros/gssapi-check.m4 +--- netatalk-3.1.7.orig/macros/gssapi-check.m4 2013-10-28 14:43:14.000000000 +0100 ++++ netatalk-3.1.7/macros/gssapi-check.m4 2015-07-23 06:42:12.475826699 +0200 +@@ -18,8 +18,8 @@ + + if test x"$compilegssapi" != x"no" ; then + if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto" ; then +- export CFLAGS="-I$withval/include" +- export LDFLAGS="-L$withval/${atalk_libname}" ++ export CFLAGS="$CFLAGS -I$withval/include" ++ export LDFLAGS="$LDFLAGS -L$withval/${atalk_libname}" + AC_MSG_NOTICE([checking for GSSAPI support in $compilegssapi]) + fi + +@@ -64,8 +64,8 @@ + + if test x"$FOUND_GSSAPI" = x"yes" ; then + # check for functions +- export CFLAGS="$GSSAPI_CFLAGS" +- export LIBS="$GSSAPI_LIBS" ++ export CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ export LIBS="$LIBS $GSSAPI_LIBS" + AC_CHECK_FUNC(gss_acquire_cred, [], [AC_MSG_ERROR([GSSAPI: required function gss_acquire_cred missing])]) + + # Heimdal/MIT compatibility fix diff --git a/netatalk.spec b/netatalk.spec index c7e77a6..597c49b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -12,9 +12,9 @@ %global with_docbook 1 -%global with_dtrace 1 +%global with_dbus 1 -%global with_mysql 1 +%global with_dtrace 1 %global with_mysql 1 @@ -35,13 +35,17 @@ Name: netatalk Epoch: 4 Version: 3.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: netatalk.pam-system-auth -#Patch2: netatalk-2.0.4-extern_ucreator.patch +# From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm +Patch0: netatalk-3.0.1-basedir.patch +# Let macros/gssapi-check.m4 honor CFLAGS/LDFLAGS +Patch1: netatalk-3.1.7-autotools.patch + BuildRequires: avahi-devel BuildRequires: bison %if 0%{?with_cracklib} @@ -127,7 +131,14 @@ developing applications that use %{name}. %prep %setup -q rm -frv libevent/ -#patch2 -p1 -b .extern_ucreator +%patch0 -p1 +%patch1 -p1 + +# Avoid re-running the autotools +touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4 + +# fix permissions +find include $ -name '*.h' -a -executable $ -exec chmod -x {} \; %build %ifarch ppc ppc64 s390 s390x @@ -135,6 +146,7 @@ export CFLAGS="$CFLAGS -fsigned-char" %endif %configure \ + --localstatedir=%{_localstatedir}/lib \ %if 0%{?with_acls} --with-acl \ %endif @@ -179,7 +191,7 @@ make -C doc/manual html-local %install %make_install # Ghost lock dir. -mkdir -p %{buildroot}%{_localstatedir}/lock/netatalk +mkdir -p %{buildroot}/var/lock/netatalk # Use specific pam conf. install -pm644 %{S:1} %{buildroot}%{_sysconfdir}/pam.d/netatalk @@ -194,6 +206,7 @@ sh test/afpd/test.sh %else chkconfig --add netatalk %endif +/sbin/ldconfig %preun %if 0%{?with_systemd} @@ -202,6 +215,7 @@ chkconfig --add netatalk if [ $1 -eq 0 ] ; then service netatalk stop &> /dev/null chkconfig --del netatalk &> /dev/null +fi %endif %postun @@ -212,11 +226,12 @@ if [ "$1" -ge "1" ] ; then service netatalk condrestart >/dev/null 2>&1 || : fi %endif +/sbin/ldconfig %files %doc AUTHORS CONTRIBUTORS COPYING COPYRIGHT NEWS %doc doc/manual/*.html -%config %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf %dir %{_sysconfdir}/netatalk %config(noreplace) %{_sysconfdir}/netatalk/afp.conf %config(noreplace) %{_sysconfdir}/netatalk/dbus-session.conf @@ -234,8 +249,8 @@ fi %else %{_initrddir}/netatalk %endif -%ghost %dir %{_localstatedir}/lock/netatalk -%{_localstatedir}/netatalk/ +%ghost %dir /var/lock/netatalk +%{_localstatedir}/lib %files devel %doc COPYRIGHT COPYING @@ -246,6 +261,22 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Thu Jul 23 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 4:3.1.3-4 +- Address F23FTBFS, RHBZ#1239711: + - Add netatalk-3.1.7-autotools.patch (Fix RHBZ#1160730). + - Remove ICDumpSuffixMap, netatalk-2.0.2-uams_no_pie.patch, + netatalk-2.0.4-extern_ucreator.patch, netatalk-2.2.3-libdb4.patch, + netatalk-2.2.3-sigterm.patch (Unused) + - Add netatalk-3.0.1-basedir.patch. + - Mark %%{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf noreplace. + - Fix permissions on include-files. + - Remove duplicate %%global with_mysql. + - Enable dbus. + - Add missing "fi" in %%preun. + - Run /sbin/ldconfig in %%postun, %%preun. + - Reflect /var/lock/netatalk is hard-coded into the sources. + - Set --localstatedir=/var/lib (/var/netatalk violates FHS). + * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild commit 43215bb9cebba6e23cae056673e2b1b4bb177659 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Wed Jun 17 21:39:27 2015 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index 377dca4..c7e77a6 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -35,7 +35,7 @@ Name: netatalk Epoch: 4 Version: 3.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -246,6 +246,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild commit b08b13d4c3607b5b6cb1c69c3964e401f7958c2b Author: Peter Robinson <pbrobinson(a)fedoraproject.org> Date: Sun Aug 17 11:29:35 2014 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index 89cfd44..377dca4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -35,7 +35,7 @@ Name: netatalk Epoch: 4 Version: 3.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Source Apple Filing Protocol(AFP) fileserver License: GPLv2+ URL: http://netatalk.sourceforge.net/ @@ -246,6 +246,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jul 04 2014 Christopher Meng <rpm(a)cicku.me> - 4:3.1.3-1 - Update to 3.1.3 commit 819aa9faf58105cd8ca5fc6bba14bf5ac7939fd5 Author: Christopher Meng <i(a)cicku.me> Date: Sat Jul 5 12:16:17 2014 +0800 Fix wrong conditional line. diff --git a/netatalk.spec b/netatalk.spec index 2a7e066..89cfd44 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -68,10 +68,10 @@ BuildRequires: libgcrypt-devel BuildRequires: libxslt %endif BuildRequires: krb5-devel -%if 0%{?with_openafs} %if 0%{?with_mysql} BuildRequires: mysql-devel %endif +%if 0%{?with_openafs} BuildRequires: openafs-devel %endif %if 0%{?with_ldap} commit f6bbe96ceec5c44fc92909c882f9521be4a295ff Author: Christopher Meng <i(a)cicku.me> Date: Sat Jul 5 11:41:26 2014 +0800 Update to 3.1.3 diff --git a/.gitignore b/.gitignore index e61d96b..1b00f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.2.1.tar.bz2 /netatalk-2.2.2.tar.bz2 /netatalk-2.2.3.tar.bz2 +/netatalk-3.1.3.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index 0b34b13..2a7e066 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,27 +1,112 @@ -Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh -Name: netatalk -Version: 2.2.3 -Release: 11%{?dist} -Epoch: 4 -License: GPLv2+ -Group: System Environment/Daemons -Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 -Source2: netatalk.pam-system-auth - -Patch1: netatalk-2.0.2-uams_no_pie.patch -Patch2: netatalk-2.0.4-extern_ucreator.patch -Patch3: netatalk-2.2.3-sigterm.patch -Patch4: netatalk-2.2.3-libdb4.patch - -Url: http://netatalk.sourceforge.net/ -Requires: pam -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake -BuildRequires: autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel -BuildRequires: avahi-devel libacl-devel openldap-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%global pkgver $(rpm -qls tracker-devel | grep sparql | grep pc | cut -d"-" -f3 | cut -d"." -f1-2) + +%global xslver $(rpm -q --queryformat "%%{VERSION}" docbook-style-xsl) + +%global _hardened_build 1 + +%global with_acls 1 + +%global with_bdb 1 + +%global with_cracklib 1 + +%global with_docbook 1 + +%global with_dtrace 1 + +%global with_mysql 1 + +%global with_mysql 1 + +%global with_openafs 0 + +%global with_quota 1 + +%if 0%{?fedora} >= 15 || 0%{?el} >= 7 +%global with_systemd 1 +%else +%global with_systemd 0 +%endif + +%global with_tcp_wrappers 1 + +%global with_tracker 1 + +Name: netatalk +Epoch: 4 +Version: 3.1.3 +Release: 1%{?dist} +Summary: Open Source Apple Filing Protocol(AFP) fileserver +License: GPLv2+ +URL: http://netatalk.sourceforge.net/ +Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 +Source1: netatalk.pam-system-auth +#Patch2: netatalk-2.0.4-extern_ucreator.patch +BuildRequires: avahi-devel +BuildRequires: bison +%if 0%{?with_cracklib} +BuildRequires: cracklib-devel +%endif +%if 0%{?with_dbus} +BuildRequires: dbus-devel +BuildRequires: dbus-glib-devel +%endif +%if 0%{?with_docbook} +BuildRequires: docbook-style-xsl +%endif +BuildRequires: flex +%if 0%{?with_acls} +BuildRequires: libacl-devel +%endif +BuildRequires: libattr-devel +%if 0%{?with_bdb} +BuildRequires: libdb-devel +%endif +BuildRequires: libevent-devel +BuildRequires: libgcrypt-devel +%if 0%{?with_docbook} +BuildRequires: libxslt +%endif +BuildRequires: krb5-devel +%if 0%{?with_openafs} +%if 0%{?with_mysql} +BuildRequires: mysql-devel +%endif +BuildRequires: openafs-devel +%endif +%if 0%{?with_ldap} +BuildRequires: openldap-devel +%endif +BuildRequires: openssl-devel +BuildRequires: procps-ng +BuildRequires: pam-devel +%if 0%{?with_quota} +BuildRequires: quota-devel +%endif +%if 0%{?with_systemd} +BuildRequires: systemd +%endif +%if 0%{?with_dtrace} +BuildRequires: systemtap-sdt-devel +%endif +%if 0%{?with_tcp_wrappers} +BuildRequires: tcp_wrappers-devel +%endif +BuildRequires: libtdb-devel +%if 0%{?with_tracker} +BuildRequires: tracker-devel +%endif +Requires: dbus-python +%if 0%{?with_systemd} +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%else +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +Requires(postun): initscripts +%endif %description Netatalk is a freely-available Open Source AFP fileserver. It also provides a @@ -31,140 +116,139 @@ as an AppleShare file server (AFP), AppleTalk router, *NIX/*BSD print server, and for accessing AppleTalk printers via Printer Access Protocol (PAP). Included are a number of minor printing and debugging utilities. -%package devel -Summary: Headers for Appletalk development -Group: Development/Libraries +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -%description devel -This package contains the header files for building Appletalk networking -programs. +%description devel +This package contains libraries and header files for +developing applications that use %{name}. %prep %setup -q - -%patch1 -p1 -b .uams_no_pie -%patch2 -p1 -b .extern_ucreator -%patch3 -p1 -b .sigterm -%patch4 -p1 -b .libdb4 - -ln -s ./NEWS ChangeLog +rm -frv libevent/ +#patch2 -p1 -b .extern_ucreator %build -touch AUTHORS -libtoolize --force -aclocal -I macros -automake --add-missing -autoconf -autoheader -export CFLAGS="$RPM_OPT_FLAGS" -%ifnarch x86_64 -# XXX : enable for x86_64 when glibc bug 149284 is fixed! -export CFLAGS="$CFLAGS -fPIE" -export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen" -%endif %ifarch ppc ppc64 s390 s390x export CFLAGS="$CFLAGS -fsigned-char" %endif %configure \ - --with-pkgconfdir=/etc/netatalk/ \ - --with-cracklib \ - --with-pam \ - --with-shadow \ - --with-uams-path=%{_libdir}/atalk \ - --enable-shared \ - --enable-krbV-uam \ - --enable-overwrite \ - --with-gnu-ld \ - --enable-redhat-systemd \ - --with-libgcrypt - -# Grrrr. Fix broken libtool/autoFOO Makefiles. -if [ "%{_lib}" != lib ]; then - find . -name Makefile | xargs perl -pi \ - -e 's,-L/usr/lib,-L%{_libdir},g' - find . -name Makefile | xargs perl -pi \ - -e 's,-L/lib,-L/%{_lib},g' -fi - -make %{?_smp_mflags} all +%if 0%{?with_acls} + --with-acl \ +%endif +%if 0%{?with_cracklib} + --with-cracklib \ +%endif +%if 0%{?with_docbook} + --with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets-%{xslver} \ +%endif + --with-kerberos \ + --with-libgcrypt \ + --with-pam \ + --with-pkgconfdir=%{_sysconfdir}/netatalk/ \ + --with-shadow \ + --with-spotlight \ + --with-tbd=no \ + --with-uams-path=%{_libdir}/atalk \ + --enable-pgp-uam \ + --enable-shared \ + --enable-krbV-uam \ + --enable-overwrite \ +%if 0%{?with_systemd} + --with-init-style=redhat-systemd \ +%else + --with-init-style=redhat-sysv \ +%endif +%if 0%{?with_tracker} + --with-tracker-pkgconfig-version=%{pkgver} \ +%endif + --without-libevent \ + --without-tdb \ + --with-bdb \ + --with-libevent-header=%{_includedir} \ + --with-libevent-lib=%{_libdir} \ + --disable-silent-rules \ + --disable-static + +%make_build +# Build the local docs. +make -C doc/manual html-local %install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - -# install example config files in doc -mkdir config.example -cp -fp config/afpd.conf config.example -cp -fp config/AppleVolumes.system config.example -cp -fp config/AppleVolumes.default config.example -cp -fp config/atalkd.conf config.example -cp -fp config/atalkd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk -cp -fp config/netatalk.conf config.example -cp -fp config/papd.conf config.example -cp -fp config/papd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk -mkdir -p $RPM_BUILD_ROOT/usr/share/netatalk -cp -fp etc/psf/pagecount.ps $RPM_BUILD_ROOT/usr/share/netatalk - -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/netatalk - -# XXX bad hack until this file is updated in glibc-headers: -rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h - -# Clean up .a and .la files -find $RPM_BUILD_ROOT -name \*.a -exec rm {} \; -find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; - -%clean -rm -rf $RPM_BUILD_ROOT +%make_install +# Ghost lock dir. +mkdir -p %{buildroot}%{_localstatedir}/lock/netatalk +# Use specific pam conf. +install -pm644 %{S:1} %{buildroot}%{_sysconfdir}/pam.d/netatalk + +find %{buildroot} -name '*.la' -delete -print + +%check +sh test/afpd/test.sh %post +%if 0%{?with_systemd} %systemd_post netatalk.service +%else +chkconfig --add netatalk +%endif %preun +%if 0%{?with_systemd} %systemd_preun netatalk.service +%else +if [ $1 -eq 0 ] ; then + service netatalk stop &> /dev/null + chkconfig --del netatalk &> /dev/null +%endif %postun +%if 0%{?with_systemd} %systemd_postun_with_restart netatalk.service +%else +if [ "$1" -ge "1" ] ; then + service netatalk condrestart >/dev/null 2>&1 || : +fi +%endif %files -%defattr(-,root,root) -%doc COPYRIGHT COPYING ChangeLog VERSION NEWS -%doc doc -%doc config.example +%doc AUTHORS CONTRIBUTORS COPYING COPYRIGHT NEWS +%doc doc/manual/*.html +%config %{_sysconfdir}/dbus-1/system.d/netatalk-dbus.conf %dir %{_sysconfdir}/netatalk -/lib/systemd/system/netatalk.service -/usr/libexec/netatalk/netatalk.sh -%config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.default -%config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.system -%config(noreplace) %{_sysconfdir}/netatalk/netatalk.conf -%config(noreplace) %{_sysconfdir}/netatalk/afpd.conf -%config(noreplace) %{_sysconfdir}/netatalk/atalkd.conf -%config(noreplace) %{_sysconfdir}/netatalk/papd.conf -%config(noreplace) %{_sysconfdir}/netatalk/afp_ldap.conf +%config(noreplace) %{_sysconfdir}/netatalk/afp.conf +%config(noreplace) %{_sysconfdir}/netatalk/dbus-session.conf +%config(noreplace) %{_sysconfdir}/netatalk/extmap.conf %config(noreplace) %{_sysconfdir}/pam.d/netatalk -%{_sbindir}/* %{_bindir}/* %exclude %{_bindir}/netatalk-config +%{_libdir}/atalk/ +%{_libdir}/libatalk.so.* %{_mandir}/man*/* %exclude %{_mandir}/man*/netatalk-config* -%{_datadir}/netatalk -%dir %{_libdir}/atalk -%{_libdir}/atalk/*.so +%{_sbindir}/* +%if 0%{?with_systemd} +%{_unitdir}/netatalk.service +%else +%{_initrddir}/netatalk +%endif +%ghost %dir %{_localstatedir}/lock/netatalk +%{_localstatedir}/netatalk/ %files devel -%defattr(-,root,root) %doc COPYRIGHT COPYING -%dir %{_includedir}/atalk -%dir %{_includedir}/netatalk -%attr(0644,root,root) %{_includedir}/atalk/* -%attr(0644,root,root) %{_includedir}/netatalk/* -%{_datadir}/aclocal/netatalk.m4 %{_bindir}/netatalk-config +%{_datadir}/aclocal/netatalk.m4 +%{_includedir}/atalk/ +%{_libdir}/libatalk.so %{_mandir}/man*/netatalk-config.1* %changelog +* Fri Jul 04 2014 Christopher Meng <rpm(a)cicku.me> - 4:3.1.3-1 +- Update to 3.1.3 + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -332,7 +416,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Jan 23 2007 Jindrich Novy <jnovy(a)redhat.com> - 4:2.0.3-9 - rebuild against new db4 -* Mon Dec 04 2006 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-8 +* Mon Dec 04 2006 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-8 - BuildRequires changed from cracklib to cracklib-devel * Fri Aug 18 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-7 @@ -402,7 +486,7 @@ rm -rf $RPM_BUILD_ROOT - Make multilib generic - Add builddep on quota (for rpcsvc/rquota.h) -* Wed Feb 18 2003 Bill Nottingham <notting(a)redhat.com> 1.5.5-5 +* Tue Feb 18 2003 Bill Nottingham <notting(a)redhat.com> 1.5.5-5 - fix initscript error (#82118) * Wed Jan 22 2003 Tim Powers <timp(a)redhat.com> @@ -410,7 +494,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Jan 7 2003 Nalin Dahyabhai <nalin(a)redhat.com> 1.5.5-3 - patch for compile errors with new ssl libs -- rebuild +- rebuildfedora * Mon Dec 02 2002 Florian La Roche <Florian.LaRoche(a)redhat.de> - postun should never fail @@ -515,9 +599,9 @@ rm -rf $RPM_BUILD_ROOT * Thu Dec 16 1999 Tim Powers <timp(a)redhat.com> - renewed source so it is pristine, delete the problematic files in spec file - instead + instead - general spec file cleanups, create buildroot and dirs in the %%install - section + section - strip binaries - gzip man pages - fixed netatalk-asun.librpcsvc.patch, -lnss_nis too @@ -527,84 +611,113 @@ rm -rf $RPM_BUILD_ROOT * Tue Aug 3 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - rpm-3.0 needs to remove vogus files from source. Removed files: etc/papd/.#magics.c, etc/.#diff + * Fri Jul 30 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - Change Copyright tag to BSD. Add /usr/bin/adv1tov2. + * Thu Apr 22 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - Correct librpcsvc.patch. Move %%changelog section last. Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since LinuxPPC may need. + * Wed Mar 31 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. + * Sat Mar 20 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - Correct symbolic links to psf. + Remove asciize function from nbplkup so as to display Japanese hostname. * Thu Mar 11 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> + - Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping containd in Internet Config Preference. + * Tue Mar 2 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - [asun2.1.3] + * Mon Feb 15 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - [pre-asun2.1.2-8] + * Sun Feb 7 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - [pre-asun2.1.2-6] + * Mon Jan 25 1999 iNOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - [pre-asun2.1.2-3] + * Thu Dec 17 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - [pre-asun2.1.2] Remove crlf patch. It is now a server's option. + * Thu Dec 3 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz Add uams directory + * Sat Nov 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.1-3 source. + * Mon Nov 23 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.1-2 source. + * Mon Nov 16 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Fix rcX.d's symbolic links. + * Wed Oct 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. + * Sat Oct 24 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. + * Mon Oct 5 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-10a source. -* Thu Sep 19 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> + +* Sat Sep 19 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-8 source. Add chkconfig support. + * Sat Sep 12 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Comment out -DCRLF. Use RPM_OPT_FLAGS. -* Mon Sep 8 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> + +* Tue Sep 8 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. -* Mon Aug 22 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> + +* Sat Aug 22 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-6 source. + * Mon Jul 27 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-5 source. + * Tue Jul 21 1998 INOUE Koichi <inoue(a)ma.ns.musashi-techa.c.jp> - Use pre-asun2.1.0-3 source. + * Tue Jul 7 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Add afpovertcp entries to /etc/services - Remove BuildRoot in man8 pages + * Mon Jun 29 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun <asun(a)saul9.u.washington.edu> to provide an AppleShareIP file server + - Included AppleVolumes.system file maintained by Johnson <johnson(a)stpt.usf.edu> + * Mon Aug 25 1997 David Gibson <D.Gibson(a)student.anu.edu.au> - Used a buildroot - Use RPM_OPT_FLAGS - Moved configuration parameters/files from atalk.init to /etc/atalk - Separated devel package - Built with shared libraries + * Sun Jul 13 1997 Paul H. Hargrove <hargrove(a)sccm.Stanford.EDU> - Updated sources from 1.3.3 to 1.4b2 - Included endian patch for Linux/SPARC - Use all the configuration files supplied in the source. This has the following advantages over the ones in the previous rpm release: - + The printer 'lp' isn't automatically placed in papd.conf - + The default file conversion is binary rather than text. + + The printer 'lp' isn't automatically placed in papd.conf + + The default file conversion is binary rather than text. - Automatically add and remove DDP services from /etc/services - Placed the recommended /etc/services in the documentation - Changed atalk.init to give daemons a soft kill - Changed atalk.init to make configuration easier * Wed May 28 1997 Mark Cornick <mcornick(a)zorak.gsfc.nasa.gov> -Updated for /etc/pam.d +- Updated for /etc/pam.d diff --git a/sources b/sources index acc09ac..4844848 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b5a0645836183b0e548ccfbd5c022f8 netatalk-2.2.3.tar.bz2 +ac65dafa20d502a10438fec7e1116b1e netatalk-3.1.3.tar.bz2 commit 42ca9a6a874581969736fb1a5963308b6d2cc027 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Sat Jun 7 07:27:27 2014 -0500 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index 0ba1aa2..0b34b13 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1* %changelog +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Apr 24 2014 Tom Mrz <tmraz(a)redhat.com> - 4:2.2.3-10 - Rebuild for new libgcrypt commit 6f9793cbd0346a9a079cb64bd0fdbd9d7bd0eae1 Author: Tomas Mraz <tmraz(a)fedoraproject.org> Date: Thu Apr 24 16:56:24 2014 +0200 Rebuild for new libgcrypt diff --git a/netatalk.spec b/netatalk.spec index decbec0..0ba1aa2 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1* %changelog +* Thu Apr 24 2014 Tom Mrz <tmraz(a)redhat.com> - 4:2.2.3-10 +- Rebuild for new libgcrypt + * Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild commit 109a7afa1d12e8d233646e553583de2268919f03 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Sat Aug 3 08:02:39 2013 -0500 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index 8fb1a96..decbec0 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1* %changelog +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Petr Pisar <ppisar(a)redhat.com> - 4:2.2.3-8 - Perl 5.18 rebuild commit 368d9522286eedd857a8cae836ee7f61f9e633b4 Author: Petr Psa <ppisar(a)redhat.com> Date: Wed Jul 17 23:43:31 2013 +0200 Perl 5.18 rebuild diff --git a/netatalk.spec b/netatalk.spec index be03d54..8fb1a96 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1* %changelog +* Wed Jul 17 2013 Petr Pisar <ppisar(a)redhat.com> - 4:2.2.3-8 +- Perl 5.18 rebuild + * Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild commit fc3b1bd567347eaa12ba1c1fb2f721fa6c422340 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Thu Feb 14 02:08:18 2013 -0600 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index c03d9c5..be03d54 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/netatalk-config.1* %changelog +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Aug 23 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-6 - Scriptlets replaced with new systemd macros commit 39e3953a75aeeda738039845b0e827e805ca0114 Author: Lukas Nykryn <lnykryn(a)redhat.com> Date: Thu Aug 23 13:07:42 2012 +0200 Scriptlets replaced with new systemd macros diff --git a/netatalk.spec b/netatalk.spec index 3691133..c03d9c5 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -15,8 +15,9 @@ Patch4: netatalk-2.2.3-libdb4.patch Url: http://netatalk.sourceforge.net/ Requires: pam -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake BuildRequires: autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel BuildRequires: avahi-devel libacl-devel openldap-devel @@ -119,16 +120,13 @@ find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; rm -rf $RPM_BUILD_ROOT %post -/bin/systemctl daemon-reload >/dev/null 2>&1 || : +%systemd_post netatalk.service %preun -if [ "$1" = "0" ] ; then - /bin/systemctl disable netatalk.service > /dev/null 2>&1 || : - /bin/systemctl stop netatalk.service > /dev/null 2>&1 || : -fi +%systemd_preun netatalk.service %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : +%systemd_postun_with_restart netatalk.service %files %defattr(-,root,root) @@ -167,6 +165,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Thu Aug 23 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-6 +- Scriptlets replaced with new systemd macros + * Fri Jul 27 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-5 - fixed build issue on f18 commit 25a50317ec91a76a4be1dc4d784fdacffe54a4a1 Author: Luk Nykrn <lnykryn(a)redhat.com> Date: Fri Jul 27 13:45:06 2012 +0200 fix build on f18 diff --git a/netatalk-2.2.3-libdb4.patch b/netatalk-2.2.3-libdb4.patch new file mode 100644 index 0000000..0b5ea4c --- /dev/null +++ b/netatalk-2.2.3-libdb4.patch @@ -0,0 +1,39 @@ +diff --git a/configure b/configure +index eb879af..0e5b407 100755 +--- a/configure ++++ b/configure +@@ -18150,7 +18150,7 @@ if test "x$bdb_required" = "xyes"; then + trybdbdir="" + dobdbsearch=yes + bdb_search_dirs="/usr/local /usr" +- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" ++ search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4" + + bdbfound=no + savedcflags="$CFLAGS" +diff --git a/etc/cnid_dbd/dbd_add.c b/etc/cnid_dbd/dbd_add.c +index 6a818a3..bad57e7 100644 +--- a/etc/cnid_dbd/dbd_add.c ++++ b/etc/cnid_dbd/dbd_add.c +@@ -24,7 +24,7 @@ + #include <atalk/cnid_dbd_private.h> + #include <atalk/cnid.h> + #ifdef HAVE_DB4_DB_H +-#include <db4/db.h> ++#include <libdb4/db.h> + #else + #include <db.h> + #endif +diff --git a/macros/db3-check.m4 b/macros/db3-check.m4 +index 2cc59cb..ef58e15 100644 +--- a/macros/db3-check.m4 ++++ b/macros/db3-check.m4 +@@ -87,7 +87,7 @@ AC_DEFUN([AC_PATH_BDB],[ + trybdbdir="" + dobdbsearch=yes + bdb_search_dirs="/usr/local /usr" +- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4" ++ search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4" + + bdbfound=no + savedcflags="$CFLAGS" diff --git a/netatalk.spec b/netatalk.spec index 2b06b8b..3691133 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -11,6 +11,7 @@ Source2: netatalk.pam-system-auth Patch1: netatalk-2.0.2-uams_no_pie.patch Patch2: netatalk-2.0.4-extern_ucreator.patch Patch3: netatalk-2.2.3-sigterm.patch +Patch4: netatalk-2.2.3-libdb4.patch Url: http://netatalk.sourceforge.net/ Requires: pam @@ -43,6 +44,7 @@ programs. %patch1 -p1 -b .uams_no_pie %patch2 -p1 -b .extern_ucreator %patch3 -p1 -b .sigterm +%patch4 -p1 -b .libdb4 ln -s ./NEWS ChangeLog @@ -165,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Fri Jul 27 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-5 +- fixed build issue on f18 + * Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild commit 55bfdb9198a115cc627ba71412537960df81e141 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Thu Jul 19 23:24:51 2012 -0500 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index 9fcf826..2b06b8b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -165,6 +165,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jul 16 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-3 - fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX client, crashes Finder netatalk-2.2.2-1 commit 092fa181bcb6707ad9f963e4919be030fa377c31 Author: Lukas Nykryn <lnykryn(a)redhat.com> Date: Mon Jul 16 13:21:23 2012 +0200 fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share diff --git a/netatalk-2.2.3-sigterm.patch b/netatalk-2.2.3-sigterm.patch new file mode 100644 index 0000000..169a0d6 --- /dev/null +++ b/netatalk-2.2.3-sigterm.patch @@ -0,0 +1,71 @@ +From 25e03ec9edd863136008881a4a57ea9a788d34b3 Mon Sep 17 00:00:00 2001 +From: Frank Lahm <franklahm(a)googlemail.com> +Date: Mon, 18 Jun 2012 16:26:28 +0200 +Subject: [PATCH] Block SIGTERM when calling pam_close_session + +--- + etc/afpd/afp_dsi.c | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c +index bf454e1..6c6bc7d 100644 +--- a/etc/afpd/afp_dsi.c ++++ b/etc/afpd/afp_dsi.c +@@ -80,7 +80,8 @@ static sigjmp_buf recon_jmp; + static void afp_dsi_close(AFPObj *obj) + { + DSI *dsi = obj->handle; +- ++ sigset_t sigs; ++ + close(obj->ipc_fd); + obj->ipc_fd = -1; + +@@ -97,8 +98,14 @@ static void afp_dsi_close(AFPObj *obj) + } + + close_all_vol(); +- if (obj->logout) ++ ++ if (obj->logout) { ++ /* Block SIGTERM, PAM might send us a SIGTERM in (*obj->logout)() -> pam_close_session() */ ++ pthread_sigmask(SIG_BLOCK, &sigs, NULL); ++ sigemptyset(&sigs); ++ sigaddset(&sigs, SIGTERM); + (*obj->logout)(); ++ } + + LOG(log_note, logtype_afpd, "AFP statistics: %.2f KB read, %.2f KB written", + dsi->read_count/1024.0, dsi->write_count/1024.0); +-- +1.7.4.1 + +From d8f375c4fbff7a27768ce6efebec64ab193734ee Mon Sep 17 00:00:00 2001 +From: Frank Lahm <franklahm(a)googlemail.com> +Date: Wed, 20 Jun 2012 15:33:26 +0200 +Subject: [PATCH] Fix signal blocking, pthread_sigmask was called before mask initialisation. Also block all sigs instead of only SIGTERM (think I saw SIGHUP somewhere). + +--- + etc/afpd/afp_dsi.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c +index 6c6bc7d..7779b23 100644 +--- a/etc/afpd/afp_dsi.c ++++ b/etc/afpd/afp_dsi.c +@@ -100,10 +100,9 @@ static void afp_dsi_close(AFPObj *obj) + close_all_vol(); + + if (obj->logout) { +- /* Block SIGTERM, PAM might send us a SIGTERM in (*obj->logout)() -> pam_close_session() */ ++ /* Block sigs, PAM/systemd/whoever might send us a SIG??? in (*obj->logout)() -> pam_close_session() */ ++ sigfillset(&sigs); + pthread_sigmask(SIG_BLOCK, &sigs, NULL); +- sigemptyset(&sigs); +- sigaddset(&sigs, SIGTERM); + (*obj->logout)(); + } + +-- +1.7.4.1 + diff --git a/netatalk.spec b/netatalk.spec index fb0580e..9fcf826 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -10,6 +10,7 @@ Source2: netatalk.pam-system-auth Patch1: netatalk-2.0.2-uams_no_pie.patch Patch2: netatalk-2.0.4-extern_ucreator.patch +Patch3: netatalk-2.2.3-sigterm.patch Url: http://netatalk.sourceforge.net/ Requires: pam @@ -41,6 +42,7 @@ programs. %patch1 -p1 -b .uams_no_pie %patch2 -p1 -b .extern_ucreator +%patch3 -p1 -b .sigterm ln -s ./NEWS ChangeLog @@ -163,6 +165,10 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Jul 16 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-3 +- fixes: #835714 - Netatalk 2.2.2-1: Unable to unmount afpd share from OSX + client, crashes Finder netatalk-2.2.2-1 + * Tue Jun 12 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-2 - fixes: #831001 - netatalk pam configuration has invalid entry commit b3a83953ce95fa034709b76157e2210c808dab87 Author: Lukas Nykryn <lnykryn(a)redhat.com> Date: Tue Jun 12 09:19:27 2012 +0200 fixes: #831001 - netatalk pam configuration has invalid entry diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth index c6bc86d..2c0c0b2 100644 --- a/netatalk.pam-system-auth +++ b/netatalk.pam-system-auth @@ -8,8 +8,7 @@ password include system-auth session required pam_selinux.so close session required pam_loginuid.so session optional pam_console.so -# pam_selinux.so open should only be followed by sessions to be executed in the -user context +# pam_selinux.so open should only be followed by sessions to be executed in the user context session required pam_selinux.so open session required pam_namespace.so session optional pam_keyinit.so force revoke diff --git a/netatalk.spec b/netatalk.spec index b500fca..fb0580e 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -163,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Jun 12 2012 Luk Nykrn <lnykryn(a)redhat.com> - 4:2.2.3-2 +- fixes: #831001 - netatalk pam configuration has invalid entry + * Mon Jun 04 2012 Lukas Nykryn <lnykryn(a)redhat.com> 4:2.2.3-1 - fixes #828205 - update to latest upstream netatalk-2.2.3 commit 9885a61e7bc2b3c6e23d0207f57066338db43514 Author: Lukas Nykryn <lnykryn(a)redhat.com> Date: Mon Jun 4 15:05:07 2012 +0200 fixes #828205 - update to latest upstream netatalk-2.2.3 diff --git a/.gitignore b/.gitignore index f89119f..e61d96b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.2.0.tar.bz2 /netatalk-2.2.1.tar.bz2 /netatalk-2.2.2.tar.bz2 +/netatalk-2.2.3.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index f7a0758..b500fca 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk -Version: 2.2.2 +Version: 2.2.3 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -163,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Jun 04 2012 Lukas Nykryn <lnykryn(a)redhat.com> 4:2.2.3-1 +- fixes #828205 - update to latest upstream netatalk-2.2.3 + * Mon Jan 16 2012 Jiri Skala <jskala(a)redhat.com> - 4:2.2.2-1 - fixes #782049 - update to latest upstream netatalk-2.2.2 diff --git a/sources b/sources index dd71949..acc09ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd42b686ec7209d9ab47bd8e2e2431c4 netatalk-2.2.2.tar.bz2 +0b5a0645836183b0e548ccfbd5c022f8 netatalk-2.2.3.tar.bz2 commit c1fd6534862cb7d67364222bd68be3a889305a3c Author: Jiri Skala <jskala(a)redhat.com> Date: Mon Jan 16 14:40:34 2012 +0100 fixes #782049 - update to latest upstream netatalk-2.2.2 diff --git a/.gitignore b/.gitignore index d5a308d..f89119f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.1.5.tar.bz2 /netatalk-2.2.0.tar.bz2 /netatalk-2.2.1.tar.bz2 +/netatalk-2.2.2.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index aee5c2c..f7a0758 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk -Version: 2.2.1 -Release: 3%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -163,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Jan 16 2012 Jiri Skala <jskala(a)redhat.com> - 4:2.2.2-1 +- fixes #782049 - update to latest upstream netatalk-2.2.2 + * Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index c84ee46..dd71949 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a371025daf96adb73fa491efdbfef28 netatalk-2.2.1.tar.bz2 +bd42b686ec7209d9ab47bd8e2e2431c4 netatalk-2.2.2.tar.bz2 commit 99ac03baaff0df8de3bafe409a40aff5ab41a103 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Fri Jan 13 04:59:47 2012 -0600 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index 2852ea9..aee5c2c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -163,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-2 - fixes #501144 - updated and redirected pam config commit 5aa8bc7dd9686fb5f94775307a8d7ff347d0b836 Author: Jiri Skala <jskala(a)redhat.com> Date: Tue Nov 29 14:16:00 2011 +0100 fixes #501144 - updated and redirected pam config diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth index 8147016..c6bc86d 100644 --- a/netatalk.pam-system-auth +++ b/netatalk.pam-system-auth @@ -1,10 +1,17 @@ -# /etc/pam.d/netatalk -# -# PAM configuration file for netatalk using system-auth substack -# (this would enable use of netatalk by LDAP or NIS users). -# +#%PAM-1.0 +auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so auth include system-auth account required pam_nologin.so account include system-auth password include system-auth +# pam_selinux.so close should be the first session rule +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +# pam_selinux.so open should only be followed by sessions to be executed in the +user context +session required pam_selinux.so open +session required pam_namespace.so +session optional pam_keyinit.so force revoke session include system-auth +session optional pam_ck_connector.so diff --git a/netatalk.spec b/netatalk.spec index 1fbae63..2852ea9 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -102,7 +102,8 @@ cp -fp config/papd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk mkdir -p $RPM_BUILD_ROOT/usr/share/netatalk cp -fp etc/psf/pagecount.ps $RPM_BUILD_ROOT/usr/share/netatalk -cp -fp %{SOURCE2} config.example +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/netatalk + # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h @@ -162,6 +163,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-2 +- fixes #501144 - updated and redirected pam config + * Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-1 - update to latest upstream netatalk-2.2.1 commit 09e84bc9ee408c53dab64c6951f7e7311573835c Author: Jiri Skala <jskala(a)redhat.com> Date: Tue Nov 29 13:34:08 2011 +0100 update to latest upstream netatalk-2.2.1 diff --git a/.gitignore b/.gitignore index 6013e57..d5a308d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.1.4.tar.bz2 /netatalk-2.1.5.tar.bz2 /netatalk-2.2.0.tar.bz2 +/netatalk-2.2.1.tar.bz2 diff --git a/netatalk.service b/netatalk.service deleted file mode 100644 index 7e24a36..0000000 --- a/netatalk.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=File and Printer sharing via AppleTalk Protocol -After=syslog.target network.target - -[Service] -Type=oneshot -ExecStart=/bin/bash -c "exec /usr/libexec/netatalk/netatalk.sh" -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/netatalk.sh b/netatalk.sh deleted file mode 100755 index d16a1c3..0000000 --- a/netatalk.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -ATALK_BIN=/usr/bin -ATALK_CONF_DIR=/etc/netatalk/ -ATALK_SBIN=/usr/sbin - -# read in netatalk configuration -if [ -f ${ATALK_CONF_DIR}/netatalk.conf ]; then - . ${ATALK_CONF_DIR}/netatalk.conf -fi - -if [ x"${ATALKD_RUN}" != x"no" -a -x ${ATALK_SBIN}/atalkd ]; then - ${ATALK_SBIN}/atalkd - - if [ x"${PAPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/papd ]; then - ${ATALK_SBIN}/papd - fi - - # check for timelord in bin directory - if [ x"${TIMELORD_RUN}" = x"yes" -a -x ${ATALK_BIN}/timelord ]; then - ${ATALK_BIN}/timelord - fi - - # check for timelord in sbin directory - if [ x"${TIMELORD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/timelord ]; then - ${ATALK_SBIN}/timelord - fi - - # check for a2boot in bin directory - if [ x"${A2BOOT_RUN}" = x"yes" -a -x ${ATALK_BIN}/a2boot ]; then - ${ATALK_BIN}/a2boot - fi - - # check for a2boot in sbin directory - if [ x"${A2BOOT_RUN}" = x"yes" -a -x ${ATALK_SBIN}/a2boot ]; then - ${ATALK_SBIN}/a2boot - fi -fi - -if [ x"${CNID_METAD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/cnid_metad ]; then - ${ATALK_SBIN}/cnid_metad $CNID_CONFIG -fi - -if [ x"${AFPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/afpd ]; then - ${ATALK_SBIN}/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \ - -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}${ATALK_ZONE}\" -fi diff --git a/netatalk.spec b/netatalk.spec index 60ca3a4..1fbae63 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,14 +1,12 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk -Version: 2.2.0 -Release: 4%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 -Source1: netatalk.service Source2: netatalk.pam-system-auth -Source3: netatalk.sh Patch1: netatalk-2.0.2-uams_no_pie.patch Patch2: netatalk-2.0.4-extern_ucreator.patch @@ -38,16 +36,6 @@ Group: Development/Libraries This package contains the header files for building Appletalk networking programs. -%package sysvinit -Group: System Environment/Daemons -Summary: SysV initscript for netatalk -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires(preun): /sbin/service -Requires(postun): /sbin/service - -%description sysvinit -The netatalk-sysvinit contains SysV initscritps support. - %prep %setup -q @@ -83,7 +71,7 @@ export CFLAGS="$CFLAGS -fsigned-char" --enable-krbV-uam \ --enable-overwrite \ --with-gnu-ld \ - --enable-redhat \ + --enable-redhat-systemd \ --with-libgcrypt # Grrrr. Fix broken libtool/autoFOO Makefiles. @@ -118,11 +106,6 @@ cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h -mkdir -p $RPM_BUILD_ROOT/lib/systemd/system -mkdir -p $RPM_BUILD_ROOT/usr/libexec/netatalk -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system -install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/libexec/netatalk - # Clean up .a and .la files find $RPM_BUILD_ROOT -name \*.a -exec rm {} \; find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; @@ -142,13 +125,6 @@ fi %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : -%triggerun -- %{name} < 4:2.2.0-2 - /sbin/chkconfig --del netatalk >/dev/null 2>&1 || : - /bin/systemctl try-restart netatalk.service >/dev/null 2>&1 || : - -%triggerpostun -n %{name}-sysvinit -- %{name} < 4:2.2.0-2 - /sbin/chkconfig --add netatalk >/dev/null 2>&1 || : - %files %defattr(-,root,root) %doc COPYRIGHT COPYING ChangeLog VERSION NEWS @@ -185,10 +161,10 @@ fi %{_bindir}/netatalk-config %{_mandir}/man*/netatalk-config.1* -%files sysvinit -%attr(755,root,root) %{_initrddir}/netatalk - %changelog +* Tue Nov 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.1-1 +- update to latest upstream netatalk-2.2.1 + * Fri Aug 19 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-4 - fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel diff --git a/sources b/sources index 0022dbd..c84ee46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acac2b5f2d9f43bfd5ea2a5cf4c71fe5 netatalk-2.2.0.tar.bz2 +4a371025daf96adb73fa491efdbfef28 netatalk-2.2.1.tar.bz2 commit 8ed432188d3c42d9a3a710dc9a123a6733d4fc8e Author: Jiri Skala <jskala(a)redhat.com> Date: Fri Aug 19 09:09:34 2011 +0200 added afp_ldap.conf among files to install diff --git a/netatalk.spec b/netatalk.spec index 9a5911e..60ca3a4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -163,6 +163,7 @@ fi %config(noreplace) %{_sysconfdir}/netatalk/afpd.conf %config(noreplace) %{_sysconfdir}/netatalk/atalkd.conf %config(noreplace) %{_sysconfdir}/netatalk/papd.conf +%config(noreplace) %{_sysconfdir}/netatalk/afp_ldap.conf %config(noreplace) %{_sysconfdir}/pam.d/netatalk %{_sbindir}/* %{_bindir}/* commit 7cf58e44697d9fb6bdca211f76cb825055fa0a83 Author: Jiri Skala <jskala(a)redhat.com> Date: Fri Aug 19 08:44:35 2011 +0200 fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel diff --git a/netatalk.spec b/netatalk.spec index 455b480..9a5911e 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -17,7 +17,9 @@ Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel +BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake +BuildRequires: autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel +BuildRequires: avahi-devel libacl-devel openldap-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -186,6 +188,9 @@ fi %attr(755,root,root) %{_initrddir}/netatalk %changelog +* Fri Aug 19 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-4 +- fixes #726928 - BuildRequires: avahi-devel libacl-devel openldap-devel + * Fri Aug 05 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-3 - fixed missing epoch in sysvinit subpackage and triggers commit 555e92d3276dcf45e6f993ec54f7b94f376c6661 Author: Jiri Skala <jskala(a)redhat.com> Date: Fri Aug 5 15:19:18 2011 +0200 fixed missing epoch in sysvinit subpackage and triggers diff --git a/netatalk.spec b/netatalk.spec index e79bb1c..455b480 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -39,7 +39,7 @@ programs. %package sysvinit Group: System Environment/Daemons Summary: SysV initscript for netatalk -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Requires(preun): /sbin/service Requires(postun): /sbin/service @@ -140,11 +140,11 @@ fi %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : -%triggerun -- %{name} < 2.2.0-2 +%triggerun -- %{name} < 4:2.2.0-2 /sbin/chkconfig --del netatalk >/dev/null 2>&1 || : /bin/systemctl try-restart netatalk.service >/dev/null 2>&1 || : -%triggerpostun -n %{name}-sysvinit -- %{name} < 2.2.0-2 +%triggerpostun -n %{name}-sysvinit -- %{name} < 4:2.2.0-2 /sbin/chkconfig --add netatalk >/dev/null 2>&1 || : %files @@ -186,6 +186,9 @@ fi %attr(755,root,root) %{_initrddir}/netatalk %changelog +* Fri Aug 05 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-3 +- fixed missing epoch in sysvinit subpackage and triggers + * Thu Aug 04 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-2 - fixes #714448 - systemd-service - moves SysV initscript to subpackage commit d08cb32fc9731ca89d6a153ff767c7099d447444 Author: Jiri Skala <jskala(a)redhat.com> Date: Thu Aug 4 16:47:42 2011 +0200 added systemd unit file, SysV initscript moved to subpackage diff --git a/netatalk.service b/netatalk.service new file mode 100644 index 0000000..7e24a36 --- /dev/null +++ b/netatalk.service @@ -0,0 +1,11 @@ +[Unit] +Description=File and Printer sharing via AppleTalk Protocol +After=syslog.target network.target + +[Service] +Type=oneshot +ExecStart=/bin/bash -c "exec /usr/libexec/netatalk/netatalk.sh" +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/netatalk.sh b/netatalk.sh new file mode 100755 index 0000000..d16a1c3 --- /dev/null +++ b/netatalk.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +ATALK_BIN=/usr/bin +ATALK_CONF_DIR=/etc/netatalk/ +ATALK_SBIN=/usr/sbin + +# read in netatalk configuration +if [ -f ${ATALK_CONF_DIR}/netatalk.conf ]; then + . ${ATALK_CONF_DIR}/netatalk.conf +fi + +if [ x"${ATALKD_RUN}" != x"no" -a -x ${ATALK_SBIN}/atalkd ]; then + ${ATALK_SBIN}/atalkd + + if [ x"${PAPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/papd ]; then + ${ATALK_SBIN}/papd + fi + + # check for timelord in bin directory + if [ x"${TIMELORD_RUN}" = x"yes" -a -x ${ATALK_BIN}/timelord ]; then + ${ATALK_BIN}/timelord + fi + + # check for timelord in sbin directory + if [ x"${TIMELORD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/timelord ]; then + ${ATALK_SBIN}/timelord + fi + + # check for a2boot in bin directory + if [ x"${A2BOOT_RUN}" = x"yes" -a -x ${ATALK_BIN}/a2boot ]; then + ${ATALK_BIN}/a2boot + fi + + # check for a2boot in sbin directory + if [ x"${A2BOOT_RUN}" = x"yes" -a -x ${ATALK_SBIN}/a2boot ]; then + ${ATALK_SBIN}/a2boot + fi +fi + +if [ x"${CNID_METAD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/cnid_metad ]; then + ${ATALK_SBIN}/cnid_metad $CNID_CONFIG +fi + +if [ x"${AFPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/afpd ]; then + ${ATALK_SBIN}/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \ + -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}${ATALK_ZONE}\" +fi diff --git a/netatalk.spec b/netatalk.spec index fa1bffe..e79bb1c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,22 +1,22 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 +Source1: netatalk.service Source2: netatalk.pam-system-auth +Source3: netatalk.sh Patch1: netatalk-2.0.2-uams_no_pie.patch Patch2: netatalk-2.0.4-extern_ucreator.patch Url: http://netatalk.sourceforge.net/ Requires: pam -Requires(post): /sbin/chkconfig /sbin/ldconfig +Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service /sbin/ldconfig BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,6 +36,16 @@ Group: Development/Libraries This package contains the header files for building Appletalk networking programs. +%package sysvinit +Group: System Environment/Daemons +Summary: SysV initscript for netatalk +Requires: %{name} = %{version}-%{release} +Requires(preun): /sbin/service +Requires(postun): /sbin/service + +%description sysvinit +The netatalk-sysvinit contains SysV initscritps support. + %prep %setup -q @@ -106,6 +116,11 @@ cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system +mkdir -p $RPM_BUILD_ROOT/usr/libexec/netatalk +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system +install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/libexec/netatalk + # Clean up .a and .la files find $RPM_BUILD_ROOT -name \*.a -exec rm {} \; find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; @@ -114,23 +129,23 @@ find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add netatalk -/sbin/ldconfig +/bin/systemctl daemon-reload >/dev/null 2>&1 || : %preun if [ "$1" = "0" ] ; then - # check for existence due to renaming initscritp - if [ -x %{_initrddir}/netatalk ] ; then - /sbin/service netatalk stop > /dev/null 2>&1 - /sbin/chkconfig --del netatalk - fi + /bin/systemctl disable netatalk.service > /dev/null 2>&1 || : + /bin/systemctl stop netatalk.service > /dev/null 2>&1 || : fi %postun -if [ "$1" -ge "1" ]; then - /sbin/service netatalk condrestart > /dev/null 2>&1 || : -fi -/sbin/ldconfig +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%triggerun -- %{name} < 2.2.0-2 + /sbin/chkconfig --del netatalk >/dev/null 2>&1 || : + /bin/systemctl try-restart netatalk.service >/dev/null 2>&1 || : + +%triggerpostun -n %{name}-sysvinit -- %{name} < 2.2.0-2 + /sbin/chkconfig --add netatalk >/dev/null 2>&1 || : %files %defattr(-,root,root) @@ -138,7 +153,8 @@ fi %doc doc %doc config.example %dir %{_sysconfdir}/netatalk -%attr(755,root,root) %{_initrddir}/netatalk +/lib/systemd/system/netatalk.service +/usr/libexec/netatalk/netatalk.sh %config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.default %config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.system %config(noreplace) %{_sysconfdir}/netatalk/netatalk.conf @@ -166,7 +182,14 @@ fi %{_bindir}/netatalk-config %{_mandir}/man*/netatalk-config.1* +%files sysvinit +%attr(755,root,root) %{_initrddir}/netatalk + %changelog +* Thu Aug 04 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-2 +- fixes #714448 - systemd-service +- moves SysV initscript to subpackage + * Fri Jul 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-1 - update to latest upstream netatalk-2.2.0 commit b548077d882431748c811e2eec3b5d48760d434e Author: Jiri Skala <jskala(a)redhat.com> Date: Fri Jul 29 15:03:11 2011 +0200 update to latest upstream netatalk-2.2.0 diff --git a/.gitignore b/.gitignore index 6fc4134..6013e57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.1.4.tar.bz2 /netatalk-2.1.5.tar.bz2 +/netatalk-2.2.0.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index c0ca098..fa1bffe 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk -Version: 2.1.5 -Release: 2%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -71,7 +71,8 @@ export CFLAGS="$CFLAGS -fsigned-char" --enable-krbV-uam \ --enable-overwrite \ --with-gnu-ld \ - --enable-redhat + --enable-redhat \ + --with-libgcrypt # Grrrr. Fix broken libtool/autoFOO Makefiles. if [ "%{_lib}" != lib ]; then @@ -94,17 +95,17 @@ cp -fp config/afpd.conf config.example cp -fp config/AppleVolumes.system config.example cp -fp config/AppleVolumes.default config.example cp -fp config/atalkd.conf config.example +cp -fp config/atalkd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk cp -fp config/netatalk.conf config.example cp -fp config/papd.conf config.example +cp -fp config/papd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk +mkdir -p $RPM_BUILD_ROOT/usr/share/netatalk +cp -fp etc/psf/pagecount.ps $RPM_BUILD_ROOT/usr/share/netatalk cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h -# Fix up ICDumpSuffixMap -sed -e 's/\r/\n/' -e 's:#!perl:#!%{__perl}:' contrib/ICDumpSuffixMap > ICDumpSuffixMap -touch -r contrib/ICDumpSuffixMap ICDumpSuffixMap - # Clean up .a and .la files find $RPM_BUILD_ROOT -name \*.a -exec rm {} \; find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; @@ -133,8 +134,8 @@ fi %files %defattr(-,root,root) -%doc COPYRIGHT COPYING ChangeLog README* TODO VERSION NEWS -%doc ICDumpSuffixMap doc +%doc COPYRIGHT COPYING ChangeLog VERSION NEWS +%doc doc %doc config.example %dir %{_sysconfdir}/netatalk %attr(755,root,root) %{_initrddir}/netatalk @@ -153,7 +154,6 @@ fi %{_datadir}/netatalk %dir %{_libdir}/atalk %{_libdir}/atalk/*.so -%{_libexecdir}/* %files devel %defattr(-,root,root) @@ -167,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Fri Jul 29 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.2.0-1 +- update to latest upstream netatalk-2.2.0 + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index f075345..0022dbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2495f832643cef131bc3032274fbf926 netatalk-2.1.5.tar.bz2 +acac2b5f2d9f43bfd5ea2a5cf4c71fe5 netatalk-2.2.0.tar.bz2 commit 793822ce7e286cbaaf5057e73ea120acf7b23cfc Author: Dennis Gilmore <dennis(a)ausil.us> Date: Tue Feb 8 17:43:23 2011 -0600 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index a23ecdd..c0ca098 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk Version: 2.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -167,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 03 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.1.5-1 - updated to latest upstream version netatalk-2.1.5 commit e436a4e57345e8a4a35080d40953bea9d5ab903d Author: Jiri Skala <jskala(a)skalniknb.(none)> Date: Mon Jan 3 13:57:50 2011 +0100 - updated to latest upstream version netatalk-2.1.5 diff --git a/.gitignore b/.gitignore index 0b9759b..6fc4134 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ netatalk-2.1.3.tar.bz2 /netatalk-2.1.4.tar.bz2 +/netatalk-2.1.5.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index c5e696b..a23ecdd 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk -Version: 2.1.4 +Version: 2.1.5 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -167,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Jan 03 2011 Jiri Skala <jskala(a)redhat.com> - 4:2.1.5-1 +- updated to latest upstream version netatalk-2.1.5 + * Mon Oct 18 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.4-1 - updated to latest upstream version diff --git a/sources b/sources index e6cdff4..f075345 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3251290f3f1bf10acdf407dea585bae netatalk-2.1.4.tar.bz2 +2495f832643cef131bc3032274fbf926 netatalk-2.1.5.tar.bz2 commit 90c588d47c7775d93447f1d6166f54dd51ec38de Author: Jiri Skala <jskala(a)localhost.(none)> Date: Mon Oct 18 09:28:59 2010 +0200 - updated to latest upstream version diff --git a/.gitignore b/.gitignore index 4c53fea..0b9759b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ netatalk-2.1.3.tar.bz2 +/netatalk-2.1.4.tar.bz2 diff --git a/sources b/sources index 54493e7..e6cdff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5916e70ca6fd16748d8c62a2c41114ca netatalk-2.1.3.tar.bz2 +b3251290f3f1bf10acdf407dea585bae netatalk-2.1.4.tar.bz2 commit 8a105cc200bf3ce5198c50ad3da0aba0cf65b23c Author: Jiri Skala <jskala(a)localhost.(none)> Date: Mon Oct 18 09:28:30 2010 +0200 - updated to latest upstream version diff --git a/netatalk.spec b/netatalk.spec index e41a9c9..c5e696b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -167,6 +167,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Oct 18 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.4-1 +- updated to latest upstream version + * Mon Jul 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.3-1 - updated to latest upstream version - added license texts to devel subpackage commit 8ddf231d2e7fb08f2ccf166971741ba70e9395dc Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Thu Jul 29 04:14:51 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 4c53fea..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -netatalk-2.1.3.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c53fea --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +netatalk-2.1.3.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 63101a0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: netatalk -# $Id: Makefile,v 1.2 2007/10/15 19:10:48 notting Exp $ -NAME := netatalk -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) commit f9494120d82998f34fb257bf12c726629f39e644 Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Mon Jul 12 10:50:12 2010 +0000 - updated to latest upstream version - added license texts to devel subpackage diff --git a/.cvsignore b/.cvsignore index abdba95..4c53fea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.1.2.tar.bz2 +netatalk-2.1.3.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index 5314642..e41a9c9 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -133,7 +133,7 @@ fi %files %defattr(-,root,root) -%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc COPYRIGHT COPYING ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc %doc config.example %dir %{_sysconfdir}/netatalk @@ -157,6 +157,7 @@ fi %files devel %defattr(-,root,root) +%doc COPYRIGHT COPYING %dir %{_includedir}/atalk %dir %{_includedir}/netatalk %attr(0644,root,root) %{_includedir}/atalk/* @@ -166,6 +167,10 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Jul 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.3-1 +- updated to latest upstream version +- added license texts to devel subpackage + * Wed Jun 30 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.2-1 - updated to latest upstream version diff --git a/sources b/sources index 9c7d860..54493e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94d4ea19fc48c37e28f02062e25046ea netatalk-2.1.2.tar.bz2 +5916e70ca6fd16748d8c62a2c41114ca netatalk-2.1.3.tar.bz2 commit c9cb9c40a4f05cf46acbf1a00bf5c9c717e235b8 Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Wed Jun 30 09:17:54 2010 +0000 - updated to latest upstream version diff --git a/.cvsignore b/.cvsignore index 6d5e497..abdba95 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.1.1.tar.bz2 +netatalk-2.1.2.tar.bz2 diff --git a/netatalk-2.1-initscript.patch b/netatalk-2.1-initscript.patch deleted file mode 100644 index 9f5f5ac..0000000 --- a/netatalk-2.1-initscript.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -up netatalk-2.1/distrib/initscripts/Makefile.am.initscript netatalk-2.1/distrib/initscripts/Makefile.am ---- netatalk-2.1/distrib/initscripts/Makefile.am.initscript 2010-04-19 13:35:26.000000000 +0200 -+++ netatalk-2.1/distrib/initscripts/Makefile.am 2010-05-25 14:20:23.111718639 +0200 -@@ -58,7 +58,7 @@ uninstall: uninstall-startup - if USE_REDHAT - - sysvdir = /etc/rc.d/init.d --sysv_SCRIPTS = atalk -+sysv_SCRIPTS = netatalk - - $(sysv_SCRIPTS): rc.atalk.redhat - cp -f rc.atalk.redhat $(sysv_SCRIPTS) -diff -up netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl.initscript netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl ---- netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl.initscript 2010-04-19 13:35:26.000000000 +0200 -+++ netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl 2010-05-25 15:14:58.613715823 +0200 -@@ -19,27 +19,9 @@ ATALK_SBIN=:SBINDIR: - # Source networking configuration. - . /etc/sysconfig/network - --if [ ! -x ${ATALK_SBIN}/atalkd ]; then -- # Quickly probe for appletalk and warn if we can't find it -- #/sbin/modprobe appletalk || echo "[could not load appletalk module]" -- # Check for IP Encapsulation support -- #/sbin/modprobe ipddp || echo "[could not load IP encapsulation]" -- echo "[${ATALK_SBIN}/atalkd not found. Did it compile?]"; -- exit 0; --fi -- --if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then -- echo "[${ATALK_CONF_DIR}/netatalk.conf not found]"; -- exit 0; --fi -- - # read in netatalk configuration --. ${ATALK_CONF_DIR}/netatalk.conf -- --# Check that networking is up. --if [ ${NETWORKING} = "no" ]; then -- echo "[Network isn't started]"; -- exit 0; -+if [ -f ${ATALK_CONF_DIR}/netatalk.conf ]; then -+ . ${ATALK_CONF_DIR}/netatalk.conf - fi - - # initialize return values -@@ -51,6 +33,26 @@ RETVAL_AFPD=0 - - # startup code for everything - atalk_startup() { -+ # Check that networking is up. -+ if [ ${NETWORKING} = "no" ]; then -+ echo "[Network isn't started]"; -+ exit 1; -+ fi -+ -+ if [ ! -x ${ATALK_SBIN}/atalkd ]; then -+ # Quickly probe for appletalk and warn if we can't find it -+ #/sbin/modprobe appletalk || echo "[could not load appletalk module]" -+ # Check for IP Encapsulation support -+ #/sbin/modprobe ipddp || echo "[could not load IP encapsulation]" -+ echo "[${ATALK_SBIN}/atalkd not found. Check for permissions]"; -+ exit 4; -+ fi -+ -+ if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then -+ echo "[${ATALK_CONF_DIR}/netatalk.conf not found]"; -+ exit 6; -+ fi -+ - if [ x"${ATALKD_RUN}" != x"no" ]; then - echo -n " Starting atalkd:" - daemon ${ATALK_SBIN}/atalkd -@@ -218,8 +220,8 @@ case "$1" in - RETVAL=$? - ;; - *) -- echo "Usage: atalk {start|stop|restart|status}" -- exit 1 -+ echo "Usage: $0 {start|stop|restart|reload|status}" -+ exit 2 - esac - - exit $RETVAL diff --git a/netatalk.spec b/netatalk.spec index de51477..5314642 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,6 +1,6 @@ Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} Epoch: 4 License: GPLv2+ @@ -10,7 +10,6 @@ Source2: netatalk.pam-system-auth Patch1: netatalk-2.0.2-uams_no_pie.patch Patch2: netatalk-2.0.4-extern_ucreator.patch -Patch3: netatalk-2.1-initscript.patch Url: http://netatalk.sourceforge.net/ Requires: pam @@ -42,7 +41,6 @@ programs. %patch1 -p1 -b .uams_no_pie %patch2 -p1 -b .extern_ucreator -%patch3 -p1 -b .initscript ln -s ./NEWS ChangeLog @@ -168,6 +166,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Wed Jun 30 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.2-1 +- updated to latest upstream version + * Fri May 28 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.1-1 - updated to latest upstream version - fixes #594999 - Summary and Description are old-fashioned diff --git a/sources b/sources index 8bebffe..9c7d860 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d91913958970b4bcd72577aa52aa31be netatalk-2.1.1.tar.bz2 +94d4ea19fc48c37e28f02062e25046ea netatalk-2.1.2.tar.bz2 commit 9b73602ac2538f6c5bbeb77785f6e20502b05e94 Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Fri May 28 08:06:06 2010 +0000 - updated to latest upstream version - fixes #594999 - Summary and Description are old-fashioned - renamed initscript - initscript modified to be POSIX compliant diff --git a/.cvsignore b/.cvsignore index 84731dd..6d5e497 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.1.tar.bz2 +netatalk-2.1.1.tar.bz2 diff --git a/netatalk-2.1-initscript.patch b/netatalk-2.1-initscript.patch new file mode 100644 index 0000000..9f5f5ac --- /dev/null +++ b/netatalk-2.1-initscript.patch @@ -0,0 +1,83 @@ +diff -up netatalk-2.1/distrib/initscripts/Makefile.am.initscript netatalk-2.1/distrib/initscripts/Makefile.am +--- netatalk-2.1/distrib/initscripts/Makefile.am.initscript 2010-04-19 13:35:26.000000000 +0200 ++++ netatalk-2.1/distrib/initscripts/Makefile.am 2010-05-25 14:20:23.111718639 +0200 +@@ -58,7 +58,7 @@ uninstall: uninstall-startup + if USE_REDHAT + + sysvdir = /etc/rc.d/init.d +-sysv_SCRIPTS = atalk ++sysv_SCRIPTS = netatalk + + $(sysv_SCRIPTS): rc.atalk.redhat + cp -f rc.atalk.redhat $(sysv_SCRIPTS) +diff -up netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl.initscript netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl +--- netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl.initscript 2010-04-19 13:35:26.000000000 +0200 ++++ netatalk-2.1/distrib/initscripts/rc.atalk.redhat.tmpl 2010-05-25 15:14:58.613715823 +0200 +@@ -19,27 +19,9 @@ ATALK_SBIN=:SBINDIR: + # Source networking configuration. + . /etc/sysconfig/network + +-if [ ! -x ${ATALK_SBIN}/atalkd ]; then +- # Quickly probe for appletalk and warn if we can't find it +- #/sbin/modprobe appletalk || echo "[could not load appletalk module]" +- # Check for IP Encapsulation support +- #/sbin/modprobe ipddp || echo "[could not load IP encapsulation]" +- echo "[${ATALK_SBIN}/atalkd not found. Did it compile?]"; +- exit 0; +-fi +- +-if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then +- echo "[${ATALK_CONF_DIR}/netatalk.conf not found]"; +- exit 0; +-fi +- + # read in netatalk configuration +-. ${ATALK_CONF_DIR}/netatalk.conf +- +-# Check that networking is up. +-if [ ${NETWORKING} = "no" ]; then +- echo "[Network isn't started]"; +- exit 0; ++if [ -f ${ATALK_CONF_DIR}/netatalk.conf ]; then ++ . ${ATALK_CONF_DIR}/netatalk.conf + fi + + # initialize return values +@@ -51,6 +33,26 @@ RETVAL_AFPD=0 + + # startup code for everything + atalk_startup() { ++ # Check that networking is up. ++ if [ ${NETWORKING} = "no" ]; then ++ echo "[Network isn't started]"; ++ exit 1; ++ fi ++ ++ if [ ! -x ${ATALK_SBIN}/atalkd ]; then ++ # Quickly probe for appletalk and warn if we can't find it ++ #/sbin/modprobe appletalk || echo "[could not load appletalk module]" ++ # Check for IP Encapsulation support ++ #/sbin/modprobe ipddp || echo "[could not load IP encapsulation]" ++ echo "[${ATALK_SBIN}/atalkd not found. Check for permissions]"; ++ exit 4; ++ fi ++ ++ if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then ++ echo "[${ATALK_CONF_DIR}/netatalk.conf not found]"; ++ exit 6; ++ fi ++ + if [ x"${ATALKD_RUN}" != x"no" ]; then + echo -n " Starting atalkd:" + daemon ${ATALK_SBIN}/atalkd +@@ -218,8 +220,8 @@ case "$1" in + RETVAL=$? + ;; + *) +- echo "Usage: atalk {start|stop|restart|status}" +- exit 1 ++ echo "Usage: $0 {start|stop|restart|reload|status}" ++ exit 2 + esac + + exit $RETVAL diff --git a/netatalk-2.1-mkfile.patch b/netatalk-2.1-mkfile.patch deleted file mode 100644 index 31231cd..0000000 --- a/netatalk-2.1-mkfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up netatalk-2.1/distrib/initscripts/Makefile.am.mkfile netatalk-2.1/distrib/initscripts/Makefile.am ---- netatalk-2.1/distrib/initscripts/Makefile.am.mkfile 2010-05-14 10:46:29.289421698 +0200 -+++ netatalk-2.1/distrib/initscripts/Makefile.am 2010-05-14 10:48:34.953140484 +0200 -@@ -57,7 +57,7 @@ uninstall: uninstall-startup - - if USE_REDHAT - --sysvdir = $(DESTDIR)/etc/rc.d/init.d -+sysvdir = /etc/rc.d/init.d - sysv_SCRIPTS = atalk - - $(sysv_SCRIPTS): rc.atalk.redhat diff --git a/netatalk.spec b/netatalk.spec index 9a96a79..de51477 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,17 +1,16 @@ -Summary: AppleTalk networking programs +Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh Name: netatalk -Version: 2.1 +Version: 2.1.1 Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 -# Source1: atalk.init Source2: netatalk.pam-system-auth Patch1: netatalk-2.0.2-uams_no_pie.patch Patch2: netatalk-2.0.4-extern_ucreator.patch -Patch3: netatalk-2.1-mkfile.patch +Patch3: netatalk-2.1-initscript.patch Url: http://netatalk.sourceforge.net/ Requires: pam @@ -23,9 +22,12 @@ BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake aut BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -This package enables Linux to talk to Macintosh computers via the -AppleTalk networking protocol. It includes a daemon to allow Linux -to act as a file server over EtherTalk or IP for Mac's. +Netatalk is a freely-available Open Source AFP fileserver. It also provides a +kernel level implementation of the AppleTalk Protocol Suite. A *NIX/*BSD system +running Netatalk is capable of serving many Macintosh clients simultaneously +as an AppleShare file server (AFP), AppleTalk router, *NIX/*BSD print server, +and for accessing AppleTalk printers via Printer Access Protocol (PAP). Included +are a number of minor printing and debugging utilities. %package devel Summary: Headers for Appletalk development @@ -40,7 +42,7 @@ programs. %patch1 -p1 -b .uams_no_pie %patch2 -p1 -b .extern_ucreator -%patch3 -p1 -b .mkfile +%patch3 -p1 -b .initscript ln -s ./NEWS ChangeLog @@ -60,8 +62,9 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen" %ifarch ppc ppc64 s390 s390x export CFLAGS="$CFLAGS -fsigned-char" %endif + %configure \ - --with-pkgconfdir=/etc/atalk/ \ + --with-pkgconfdir=/etc/netatalk/ \ --with-cracklib \ --with-pam \ --with-shadow \ @@ -85,26 +88,7 @@ make %{?_smp_mflags} all %install rm -rf $RPM_BUILD_ROOT -#mkdir -p $RPM_BUILD_ROOT/etc/pam.d -#mkdir -p $RPM_BUILD_ROOT%{_initrddir} -#mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} - make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install -# -# netatalk now installs its own config files, which are more -# appropriate for v2.0 than the ones we used to ship. -# -#install -m644 config/AppleVolumes.default $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.default -#install -m644 config/afpd.conf $RPM_BUILD_ROOT/etc/atalk/afpd.conf -#install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf -#install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf -#install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk -# -# Use netatalk's redhat initscript -# -#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/atalk -#cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ -#cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ # install example config files in doc mkdir config.example @@ -131,18 +115,21 @@ find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add atalk +/sbin/chkconfig --add netatalk /sbin/ldconfig %preun if [ "$1" = "0" ] ; then - /sbin/service atalk stop > /dev/null 2>&1 - /sbin/chkconfig --del atalk + # check for existence due to renaming initscritp + if [ -x %{_initrddir}/netatalk ] ; then + /sbin/service netatalk stop > /dev/null 2>&1 + /sbin/chkconfig --del netatalk + fi fi %postun if [ "$1" -ge "1" ]; then - /sbin/service atalk condrestart > /dev/null 2>&1 || : + /sbin/service netatalk condrestart > /dev/null 2>&1 || : fi /sbin/ldconfig @@ -150,17 +137,16 @@ fi %defattr(-,root,root) %doc COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc -# %doc bin/afile/acleandir.rc %doc config.example -%dir /etc/atalk -%attr(755,root,root) %{_initrddir}/atalk -%config(noreplace) /etc/atalk/AppleVolumes.default -%config(noreplace) /etc/atalk/AppleVolumes.system -%config(noreplace) /etc/atalk/netatalk.conf -%config(noreplace) /etc/atalk/afpd.conf -%config(noreplace) /etc/atalk/atalkd.conf -%config(noreplace) /etc/atalk/papd.conf -%config(noreplace) /etc/pam.d/netatalk +%dir %{_sysconfdir}/netatalk +%attr(755,root,root) %{_initrddir}/netatalk +%config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.default +%config(noreplace) %{_sysconfdir}/netatalk/AppleVolumes.system +%config(noreplace) %{_sysconfdir}/netatalk/netatalk.conf +%config(noreplace) %{_sysconfdir}/netatalk/afpd.conf +%config(noreplace) %{_sysconfdir}/netatalk/atalkd.conf +%config(noreplace) %{_sysconfdir}/netatalk/papd.conf +%config(noreplace) %{_sysconfdir}/pam.d/netatalk %{_sbindir}/* %{_bindir}/* %exclude %{_bindir}/netatalk-config @@ -182,6 +168,12 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Fri May 28 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1.1-1 +- updated to latest upstream version +- fixes #594999 - Summary and Description are old-fashioned +- renamed initscript +- initscript modified to be POSIX compliant + * Wed May 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1-1 - updated to latest upstream version diff --git a/sources b/sources index 350a969..8bebffe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b780f98a8764daab45d288579320a8a0 netatalk-2.1.tar.bz2 +d91913958970b4bcd72577aa52aa31be netatalk-2.1.1.tar.bz2 commit a87ce1d324605c215e753249fc783b749b478bf1 Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Fri May 14 11:53:37 2010 +0000 - updated to latest upstream version diff --git a/.cvsignore b/.cvsignore index 80e07f8..84731dd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.0.5.tar.bz2 +netatalk-2.1.tar.bz2 diff --git a/netatalk-2.0.3-nodefault.patch b/netatalk-2.0.3-nodefault.patch deleted file mode 100644 index ae30fc8..0000000 --- a/netatalk-2.0.3-nodefault.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.tmpl.foo 2005-07-20 17:23:05.000000000 -0400 -+++ netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.tmpl 2005-07-20 17:23:14.000000000 -0400 -@@ -1,5 +1,5 @@ - #! /bin/sh --# chkconfig: 345 91 35 -+# chkconfig: - 91 35 - # description: This package enables Linux to talk to Macintosh - # computers via the AppleTalk networking protocol and - # provides printer, file sharing, and AppleTalk routing diff --git a/netatalk-2.0.4-db4_2-db4_3.patch b/netatalk-2.0.4-db4_2-db4_3.patch deleted file mode 100644 index ff9cd3e..0000000 --- a/netatalk-2.0.4-db4_2-db4_3.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.4/bin/cnid/cnid_index.c ---- netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 2009-07-14 15:54:50.444609410 +0200 -+++ netatalk-2.0.4/bin/cnid/cnid_index.c 2009-07-14 15:58:10.143829111 +0200 -@@ -277,11 +277,11 @@ static int dbif_count(const int dbi, u_i - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) - ret = db->stat(db, db_txn, &sp, 0); - #else -- ret = db->stat(db, &sp, 0); -+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); - #endif - - if (ret) { -- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); - return -1; - } - -diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.4/etc/cnid_dbd/dbif.c ---- netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 2009-07-14 15:55:16.428613311 +0200 -+++ netatalk-2.0.4/etc/cnid_dbd/dbif.c 2009-07-14 15:57:17.038828997 +0200 -@@ -516,11 +516,11 @@ int dbif_count(const int dbi, u_int32_t - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) - ret = db->stat(db, db_txn, &sp, 0); - #else -- ret = db->stat(db, &sp, 0); -+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); - #endif - - if (ret) { -- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); - return -1; - } - diff --git a/netatalk-2.0.4-open_call.patch b/netatalk-2.0.4-open_call.patch deleted file mode 100644 index 1c9eece..0000000 --- a/netatalk-2.0.4-open_call.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.open_call netatalk-2.0.4/bin/cnid/cnid_index.c ---- netatalk-2.0.4/bin/cnid/cnid_index.c.open_call 2009-07-14 16:31:13.662612798 +0200 -+++ netatalk-2.0.4/bin/cnid/cnid_index.c 2009-07-14 16:32:12.494829074 +0200 -@@ -356,7 +356,7 @@ static int dbif_env_init(void) - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.4/etc/cnid_dbd/dbif.c ---- netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call 2009-07-14 16:27:46.905837395 +0200 -+++ netatalk-2.0.4/etc/cnid_dbd/dbif.c 2009-07-14 16:33:31.712829253 +0200 -@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -163,7 +163,7 @@ int dbif_env_init(struct db_param *dbp) - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -197,7 +197,7 @@ int dbif_env_init(struct db_param *dbp) - - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c ---- netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2009-03-29 09:23:23.000000000 +0200 -+++ netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c 2009-07-14 16:27:46.924861205 +0200 -@@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags, mode); -+ return (p->open)(p, NULL, f, d, t, flags, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha - } - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); - /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ - if (rc == DB_RUNRECOVERY) { -@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } -diff -up netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c ---- netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call 2009-03-29 09:23:24.000000000 +0200 -+++ netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c 2009-07-14 16:27:46.928827444 +0200 -@@ -133,9 +133,9 @@ static int my_yield(void) - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); -+ return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha - #endif /* DB_VERSION_MINOR > 1 */ - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - if (rc == DB_RUNRECOVERY) { - /* This is the mother of all errors. We _must_ fail here. */ - LOG(log_error, logtype_default, -@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } diff --git a/netatalk-2.1-mkfile.patch b/netatalk-2.1-mkfile.patch new file mode 100644 index 0000000..31231cd --- /dev/null +++ b/netatalk-2.1-mkfile.patch @@ -0,0 +1,12 @@ +diff -up netatalk-2.1/distrib/initscripts/Makefile.am.mkfile netatalk-2.1/distrib/initscripts/Makefile.am +--- netatalk-2.1/distrib/initscripts/Makefile.am.mkfile 2010-05-14 10:46:29.289421698 +0200 ++++ netatalk-2.1/distrib/initscripts/Makefile.am 2010-05-14 10:48:34.953140484 +0200 +@@ -57,7 +57,7 @@ uninstall: uninstall-startup + + if USE_REDHAT + +-sysvdir = $(DESTDIR)/etc/rc.d/init.d ++sysvdir = /etc/rc.d/init.d + sysv_SCRIPTS = atalk + + $(sysv_SCRIPTS): rc.atalk.redhat diff --git a/netatalk.spec b/netatalk.spec index f868b06..9a96a79 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,18 +1,18 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 2.0.5 -Release: 2%{?dist} +Version: 2.1 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 # Source1: atalk.init Source2: netatalk.pam-system-auth -Patch1: netatalk-2.0.4-db4_2-db4_3.patch -Patch2: netatalk-2.0.2-uams_no_pie.patch -Patch3: netatalk-2.0.4-extern_ucreator.patch -Patch4: netatalk-2.0.3-nodefault.patch -Patch5: netatalk-2.0.4-open_call.patch + +Patch1: netatalk-2.0.2-uams_no_pie.patch +Patch2: netatalk-2.0.4-extern_ucreator.patch +Patch3: netatalk-2.1-mkfile.patch + Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -37,11 +37,10 @@ programs. %prep %setup -q -%patch1 -p1 -b .db4_2-db4_3 -%patch2 -p1 -b .uams_no_pie -%patch3 -p1 -b .extern_ucreator -%patch4 -p1 -%patch5 -p1 -b .open_call + +%patch1 -p1 -b .uams_no_pie +%patch2 -p1 -b .extern_ucreator +%patch3 -p1 -b .mkfile ln -s ./NEWS ChangeLog @@ -106,12 +105,16 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install #install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/atalk #cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ #cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ -chmod a-x bin/afile/acleandir.rc -rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* -# + # install example config files in doc mkdir config.example -cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example +cp -fp config/afpd.conf config.example +cp -fp config/AppleVolumes.system config.example +cp -fp config/AppleVolumes.default config.example +cp -fp config/atalkd.conf config.example +cp -fp config/netatalk.conf config.example +cp -fp config/papd.conf config.example + cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h @@ -147,7 +150,7 @@ fi %defattr(-,root,root) %doc COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc -%doc bin/afile/acleandir.rc +# %doc bin/afile/acleandir.rc %doc config.example %dir /etc/atalk %attr(755,root,root) %{_initrddir}/atalk @@ -179,6 +182,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Wed May 12 2010 Jiri Skala <jskala(a)redhat.com> - 4:2.1-1 +- updated to latest upstream version + * Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-2 - oops forgot upload new sources => shifted release number diff --git a/sources b/sources index 08ba88d..350a969 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bd8f4780abc373e0539ab7cd1f9950f netatalk-2.0.5.tar.bz2 +b780f98a8764daab45d288579320a8a0 netatalk-2.1.tar.bz2 commit 0525712eb4bee0ab8a61fb74bf37aa7db94401a7 Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Wed Nov 25 23:20:07 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index 4266b11..63101a0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: netatalk -# $Id: Makefile,v 1.1 2004/09/09 09:08:15 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:10:48 notting Exp $ NAME := netatalk SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 696dd1d38861b33aaf23c1ba642bd77fc2c19426 Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Tue Nov 24 15:34:00 2009 +0000 - oops forgot upload new sources => shifted release number diff --git a/.cvsignore b/.cvsignore index 6afc5ec..80e07f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-2.0.4.tar.bz2 +netatalk-2.0.5.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index 1887af1..f868b06 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-2 +- oops forgot upload new sources => shifted release number + * Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-1 - updated to latest upstream version diff --git a/sources b/sources index dba923b..08ba88d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f2f40b51ab9268836ef89a7dffaccb0 netatalk-2.0.4.tar.bz2 +3bd8f4780abc373e0539ab7cd1f9950f netatalk-2.0.5.tar.bz2 commit 1a014579697a658aefd2553aff97fe9daef9c93e Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Tue Nov 24 15:26:10 2009 +0000 - updated to latest upstream version diff --git a/atalk.init b/atalk.init deleted file mode 100644 index 817c16e..0000000 --- a/atalk.init +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -# chkconfig: - 91 35 -# description: This package enables Linux to talk to Macintosh computers via the \ -# AppleTalk networking protocol. It includes a daemon to allow Linux \ -# to act as a file server over EtherTalk or IP for Mac's. -# processname: atalkd -# pidfile: /var/run/atalkd.pid -# config: /etc/atalk/* - -# Source function library. -. /etc/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -# Source Appletalk configuration -. /etc/atalk/netatalk.conf - -# Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 - -start() { - echo -n $"Starting AppleTalk services: " - if [ ${ATALK_BGROUND} = yes ] ; then - echo -n "(backgrounded)" - { - daemon atalkd -f /etc/atalk/atalkd.conf - nbprgstr -p 4 "${ATALK_NAME}:Workstation" - nbprgstr -p 4 "${ATALK_NAME}:netatalk" - if [ ${PAPD_RUN} = yes ] ; then - daemon papd -f /etc/atalk/papd.conf - fi - if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system - fi - } >/dev/null & - else - daemon atalkd -f /etc/atalk/atalkd.conf - nbprgstr -p 4 "${ATALK_NAME}:Workstation" - nbprgstr -p 4 "${ATALK_NAME}:netatalk" - if [ ${PAPD_RUN} = yes ] ; then - daemon papd -f /etc/atalk/papd.conf - fi - if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system - fi - fi - echo - touch /var/lock/subsys/atalk -} - -stop() { - echo -n $"Shutting down AppleTalk services: " - killproc afpd - killproc papd - nbpunrgstr "${ATALK_NAME}:Workstation@*" - nbpunrgstr "${ATALK_NAME}:netatalk@*" - killproc atalkd - # Attempt to zap the module, so that we can restart the - # Appletalk daemons cleanly - if [ -e /proc/modules ] && [ -x /sbin/modprobe ] ; then - modprobe -r appletalk - fi - rm -f /var/lock/subsys/atalk - echo "" -} - - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - condrestart) - [ -f /var/lock/subsys/atalk ] && restart || : - ;; - status) - status atalkd - ;; - *) - echo $"Usage: $0 {start|stop|restart|status|condrestart}" - exit 1 -esac - -exit 0 diff --git a/netatalk.spec b/netatalk.spec index 816a935..1887af1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 2.0.4 -Release: 5%{?dist} +Version: 2.0.5 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Nov 24 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.5-1 +- updated to latest upstream version + * Mon Nov 23 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-5 - added BuildRequires: ... libgcrypt-devel - removed outdated atalk.init commit 17fb70554bcd0f9857ad6e109c9c31f7a52013af Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Tue Nov 24 14:47:46 2009 +0000 - added BuildRequires: ... libgcrypt-devel - removed outdated atalk.init diff --git a/netatalk.spec b/netatalk.spec index 7b755c4..816a935 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,12 +1,12 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 -Source1: atalk.init +# Source1: atalk.init Source2: netatalk.pam-system-auth Patch1: netatalk-2.0.4-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch @@ -19,7 +19,7 @@ Requires(post): /sbin/chkconfig /sbin/ldconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service /sbin/ldconfig -BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel +BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel libgcrypt-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -179,6 +179,10 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Nov 23 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-5 +- added BuildRequires: ... libgcrypt-devel +- removed outdated atalk.init + * Tue Sep 15 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-4 - fixed #473943 commit d255f6fd88352319ed8b35492be739e0cf20038a Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Tue Sep 15 21:02:51 2009 +0000 - fixed #473943 diff --git a/netatalk.spec b/netatalk.spec index 0c381f6..7b755c4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -66,9 +66,6 @@ export CFLAGS="$CFLAGS -fsigned-char" --with-cracklib \ --with-pam \ --with-shadow \ - --with-tcp-wrappers \ - --with-ssl \ - --with-flock-locksi \ --with-uams-path=%{_libdir}/atalk \ --enable-shared \ --enable-krbV-uam \ @@ -182,6 +179,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Sep 15 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-4 +- fixed #473943 + * Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.4-3 - rebuilt with new openssl commit d7a3d5c47da6a70890a4c8923564e83883f57c1c Author: Tom Mrz <tmraz(a)fedoraproject.org> Date: Fri Aug 21 14:41:11 2009 +0000 - rebuilt with new openssl diff --git a/netatalk.spec b/netatalk.spec index fb44c52..0c381f6 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -182,6 +182,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.4-3 +- rebuilt with new openssl + * Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild commit 57639ff7e5ac6e25b0fa45124d2847cc65914cfa Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Sat Jul 25 18:00:59 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index 8c446b6..fb44c52 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -182,6 +182,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jul 14 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-1 - updated to latest upstream version commit ce34f05eac3007b4ba058d89452fe50ebde5f890 Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Tue Jul 14 15:37:58 2009 +0000 - updated to latest upstream version diff --git a/.cvsignore b/.cvsignore index abb0106..6afc5ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -netatalk-1.6.4.tar.bz2 -netatalk-2.0.2.tar.bz2 -netatalk-2.0.3.tar.bz2 +netatalk-2.0.4.tar.bz2 diff --git a/netatalk-1.6.3-norc.patch b/netatalk-1.6.3-norc.patch deleted file mode 100644 index 0c4c7d3..0000000 --- a/netatalk-1.6.3-norc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- netatalk-1.6.3/bin/afile/Makefile.in.norc 2003-06-12 19:07:40.000000000 -0400 -+++ netatalk-1.6.3/bin/afile/Makefile.in 2003-07-08 14:22:28.000000000 -0400 -@@ -184,7 +184,6 @@ - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys - - bin_PROGRAMS = afile achfile --bin_SCRIPTS = acleandir.rc - - afile_SOURCES = afile.c common.c common.h - achfile_SOURCES = achfile.c common.c common.h ---- netatalk-1.6.3/man/man1/Makefile.in.norc 2003-06-09 11:59:12.000000000 -0400 -+++ netatalk-1.6.3/man/man1/Makefile.in 2003-07-08 14:22:28.000000000 -0400 -@@ -188,7 +188,6 @@ - GENERATED_MANS = apple_cp.1 apple_mv.1 apple_rm.1 - TEMPLATE_FILES = $(foreach f,$(GENERATED_MANS),$(f).tmpl) - NONGENERATED_MANS = achfile.1 \ -- acleandir.1 \ - aecho.1 \ - afile.1 \ - afppasswd.1 \ diff --git a/netatalk-2.0.2-db4_2-db4_3.patch b/netatalk-2.0.2-db4_2-db4_3.patch deleted file mode 100644 index c2822be..0000000 --- a/netatalk-2.0.2-db4_2-db4_3.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.3/bin/cnid/cnid_index.c ---- netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 -+++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:32:53.000000000 +0200 -@@ -274,10 +274,10 @@ static int dbif_count(const int dbi, u_i - DB_BTREE_STAT *sp; - DB *db = db_table[dbi].db; - -- ret = db->stat(db, &sp, 0); -+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); - - if (ret) { -- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); - return -1; - } - -diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.3/etc/cnid_dbd/dbif.c ---- netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 -+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:32:53.000000000 +0200 -@@ -514,10 +514,10 @@ int dbif_count(const int dbi, u_int32_t - DB_BTREE_STAT *sp; - DB *db = db_table[dbi].db; - -- ret = db->stat(db, &sp, 0); -+ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); - - if (ret) { -- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); -+ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); - return -1; - } - diff --git a/netatalk-2.0.2-extern_ucreator.patch b/netatalk-2.0.2-extern_ucreator.patch deleted file mode 100644 index 3e3a919..0000000 --- a/netatalk-2.0.2-extern_ucreator.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.3/etc/afpd/desktop.c ---- netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator 2008-10-10 10:33:04.000000000 +0200 -+++ netatalk-2.0.3/etc/afpd/desktop.c 2008-10-10 10:33:04.000000000 +0200 -@@ -312,7 +312,7 @@ addicon_err: - } - - static u_char utag[] = { 0, 0, 0, 0 }; --static u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ -+u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ - static u_char utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/ - static short usize = 256; - static u_char uicon[] = { diff --git a/netatalk-2.0.3-chmod.patch b/netatalk-2.0.3-chmod.patch deleted file mode 100644 index f15f806..0000000 --- a/netatalk-2.0.3-chmod.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up netatalk-2.0.3/etc/afpd/unix.c.chmod netatalk-2.0.3/etc/afpd/unix.c ---- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-10-10 10:33:20.000000000 +0200 -+++ netatalk-2.0.3/etc/afpd/unix.c 2008-10-10 10:33:20.000000000 +0200 -@@ -415,14 +415,14 @@ mode_t mode; - struct stat *st; - { - struct stat sb; --mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH; -+mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO; /* rwx for owner group and other, by default */ - - if (!st) { - if (stat(name, &sb) != 0) - return -1; - st = &sb; - } -- mode &= mask; /* keep only rw-rw-rw in mode */ -+ - mode |= st->st_mode & ~mask; /* keep other bits from previous mode */ - if ( chmod( name, mode & ~default_options.umask ) < 0 && errno != EPERM ) { - return -1; diff --git a/netatalk-2.0.3-db4_5.patch b/netatalk-2.0.3-db4_5.patch deleted file mode 100644 index 1c20b9a..0000000 --- a/netatalk-2.0.3-db4_5.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up netatalk-2.0.3/macros/db3-check.m4.db4_5 netatalk-2.0.3/macros/db3-check.m4 ---- netatalk-2.0.3/macros/db3-check.m4.db4_5 2008-10-10 10:32:48.000000000 +0200 -+++ netatalk-2.0.3/macros/db3-check.m4 2008-10-10 10:32:48.000000000 +0200 -@@ -115,6 +115,9 @@ int main(void) { - AC_DEFUN([NETATALK_BERKELEY_LINK], - [ - atalk_cv_lib_db=no -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_7,[-ldb-4.7]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_5,[-ldb-4.5]) -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) - NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42]) diff --git a/netatalk-2.0.3-log_stderr.patch b/netatalk-2.0.3-log_stderr.patch deleted file mode 100644 index 11788b1..0000000 --- a/netatalk-2.0.3-log_stderr.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up netatalk-2.0.3/etc/papd/main.c.log_stderr netatalk-2.0.3/etc/papd/main.c ---- netatalk-2.0.3/etc/papd/main.c.log_stderr 2008-10-10 10:33:30.000000000 +0200 -+++ netatalk-2.0.3/etc/papd/main.c 2008-10-10 10:33:30.000000000 +0200 -@@ -260,7 +260,7 @@ int main( ac, av ) - - switch (server_lock("papd", pidfile, debug)) { - case 0: /* open a couple things again in the child */ -- if ((c = open("/", O_RDONLY)) >= 0) { -+ if (!debug && (c = open("/", O_RDONLY)) >= 0) { - dup2(c, 1); - dup2(c, 2); - } -@@ -287,7 +287,8 @@ int main( ac, av ) - openlog( p, LOG_PID ); - #else /* ultrix */ - set_processname(p); -- syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_lpr ); -+ syslog_setup(log_debug, logtype_default, logoption_ndelay | logoption_pid | -+ debug ? logoption_perror : 0, logfacility_lpr ); - #endif /* ultrix */ - - LOG(log_info, logtype_papd, "restart (%s)", version ); diff --git a/netatalk-2.0.3-lsb.patch b/netatalk-2.0.3-lsb.patch deleted file mode 100644 index ddd98da..0000000 --- a/netatalk-2.0.3-lsb.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.lsb netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat ---- netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.lsb 2008-02-25 15:29:38.000000000 +0100 -+++ netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat 2008-02-25 16:07:36.000000000 +0100 -@@ -1,8 +1,19 @@ - #! /bin/sh -+# -+### BEGIN INIT INFO -+# Provides: netatalk -+# Required-Start: $local_fs $network $syslog -+# Required-Stop: $local_fs $network $syslog -+# Short-Description: AppleTalk networking programs -+# Description: This package enables Linux to talk to Macintosh computers via the -+# AppleTalk networking protocol. It includes a daemon to allow Linux -+# to act as a file server over EtherTalk or IP for Mac's. -+### END INIT INFO -+ - # chkconfig: - 91 35 --# description: This package enables Linux to talk to Macintosh --# computers via the AppleTalk networking protocol and --# provides printer, file sharing, and AppleTalk routing -+# description: This package enables Linux to talk to Macintosh \ -+# computers via the AppleTalk networking protocol and \ -+# provides printer, file sharing, and AppleTalk routing \ - # services. - # - # AppleTalk daemons. Make sure not to start atalkd in the background: -@@ -27,12 +38,12 @@ ATALK_SBIN=/usr/sbin - - if [ ! -x ${ATALK_SBIN}/atalkd ]; then - echo "[${ATALK_SBIN}/atalkd not found. Did it compile?]"; -- exit 0; -+ exit 1; - fi - - if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then - echo "[${ATALK_CONF_DIR}/netatalk.conf not found]"; -- exit 0; -+ exit 6; - fi - - # read in netatalk configuration -@@ -41,7 +52,7 @@ fi - # Check that networking is up. - if [ ${NETWORKING} = "no" ]; then - echo "[Network isn't started]"; -- exit 0; -+ exit 1; - fi - - # initialize return values diff --git a/netatalk-2.0.3-maxsrv.patch b/netatalk-2.0.3-maxsrv.patch deleted file mode 100644 index 11e7858..0000000 --- a/netatalk-2.0.3-maxsrv.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c ---- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-10-10 10:33:25.000000000 +0200 -+++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-10-10 10:33:25.000000000 +0200 -@@ -93,7 +93,7 @@ - static int srvfd; - static int rqstfd; - --#define MAXSRV 128 -+#define MAXSRV 512 - - #define MAXSPAWN 3 /* Max times respawned in.. */ - diff --git a/netatalk-2.0.3-multiarch.patch b/netatalk-2.0.3-multiarch.patch deleted file mode 100644 index bfeaa87..0000000 --- a/netatalk-2.0.3-multiarch.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch netatalk-2.0.3/distrib/config/netatalk-config.in ---- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-10-10 10:33:35.000000000 +0200 -+++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-10-10 10:33:35.000000000 +0200 -@@ -218,9 +218,6 @@ fi - if test "@includedir@" != /usr/include ; then - includes="-I@includedir@" - fi --if test "@libdir@" != /usr/lib ; then -- libs="-L@libdir@" --fi - af_cflags="$af_cflags $includes" - af_libs="$libs -latalk" - diff --git a/netatalk-2.0.3-open_call.patch b/netatalk-2.0.3-open_call.patch deleted file mode 100644 index 5df0519..0000000 --- a/netatalk-2.0.3-open_call.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c ---- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2008-10-10 10:33:14.000000000 +0200 -+++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:33:14.000000000 +0200 -@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -353,7 +353,7 @@ static int dbif_env_init(void) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -379,7 +379,7 @@ static int dbif_env_init(void) - } - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c ---- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2008-10-10 10:33:14.000000000 +0200 -+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:33:14.000000000 +0200 -@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp) - - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c ---- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2008-10-10 10:33:14.000000000 +0200 -@@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags, mode); -+ return (p->open)(p, NULL, f, d, t, flags, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha - } - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); - /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ - if (rc == DB_RUNRECOVERY) { -@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } -diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c ---- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2008-10-10 10:33:14.000000000 +0200 -@@ -133,9 +133,9 @@ static int my_yield(void) - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); -+ return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha - #endif /* DB_VERSION_MINOR > 1 */ - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - if (rc == DB_RUNRECOVERY) { - /* This is the mother of all errors. We _must_ fail here. */ - LOG(log_error, logtype_default, -@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } diff --git a/netatalk-2.0.3-papd_cmds.patch b/netatalk-2.0.3-papd_cmds.patch deleted file mode 100644 index fdc1e51..0000000 --- a/netatalk-2.0.3-papd_cmds.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -Nurad netatalk-2.0.3.orig/etc/papd/lp.c netatalk-2.0.3/etc/papd/lp.c ---- netatalk-2.0.3.orig/etc/papd/lp.c 2009-01-28 17:04:36.000000000 +0100 -+++ netatalk-2.0.3/etc/papd/lp.c 2009-01-28 17:05:01.000000000 +0100 -@@ -212,10 +212,54 @@ - - #define is_var(a, b) (strncmp((a), (b), 2) == 0) - -+static size_t quote(char *dest, char *src, const size_t bsize, size_t len) { -+ size_t used = 0; -+ -+ while (len && used < bsize ) { -+ switch (*src) { -+ case '$': -+ case '\\': -+ case '"': -+ case ';': -+ case '&': -+ case '(': -+ case ')': -+ case ' ': -+ case '*': -+ case '#': -+ case '|': -+ case '>': -+ case '<': -+ case '[': -+ case ']': -+ case '{': -+ case '}': -+ case '^': -+ case '?': -+ case '~': -+ case '`': -+ case '\x0A': -+ case '\xFF': -+ if (used + 2 > bsize ) -+ return used; -+ *dest = '\\'; -+ dest++; -+ used++; -+ break; -+ } -+ *dest = *src; -+ src++; -+ dest++; -+ len--; -+ used++; -+ } -+ return used; -+} -+ - static char* pipexlate(char *src) - { - char *p, *q, *dest; -- static char destbuf[MAXPATHLEN]; -+ static char destbuf[MAXPATHLEN + 1]; - size_t destlen = MAXPATHLEN; - int len = 0; - -@@ -224,13 +268,16 @@ - if (!src) - return NULL; - -- strncpy(dest, src, MAXPATHLEN); -- if ((p = strchr(src, '%')) == NULL) /* nothing to do */ -+ memset(dest, 0, sizeof(destbuf)); -+ if ((p = strchr(src, '%')) == NULL) { /* nothing to do */ -+ strncpy(dest, src, sizeof(dest) - 1); - return destbuf; -+ } - - /* first part of the path. just forward to the next variable. */ - len = MIN((size_t)(p - src), destlen); - if (len > 0) { -+ strncpy(dest, src, len); - destlen -= len; - dest += len; - } -@@ -246,17 +293,20 @@ - q = lp.lp_created_for; - } else if (is_var(p, "%%")) { - q = "%"; -- } else -- q = p; -+ } - - /* copy the stuff over. if we don't understand something that we - * should, just skip it over. */ - if (q) { -- len = MIN(p == q ? 2 : strlen(q), destlen); -+ len = MIN(strlen(q), destlen); -+ len = quote(dest, q, destlen, len); -+ } -+ else { -+ len = MIN(2, destlen); - strncpy(dest, q, len); -- dest += len; -- destlen -= len; - } -+ dest += len; -+ destlen -= len; - - /* stuff up to next $ */ - src = p + 2; diff --git a/netatalk-2.0.4-db4_2-db4_3.patch b/netatalk-2.0.4-db4_2-db4_3.patch new file mode 100644 index 0000000..ff9cd3e --- /dev/null +++ b/netatalk-2.0.4-db4_2-db4_3.patch @@ -0,0 +1,34 @@ +diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.4/bin/cnid/cnid_index.c +--- netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 2009-07-14 15:54:50.444609410 +0200 ++++ netatalk-2.0.4/bin/cnid/cnid_index.c 2009-07-14 15:58:10.143829111 +0200 +@@ -277,11 +277,11 @@ static int dbif_count(const int dbi, u_i + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) + ret = db->stat(db, db_txn, &sp, 0); + #else +- ret = db->stat(db, &sp, 0); ++ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); + #endif + + if (ret) { +- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); ++ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); + return -1; + } + +diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.4/etc/cnid_dbd/dbif.c +--- netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 2009-07-14 15:55:16.428613311 +0200 ++++ netatalk-2.0.4/etc/cnid_dbd/dbif.c 2009-07-14 15:57:17.038828997 +0200 +@@ -516,11 +516,11 @@ int dbif_count(const int dbi, u_int32_t + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) + ret = db->stat(db, db_txn, &sp, 0); + #else +- ret = db->stat(db, &sp, 0); ++ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); + #endif + + if (ret) { +- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); ++ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); + return -1; + } + diff --git a/netatalk-2.0.4-extern_ucreator.patch b/netatalk-2.0.4-extern_ucreator.patch new file mode 100644 index 0000000..413ac08 --- /dev/null +++ b/netatalk-2.0.4-extern_ucreator.patch @@ -0,0 +1,12 @@ +diff -up netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.4/etc/afpd/desktop.c +--- netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator 2009-07-14 16:26:36.984610055 +0200 ++++ netatalk-2.0.4/etc/afpd/desktop.c 2009-07-14 16:27:01.607580009 +0200 +@@ -312,7 +312,7 @@ addicon_err: + } + + static const u_char utag[] = { 0, 0, 0, 0 }; +-static const u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ ++u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ + static const u_char utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/ + static const short usize = 256; + diff --git a/netatalk-2.0.4-open_call.patch b/netatalk-2.0.4-open_call.patch new file mode 100644 index 0000000..1c9eece --- /dev/null +++ b/netatalk-2.0.4-open_call.patch @@ -0,0 +1,119 @@ +diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.open_call netatalk-2.0.4/bin/cnid/cnid_index.c +--- netatalk-2.0.4/bin/cnid/cnid_index.c.open_call 2009-07-14 16:31:13.662612798 +0200 ++++ netatalk-2.0.4/bin/cnid/cnid_index.c 2009-07-14 16:32:12.494829074 +0200 +@@ -356,7 +356,7 @@ static int dbif_env_init(void) + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.4/etc/cnid_dbd/dbif.c +--- netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call 2009-07-14 16:27:46.905837395 +0200 ++++ netatalk-2.0.4/etc/cnid_dbd/dbif.c 2009-07-14 16:33:31.712829253 +0200 +@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -163,7 +163,7 @@ int dbif_env_init(struct db_param *dbp) + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -197,7 +197,7 @@ int dbif_env_init(struct db_param *dbp) + + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +diff -up netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c +--- netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2009-03-29 09:23:23.000000000 +0200 ++++ netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c 2009-07-14 16:27:46.924861205 +0200 +@@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags, mode); ++ return (p->open)(p, NULL, f, d, t, flags, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha + } + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); + /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ + if (rc == DB_RUNRECOVERY) { +@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } +diff -up netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c +--- netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call 2009-03-29 09:23:24.000000000 +0200 ++++ netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c 2009-07-14 16:27:46.928827444 +0200 +@@ -133,9 +133,9 @@ static int my_yield(void) + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); ++ return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha + #endif /* DB_VERSION_MINOR > 1 */ + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + if (rc == DB_RUNRECOVERY) { + /* This is the mother of all errors. We _must_ fail here. */ + LOG(log_error, logtype_default, +@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } diff --git a/netatalk.spec b/netatalk.spec index e2974a4..8c446b6 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,24 +1,18 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 2.0.3 -Release: 27%{?dist} +Version: 2.0.4 +Release: 1%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: atalk.init Source2: netatalk.pam-system-auth -Patch0: netatalk-2.0.3-db4_5.patch -Patch1: netatalk-2.0.2-db4_2-db4_3.patch +Patch1: netatalk-2.0.4-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch -Patch3: netatalk-2.0.2-extern_ucreator.patch +Patch3: netatalk-2.0.4-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch -Patch5: netatalk-2.0.3-open_call.patch -Patch6: netatalk-2.0.3-chmod.patch -Patch7: netatalk-2.0.3-maxsrv.patch -Patch8: netatalk-2.0.3-log_stderr.patch -Patch9: netatalk-2.0.3-multiarch.patch -Patch10: netatalk-2.0.3-papd_cmds.patch +Patch5: netatalk-2.0.4-open_call.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -32,16 +26,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) This package enables Linux to talk to Macintosh computers via the AppleTalk networking protocol. It includes a daemon to allow Linux to act as a file server over EtherTalk or IP for Mac's. -The systems without coreutils 7.0 and later require netatalk-timeout package. - -%package timeout -Summary: Timeout utility for the systems without coreutils -Group: System Environment/Daemons -Requires: %{name} = %{epoch}:%{version}-%{release} -Conflicts: coreutils >= 7.0 - -%description timeout -The package contains the timeout utility that was a part of netatalk earlier. The coreutils 7.0 and later contains this utility too therefore the timeout is separated to sub-package for usage on the systems without coreutils. %package devel Summary: Headers for Appletalk development @@ -53,17 +37,11 @@ programs. %prep %setup -q -%patch0 -p1 -b .db4_5 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 %patch5 -p1 -b .open_call -%patch6 -p1 -b .chmod -%patch7 -p1 -b .maxsrv -%patch8 -p1 -b .log_stderr -%patch9 -p1 -b .multiarch -%patch10 -p1 -b .papd_cmds ln -s ./NEWS ChangeLog @@ -186,19 +164,13 @@ fi %{_sbindir}/* %{_bindir}/* %exclude %{_bindir}/netatalk-config -%exclude %{_bindir}/timeout %{_mandir}/man*/* %exclude %{_mandir}/man*/netatalk-config* -%exclude %{_mandir}/man1/timeout.1.gz %{_datadir}/netatalk %dir %{_libdir}/atalk %{_libdir}/atalk/*.so %{_libexecdir}/* -%files timeout -%{_bindir}/timeout -%{_mandir}/man1/timeout.1.gz - %files devel %defattr(-,root,root) %dir %{_includedir}/atalk @@ -210,6 +182,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Jul 14 2009 Jiri Skala <jskala(a)redhat.com> - 4:2.0.4-1 +- updated to latest upstream version + * Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.3-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index bde5f18..dba923b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 +6f2f40b51ab9268836ef89a7dffaccb0 netatalk-2.0.4.tar.bz2 commit ee4ce2e5d7ca2c7e848ce707afa1cfb023f01f6c Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Thu Feb 26 04:58:22 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/netatalk.spec b/netatalk.spec index 28fbd56..e2974a4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 26%{?dist} +Release: 27%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -210,6 +210,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4:2.0.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-26 - Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability commit a171a849b287478e695e115dc2f5eeca725cea87 Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Tue Feb 17 07:27:13 2009 +0000 - Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability diff --git a/netatalk-2.0.3-papd_cmds.patch b/netatalk-2.0.3-papd_cmds.patch new file mode 100644 index 0000000..fdc1e51 --- /dev/null +++ b/netatalk-2.0.3-papd_cmds.patch @@ -0,0 +1,104 @@ +diff -Nurad netatalk-2.0.3.orig/etc/papd/lp.c netatalk-2.0.3/etc/papd/lp.c +--- netatalk-2.0.3.orig/etc/papd/lp.c 2009-01-28 17:04:36.000000000 +0100 ++++ netatalk-2.0.3/etc/papd/lp.c 2009-01-28 17:05:01.000000000 +0100 +@@ -212,10 +212,54 @@ + + #define is_var(a, b) (strncmp((a), (b), 2) == 0) + ++static size_t quote(char *dest, char *src, const size_t bsize, size_t len) { ++ size_t used = 0; ++ ++ while (len && used < bsize ) { ++ switch (*src) { ++ case '$': ++ case '\\': ++ case '"': ++ case ';': ++ case '&': ++ case '(': ++ case ')': ++ case ' ': ++ case '*': ++ case '#': ++ case '|': ++ case '>': ++ case '<': ++ case '[': ++ case ']': ++ case '{': ++ case '}': ++ case '^': ++ case '?': ++ case '~': ++ case '`': ++ case '\x0A': ++ case '\xFF': ++ if (used + 2 > bsize ) ++ return used; ++ *dest = '\\'; ++ dest++; ++ used++; ++ break; ++ } ++ *dest = *src; ++ src++; ++ dest++; ++ len--; ++ used++; ++ } ++ return used; ++} ++ + static char* pipexlate(char *src) + { + char *p, *q, *dest; +- static char destbuf[MAXPATHLEN]; ++ static char destbuf[MAXPATHLEN + 1]; + size_t destlen = MAXPATHLEN; + int len = 0; + +@@ -224,13 +268,16 @@ + if (!src) + return NULL; + +- strncpy(dest, src, MAXPATHLEN); +- if ((p = strchr(src, '%')) == NULL) /* nothing to do */ ++ memset(dest, 0, sizeof(destbuf)); ++ if ((p = strchr(src, '%')) == NULL) { /* nothing to do */ ++ strncpy(dest, src, sizeof(dest) - 1); + return destbuf; ++ } + + /* first part of the path. just forward to the next variable. */ + len = MIN((size_t)(p - src), destlen); + if (len > 0) { ++ strncpy(dest, src, len); + destlen -= len; + dest += len; + } +@@ -246,17 +293,20 @@ + q = lp.lp_created_for; + } else if (is_var(p, "%%")) { + q = "%"; +- } else +- q = p; ++ } + + /* copy the stuff over. if we don't understand something that we + * should, just skip it over. */ + if (q) { +- len = MIN(p == q ? 2 : strlen(q), destlen); ++ len = MIN(strlen(q), destlen); ++ len = quote(dest, q, destlen, len); ++ } ++ else { ++ len = MIN(2, destlen); + strncpy(dest, q, len); +- dest += len; +- destlen -= len; + } ++ dest += len; ++ destlen -= len; + + /* stuff up to next $ */ + src = p + 2; diff --git a/netatalk.spec b/netatalk.spec index 8c3a4e1..28fbd56 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 25%{?dist} +Release: 26%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -18,6 +18,7 @@ Patch6: netatalk-2.0.3-chmod.patch Patch7: netatalk-2.0.3-maxsrv.patch Patch8: netatalk-2.0.3-log_stderr.patch Patch9: netatalk-2.0.3-multiarch.patch +Patch10: netatalk-2.0.3-papd_cmds.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -62,6 +63,7 @@ programs. %patch7 -p1 -b .maxsrv %patch8 -p1 -b .log_stderr %patch9 -p1 -b .multiarch +%patch10 -p1 -b .papd_cmds ln -s ./NEWS ChangeLog @@ -208,10 +210,13 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog -* Tue Jan 27 2009 Jiri Skala <jskala(a)redhat.com> -4:3.0.3-25 +* Mon Feb 16 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-26 +- Resolves #480641 - CVE-2008-5718 netatalk: papd command injection vulnerability + +* Tue Jan 27 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-25 - fixed epoch in the subpackage requires -* Fri Jan 23 2009 Jiri Skala <jskala(a)redhat.com> -4:3.0.3-24 +* Fri Jan 23 2009 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-24 - fix #473186 conflict timeout with coreutils * Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.3-23 commit 501be50177243382a64a39ed8abba76c23b1babe Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Tue Jan 27 10:26:26 2009 +0000 - fixed epoch in the subpackage requires diff --git a/netatalk.spec b/netatalk.spec index 2d6d81c..8c3a4e1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -36,7 +36,7 @@ The systems without coreutils 7.0 and later require netatalk-timeout package. %package timeout Summary: Timeout utility for the systems without coreutils Group: System Environment/Daemons -Requires: netatalk = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: coreutils >= 7.0 %description timeout @@ -208,6 +208,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Jan 27 2009 Jiri Skala <jskala(a)redhat.com> -4:3.0.3-25 +- fixed epoch in the subpackage requires + * Fri Jan 23 2009 Jiri Skala <jskala(a)redhat.com> -4:3.0.3-24 - fix #473186 conflict timeout with coreutils commit 76845d2a5fa5426da933fc47530312acf6c7c19b Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Mon Jan 26 16:57:16 2009 +0000 - fix #473186 conflict timeout with coreutils diff --git a/netatalk.spec b/netatalk.spec index 028ae3d..2d6d81c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -31,6 +31,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) This package enables Linux to talk to Macintosh computers via the AppleTalk networking protocol. It includes a daemon to allow Linux to act as a file server over EtherTalk or IP for Mac's. +The systems without coreutils 7.0 and later require netatalk-timeout package. + +%package timeout +Summary: Timeout utility for the systems without coreutils +Group: System Environment/Daemons +Requires: netatalk = %{version}-%{release} +Conflicts: coreutils >= 7.0 + +%description timeout +The package contains the timeout utility that was a part of netatalk earlier. The coreutils 7.0 and later contains this utility too therefore the timeout is separated to sub-package for usage on the systems without coreutils. %package devel Summary: Headers for Appletalk development @@ -174,13 +184,19 @@ fi %{_sbindir}/* %{_bindir}/* %exclude %{_bindir}/netatalk-config +%exclude %{_bindir}/timeout %{_mandir}/man*/* %exclude %{_mandir}/man*/netatalk-config* +%exclude %{_mandir}/man1/timeout.1.gz %{_datadir}/netatalk %dir %{_libdir}/atalk %{_libdir}/atalk/*.so %{_libexecdir}/* +%files timeout +%{_bindir}/timeout +%{_mandir}/man1/timeout.1.gz + %files devel %defattr(-,root,root) %dir %{_includedir}/atalk @@ -192,6 +208,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Fri Jan 23 2009 Jiri Skala <jskala(a)redhat.com> -4:3.0.3-24 +- fix #473186 conflict timeout with coreutils + * Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.3-23 - rebuild with new openssl commit ed9121319e95c8b82efda7e93e4214287e1ed549 Author: Tom Mrz <tmraz(a)fedoraproject.org> Date: Sat Jan 17 15:27:22 2009 +0000 - rebuild with new openssl diff --git a/netatalk.spec b/netatalk.spec index 5e9f474..028ae3d 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -192,6 +192,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Sat Jan 17 2009 Tomas Mraz <tmraz(a)redhat.com> - 4:2.0.3-23 +- rebuild with new openssl + * Wed Dec 03 2008 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-22 - fix #473939 netatalk-2.0.3-21.fc10 disable quota commit e323ab0ba07c2c2525f25f8c7229c0cb18a58560 Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Thu Jan 15 09:50:03 2009 +0000 - fix #473939 netatalk-2.0.3-21.fc10 disable quota diff --git a/netatalk.spec b/netatalk.spec index 166f0e7..5e9f474 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons @@ -24,7 +24,7 @@ Requires(post): /sbin/chkconfig /sbin/ldconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service /sbin/ldconfig -BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel +BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -192,6 +192,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Wed Dec 03 2008 Jiri Skala <jskala(a)redhat.com> -4:2.0.3-22 +- fix #473939 netatalk-2.0.3-21.fc10 disable quota + * Mon Oct 13 2008 Jiri Skala <jskala(a)redhat.com> - 4:2.0.3-21 - fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches commit a4cba520515390f3f2b5e288fcaba669ad46e674 Author: Jiri Skala <jskala(a)fedoraproject.org> Date: Mon Oct 13 07:46:56 2008 +0000 - fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches diff --git a/netatalk-2.0.2-db4_2-db4_3.patch b/netatalk-2.0.2-db4_2-db4_3.patch index a4fd7ea..c2822be 100644 --- a/netatalk-2.0.2-db4_2-db4_3.patch +++ b/netatalk-2.0.2-db4_2-db4_3.patch @@ -1,6 +1,7 @@ ---- netatalk-2.0.2/etc/cnid_dbd/dbif.c.db4_2-db4_3 2004-12-21 08:36:12.000000000 -0500 -+++ netatalk-2.0.2/etc/cnid_dbd/dbif.c 2005-02-21 13:21:45.000000000 -0500 -@@ -514,10 +514,10 @@ +diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.3/bin/cnid/cnid_index.c +--- netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 ++++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:32:53.000000000 +0200 +@@ -274,10 +274,10 @@ static int dbif_count(const int dbi, u_i DB_BTREE_STAT *sp; DB *db = db_table[dbi].db; @@ -13,9 +14,10 @@ return -1; } ---- netatalk-2.0.2/bin/cnid/cnid_index.c.db4_2-db4_3 2005-01-03 08:49:55.000000000 -0500 -+++ netatalk-2.0.2/bin/cnid/cnid_index.c 2005-02-21 13:23:12.000000000 -0500 -@@ -274,10 +274,10 @@ +diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.3/etc/cnid_dbd/dbif.c +--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:32:53.000000000 +0200 +@@ -514,10 +514,10 @@ int dbif_count(const int dbi, u_int32_t DB_BTREE_STAT *sp; DB *db = db_table[dbi].db; diff --git a/netatalk-2.0.2-extern_ucreator.patch b/netatalk-2.0.2-extern_ucreator.patch index 3eaab67..3e3a919 100644 --- a/netatalk-2.0.2-extern_ucreator.patch +++ b/netatalk-2.0.2-extern_ucreator.patch @@ -1,6 +1,7 @@ ---- netatalk-2.0.2/etc/afpd/desktop.c.extern_ucreator 2004-10-09 08:48:21.000000000 -0400 -+++ netatalk-2.0.2/etc/afpd/desktop.c 2005-03-07 15:44:07.000000000 -0500 -@@ -310,7 +310,7 @@ +diff -up netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.3/etc/afpd/desktop.c +--- netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator 2008-10-10 10:33:04.000000000 +0200 ++++ netatalk-2.0.3/etc/afpd/desktop.c 2008-10-10 10:33:04.000000000 +0200 +@@ -312,7 +312,7 @@ addicon_err: } static u_char utag[] = { 0, 0, 0, 0 }; diff --git a/netatalk-2.0.2-uams_no_pie.patch b/netatalk-2.0.2-uams_no_pie.patch index 09ab725..c41c66f 100644 --- a/netatalk-2.0.2-uams_no_pie.patch +++ b/netatalk-2.0.2-uams_no_pie.patch @@ -1,5 +1,6 @@ ---- netatalk-2.0.2/etc/uams/Makefile.am.uams_no_pie 2004-08-10 23:11:07.000000000 -0400 -+++ netatalk-2.0.2/etc/uams/Makefile.am 2005-02-21 14:30:23.000000000 -0500 +diff -up netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie netatalk-2.0.3/etc/uams/Makefile.am +--- netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 ++++ netatalk-2.0.3/etc/uams/Makefile.am 2008-10-10 10:32:59.000000000 +0200 @@ -1,5 +1,5 @@ # Makefile.am for etc/uams/ - @@ -7,9 +8,10 @@ SUBDIRS = uams_krb4 # ---- netatalk-2.0.2/macros/gssapi-check.m4.uams_no_pie 2004-06-18 03:57:19.000000000 -0400 -+++ netatalk-2.0.2/macros/gssapi-check.m4 2005-02-21 14:58:26.000000000 -0500 -@@ -126,7 +126,7 @@ +diff -up netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie netatalk-2.0.3/macros/gssapi-check.m4 +--- netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 ++++ netatalk-2.0.3/macros/gssapi-check.m4 2008-10-10 10:32:59.000000000 +0200 +@@ -126,7 +126,7 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK], if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then AC_DEFINE(HAVE_GSSAPI,1,[Whether to enable GSSAPI support]) AC_MSG_RESULT([yes]) diff --git a/netatalk-2.0.3-chmod.patch b/netatalk-2.0.3-chmod.patch index 3455bbe..f15f806 100644 --- a/netatalk-2.0.3-chmod.patch +++ b/netatalk-2.0.3-chmod.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/etc/afpd/unix.c.chmod netatalk-2.0.3/etc/afpd/unix.c ---- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-03-06 09:09:57.000000000 +0100 -+++ netatalk-2.0.3/etc/afpd/unix.c 2008-03-06 09:10:43.000000000 +0100 +--- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-10-10 10:33:20.000000000 +0200 ++++ netatalk-2.0.3/etc/afpd/unix.c 2008-10-10 10:33:20.000000000 +0200 @@ -415,14 +415,14 @@ mode_t mode; struct stat *st; { diff --git a/netatalk-2.0.3-db4_5.patch b/netatalk-2.0.3-db4_5.patch index 0d95146..1c20b9a 100644 --- a/netatalk-2.0.3-db4_5.patch +++ b/netatalk-2.0.3-db4_5.patch @@ -1,9 +1,11 @@ ---- netatalk-2.0.3/macros/db3-check.m4.db4_3 2004-08-11 05:01:11.000000000 +0200 -+++ netatalk-2.0.3/macros/db3-check.m4 2007-01-23 14:27:14.000000000 +0100 -@@ -115,6 +115,8 @@ +diff -up netatalk-2.0.3/macros/db3-check.m4.db4_5 netatalk-2.0.3/macros/db3-check.m4 +--- netatalk-2.0.3/macros/db3-check.m4.db4_5 2008-10-10 10:32:48.000000000 +0200 ++++ netatalk-2.0.3/macros/db3-check.m4 2008-10-10 10:32:48.000000000 +0200 +@@ -115,6 +115,9 @@ int main(void) { AC_DEFUN([NETATALK_BERKELEY_LINK], [ atalk_cv_lib_db=no ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_7,[-ldb-4.7]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_5,[-ldb-4.5]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) diff --git a/netatalk-2.0.3-log_stderr.patch b/netatalk-2.0.3-log_stderr.patch index ad2f645..11788b1 100644 --- a/netatalk-2.0.3-log_stderr.patch +++ b/netatalk-2.0.3-log_stderr.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/etc/papd/main.c.log_stderr netatalk-2.0.3/etc/papd/main.c ---- netatalk-2.0.3/etc/papd/main.c.log_stderr 2004-06-09 03:25:53.000000000 +0200 -+++ netatalk-2.0.3/etc/papd/main.c 2008-03-06 12:14:58.000000000 +0100 +--- netatalk-2.0.3/etc/papd/main.c.log_stderr 2008-10-10 10:33:30.000000000 +0200 ++++ netatalk-2.0.3/etc/papd/main.c 2008-10-10 10:33:30.000000000 +0200 @@ -260,7 +260,7 @@ int main( ac, av ) switch (server_lock("papd", pidfile, debug)) { diff --git a/netatalk-2.0.3-maxsrv.patch b/netatalk-2.0.3-maxsrv.patch index b721ec6..11e7858 100644 --- a/netatalk-2.0.3-maxsrv.patch +++ b/netatalk-2.0.3-maxsrv.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c ---- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-03-06 09:20:52.000000000 +0100 -+++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-03-06 09:22:40.000000000 +0100 +--- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-10-10 10:33:25.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-10-10 10:33:25.000000000 +0200 @@ -93,7 +93,7 @@ static int srvfd; static int rqstfd; diff --git a/netatalk-2.0.3-multiarch.patch b/netatalk-2.0.3-multiarch.patch index be18833..bfeaa87 100644 --- a/netatalk-2.0.3-multiarch.patch +++ b/netatalk-2.0.3-multiarch.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch netatalk-2.0.3/distrib/config/netatalk-config.in ---- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-03-06 15:54:27.000000000 +0100 -+++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-03-06 15:55:00.000000000 +0100 +--- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-10-10 10:33:35.000000000 +0200 ++++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-10-10 10:33:35.000000000 +0200 @@ -218,9 +218,6 @@ fi if test "@includedir@" != /usr/include ; then includes="-I@includedir@" diff --git a/netatalk-2.0.3-open_call.patch b/netatalk-2.0.3-open_call.patch index 4c3fe4e..5df0519 100644 --- a/netatalk-2.0.3-open_call.patch +++ b/netatalk-2.0.3-open_call.patch @@ -1,6 +1,72 @@ +diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c +--- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:33:14.000000000 +0200 +@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -353,7 +353,7 @@ static int dbif_env_init(void) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -379,7 +379,7 @@ static int dbif_env_init(void) + } + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c +--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:33:14.000000000 +0200 +@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp) + + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c ---- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2007-09-17 15:21:26.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2007-09-17 15:21:43.000000000 +0200 +--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2008-10-10 10:33:14.000000000 +0200 @@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) { @@ -36,8 +102,8 @@ diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0 goto fail_lock; } diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c ---- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2007-09-17 15:14:36.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2007-09-17 15:15:06.000000000 +0200 +--- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2008-10-10 10:33:14.000000000 +0200 @@ -133,9 +133,9 @@ static int my_yield(void) static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) { @@ -72,69 +138,3 @@ diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0 LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); goto fail_lock; } -diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c ---- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2007-09-17 15:14:49.000000000 +0200 -+++ netatalk-2.0.3/bin/cnid/cnid_index.c 2007-09-17 15:15:35.000000000 +0200 -@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -353,7 +353,7 @@ static int dbif_env_init(void) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -379,7 +379,7 @@ static int dbif_env_init(void) - } - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c ---- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2007-09-17 15:14:59.000000000 +0200 -+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2007-09-17 15:16:54.000000000 +0200 -@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * - int ret; - - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); - #else -- ret = db->open(db, file, name, type, DB_CREATE, mode); -+ ret = (db->open)(db, file, name, type, DB_CREATE, mode); - #endif - - if (ret) { -@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment: %s", - db_strerror(ret)); - db_env->close(db_env, 0); -@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp) - - if (db_errlog != NULL) - db_env->set_errfile(db_env, db_errlog); -- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { -+ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { - LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", - db_strerror(ret)); - db_env->close(db_env, 0); diff --git a/netatalk.spec b/netatalk.spec index d0ccc14..166f0e7 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,16 +1,13 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 4 License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: atalk.init Source2: netatalk.pam-system-auth -#Patch0: netatalk-1.6.3-norc.patch -#Patch1: netatalk-1.5.5-openssl097.patch -#Patch2: netatalk-1.5.5-pathcat.patch Patch0: netatalk-2.0.3-db4_5.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch @@ -45,9 +42,6 @@ programs. %prep %setup -q -#%patch0 -p 1 -b .norc -#%patch1 -p 1 -b .openssl097 -#%patch2 -p1 -b .pathcat %patch0 -p1 -b .db4_5 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie @@ -198,6 +192,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Oct 13 2008 Jiri Skala <jskala(a)redhat.com> - 4:2.0.3-21 +- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches + * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 4:2.0.3-20 - fix license tag commit 9066f9eea81b071f076cd3d0925e948b0db87add Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Aug 11 18:54:46 2008 +0000 fix license tag diff --git a/netatalk.spec b/netatalk.spec index 9ddce93..d0ccc14 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,9 +1,9 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 4 -License: GPL +License: GPLv2+ Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: atalk.init @@ -198,6 +198,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 4:2.0.3-20 +- fix license tag + * Thu Mar 06 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-19 - fix chmod o+x (#225085) - increase the maximum number of cnid_dbd processes to 512 (#232805) commit 960fc3ebbeca07c2eaa662d214853a6bb3ceb9c3 Author: Martin Nagy <mnagy(a)fedoraproject.org> Date: Thu Mar 6 15:40:16 2008 +0000 - fix chmod o+x (#225085) - increase the maximum number of cnid_dbd processes to 512 (#232805) - papd now writes debugging output to stderr when invoked with -d (#150021) - fix multiarch conflict for netatalk-devel (#342681) diff --git a/netatalk-2.0.3-chmod.patch b/netatalk-2.0.3-chmod.patch new file mode 100644 index 0000000..3455bbe --- /dev/null +++ b/netatalk-2.0.3-chmod.patch @@ -0,0 +1,20 @@ +diff -up netatalk-2.0.3/etc/afpd/unix.c.chmod netatalk-2.0.3/etc/afpd/unix.c +--- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-03-06 09:09:57.000000000 +0100 ++++ netatalk-2.0.3/etc/afpd/unix.c 2008-03-06 09:10:43.000000000 +0100 +@@ -415,14 +415,14 @@ mode_t mode; + struct stat *st; + { + struct stat sb; +-mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH; ++mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO; /* rwx for owner group and other, by default */ + + if (!st) { + if (stat(name, &sb) != 0) + return -1; + st = &sb; + } +- mode &= mask; /* keep only rw-rw-rw in mode */ ++ + mode |= st->st_mode & ~mask; /* keep other bits from previous mode */ + if ( chmod( name, mode & ~default_options.umask ) < 0 && errno != EPERM ) { + return -1; diff --git a/netatalk-2.0.3-log_stderr.patch b/netatalk-2.0.3-log_stderr.patch new file mode 100644 index 0000000..ad2f645 --- /dev/null +++ b/netatalk-2.0.3-log_stderr.patch @@ -0,0 +1,22 @@ +diff -up netatalk-2.0.3/etc/papd/main.c.log_stderr netatalk-2.0.3/etc/papd/main.c +--- netatalk-2.0.3/etc/papd/main.c.log_stderr 2004-06-09 03:25:53.000000000 +0200 ++++ netatalk-2.0.3/etc/papd/main.c 2008-03-06 12:14:58.000000000 +0100 +@@ -260,7 +260,7 @@ int main( ac, av ) + + switch (server_lock("papd", pidfile, debug)) { + case 0: /* open a couple things again in the child */ +- if ((c = open("/", O_RDONLY)) >= 0) { ++ if (!debug && (c = open("/", O_RDONLY)) >= 0) { + dup2(c, 1); + dup2(c, 2); + } +@@ -287,7 +287,8 @@ int main( ac, av ) + openlog( p, LOG_PID ); + #else /* ultrix */ + set_processname(p); +- syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_lpr ); ++ syslog_setup(log_debug, logtype_default, logoption_ndelay | logoption_pid | ++ debug ? logoption_perror : 0, logfacility_lpr ); + #endif /* ultrix */ + + LOG(log_info, logtype_papd, "restart (%s)", version ); diff --git a/netatalk-2.0.3-maxsrv.patch b/netatalk-2.0.3-maxsrv.patch new file mode 100644 index 0000000..b721ec6 --- /dev/null +++ b/netatalk-2.0.3-maxsrv.patch @@ -0,0 +1,12 @@ +diff -up netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c +--- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-03-06 09:20:52.000000000 +0100 ++++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-03-06 09:22:40.000000000 +0100 +@@ -93,7 +93,7 @@ + static int srvfd; + static int rqstfd; + +-#define MAXSRV 128 ++#define MAXSRV 512 + + #define MAXSPAWN 3 /* Max times respawned in.. */ + diff --git a/netatalk-2.0.3-multiarch.patch b/netatalk-2.0.3-multiarch.patch new file mode 100644 index 0000000..be18833 --- /dev/null +++ b/netatalk-2.0.3-multiarch.patch @@ -0,0 +1,13 @@ +diff -up netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch netatalk-2.0.3/distrib/config/netatalk-config.in +--- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-03-06 15:54:27.000000000 +0100 ++++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-03-06 15:55:00.000000000 +0100 +@@ -218,9 +218,6 @@ fi + if test "@includedir@" != /usr/include ; then + includes="-I@includedir@" + fi +-if test "@libdir@" != /usr/lib ; then +- libs="-L@libdir@" +-fi + af_cflags="$af_cflags $includes" + af_libs="$libs -latalk" + diff --git a/netatalk.spec b/netatalk.spec index 393b9ce..9ddce93 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -17,6 +17,10 @@ Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch Patch5: netatalk-2.0.3-open_call.patch +Patch6: netatalk-2.0.3-chmod.patch +Patch7: netatalk-2.0.3-maxsrv.patch +Patch8: netatalk-2.0.3-log_stderr.patch +Patch9: netatalk-2.0.3-multiarch.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -50,6 +54,10 @@ programs. %patch3 -p1 -b .extern_ucreator %patch4 -p1 %patch5 -p1 -b .open_call +%patch6 -p1 -b .chmod +%patch7 -p1 -b .maxsrv +%patch8 -p1 -b .log_stderr +%patch9 -p1 -b .multiarch ln -s ./NEWS ChangeLog @@ -190,6 +198,12 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Thu Mar 06 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-19 +- fix chmod o+x (#225085) +- increase the maximum number of cnid_dbd processes to 512 (#232805) +- papd now writes debugging output to stderr when invoked with -d (#150021) +- fix multiarch conflict for netatalk-devel (#342681) + * Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-18 - make init script LSB compliant (#246993) commit c5506f321fa09f0a87f44fabce358e1642bfd949 Author: Martin Nagy <mnagy(a)fedoraproject.org> Date: Mon Feb 25 15:46:32 2008 +0000 - make init script LSB compliant (#246993) diff --git a/netatalk-2.0.3-lsb.patch b/netatalk-2.0.3-lsb.patch new file mode 100644 index 0000000..ddd98da --- /dev/null +++ b/netatalk-2.0.3-lsb.patch @@ -0,0 +1,50 @@ +diff -up netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.lsb netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat +--- netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.lsb 2008-02-25 15:29:38.000000000 +0100 ++++ netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat 2008-02-25 16:07:36.000000000 +0100 +@@ -1,8 +1,19 @@ + #! /bin/sh ++# ++### BEGIN INIT INFO ++# Provides: netatalk ++# Required-Start: $local_fs $network $syslog ++# Required-Stop: $local_fs $network $syslog ++# Short-Description: AppleTalk networking programs ++# Description: This package enables Linux to talk to Macintosh computers via the ++# AppleTalk networking protocol. It includes a daemon to allow Linux ++# to act as a file server over EtherTalk or IP for Mac's. ++### END INIT INFO ++ + # chkconfig: - 91 35 +-# description: This package enables Linux to talk to Macintosh +-# computers via the AppleTalk networking protocol and +-# provides printer, file sharing, and AppleTalk routing ++# description: This package enables Linux to talk to Macintosh \ ++# computers via the AppleTalk networking protocol and \ ++# provides printer, file sharing, and AppleTalk routing \ + # services. + # + # AppleTalk daemons. Make sure not to start atalkd in the background: +@@ -27,12 +38,12 @@ ATALK_SBIN=/usr/sbin + + if [ ! -x ${ATALK_SBIN}/atalkd ]; then + echo "[${ATALK_SBIN}/atalkd not found. Did it compile?]"; +- exit 0; ++ exit 1; + fi + + if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then + echo "[${ATALK_CONF_DIR}/netatalk.conf not found]"; +- exit 0; ++ exit 6; + fi + + # read in netatalk configuration +@@ -41,7 +52,7 @@ fi + # Check that networking is up. + if [ ${NETWORKING} = "no" ]; then + echo "[Network isn't started]"; +- exit 0; ++ exit 1; + fi + + # initialize return values diff --git a/netatalk.spec b/netatalk.spec index 4a330c1..393b9ce 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -190,6 +190,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-18 +- make init script LSB compliant (#246993) + * Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-17 - fix unowned directories (#233889) commit 793f14219c5d102edb78795bd36b99c5e3615cf9 Author: Martin Nagy <mnagy(a)fedoraproject.org> Date: Mon Feb 25 09:14:10 2008 +0000 - fix unowned directories (#233889) diff --git a/netatalk.spec b/netatalk.spec index 954bb44..4a330c1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -175,12 +175,14 @@ fi %{_mandir}/man*/* %exclude %{_mandir}/man*/netatalk-config* %{_datadir}/netatalk +%dir %{_libdir}/atalk %{_libdir}/atalk/*.so %{_libexecdir}/* %files devel %defattr(-,root,root) %dir %{_includedir}/atalk +%dir %{_includedir}/netatalk %attr(0644,root,root) %{_includedir}/atalk/* %attr(0644,root,root) %{_includedir}/netatalk/* %{_datadir}/aclocal/netatalk.m4 @@ -188,6 +190,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Feb 25 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-17 +- fix unowned directories (#233889) + * Mon Feb 11 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-16 - rebuild for gcc-4.3 commit 0260511b005643ab3e3127c4c4854cc0b4f823cd Author: Martin Nagy <mnagy(a)fedoraproject.org> Date: Mon Feb 11 09:58:54 2008 +0000 - rebuild for gcc-4.3 diff --git a/netatalk.spec b/netatalk.spec index 9c466f8..954bb44 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 15.1%{?dist} +Release: 16%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -188,6 +188,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Feb 11 2008 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-16 +- rebuild for gcc-4.3 + * Tue Dec 04 2007 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-15.1 - rebuild commit b92ff274d02f559a84d2cd5c51724cbcf92f45dc Author: Martin Nagy <mnagy(a)fedoraproject.org> Date: Tue Dec 4 10:03:39 2007 +0000 - rebuild diff --git a/netatalk.spec b/netatalk.spec index e67d557..9c466f8 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 15%{?dist} +Release: 15.1%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons commit 8ecbe6dfe02e01f74db54e91b3d090bc646b5b4e Author: Martin Nagy <mnagy(a)fedoraproject.org> Date: Tue Dec 4 09:53:18 2007 +0000 - rebuild diff --git a/netatalk.spec b/netatalk.spec index efbd72f..e67d557 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -188,6 +188,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Dec 04 2007 Martin Nagy <mnagy(a)redhat.com> - 4:2.0.3-15.1 +- rebuild + * Wed Sep 12 2007 Maros Barabas <mbarabas(a)redhat.com> -4:2.0.3-15 - patch to build on FC, bad open call commit b20183ae73078d1a45c37d1658a3f97e8f8f6d82 Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Mon Oct 15 19:10:48 2007 +0000 makefile update to properly grab makefile.common diff --git a/Makefile b/Makefile index 8f23fa1..4266b11 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: netatalk -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 09:08:15 cvsdist Exp $ NAME := netatalk SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) commit 3ec36b19235460c61fc70fe11563b600426ee927 Author: Maros Barabas <mbarabas(a)fedoraproject.org> Date: Mon Sep 17 13:29:53 2007 +0000 - patch to build on FC, bad open call diff --git a/netatalk-2.0.3-build_open.patch b/netatalk-2.0.3-build_open.patch deleted file mode 100644 index c883eac..0000000 --- a/netatalk-2.0.3-build_open.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.old 2004-03-22 05:38:51.000000000 +0100 -+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2007-09-11 17:59:59.000000000 +0200 -@@ -131,9 +131,9 @@ - static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) - { - #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -- return p->open(p, NULL, f, d, t, flags, mode); -+ return (p->open)(p, NULL, f, d, t, flags, mode); - #else -- return p->open(p, f, d, t, flags, mode); -+ return (p->open)(p, f, d, t, flags, mode); - #endif - } - -@@ -275,7 +275,7 @@ - } - - /* Open the database environment. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); - /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ - if (rc == DB_RUNRECOVERY) { -@@ -288,10 +288,10 @@ - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ -- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ -- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { -+ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } diff --git a/netatalk-2.0.3-open_call.patch b/netatalk-2.0.3-open_call.patch new file mode 100644 index 0000000..4c3fe4e --- /dev/null +++ b/netatalk-2.0.3-open_call.patch @@ -0,0 +1,140 @@ +diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c +--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2007-09-17 15:21:26.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2007-09-17 15:21:43.000000000 +0200 +@@ -131,9 +131,9 @@ static int my_associate (DB *p, DB *s, + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags, mode); ++ return (p->open)(p, NULL, f, d, t, flags, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -275,7 +275,7 @@ struct _cnid_db *cnid_cdb_open(const cha + } + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); + /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ + if (rc == DB_RUNRECOVERY) { +@@ -288,10 +288,10 @@ struct _cnid_db *cnid_cdb_open(const cha + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } +diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c +--- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2007-09-17 15:14:36.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2007-09-17 15:15:06.000000000 +0200 +@@ -133,9 +133,9 @@ static int my_yield(void) + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); ++ return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha + #endif /* DB_VERSION_MINOR > 1 */ + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + if (rc == DB_RUNRECOVERY) { + /* This is the mother of all errors. We _must_ fail here. */ + LOG(log_error, logtype_default, +@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } +diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c +--- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2007-09-17 15:14:49.000000000 +0200 ++++ netatalk-2.0.3/bin/cnid/cnid_index.c 2007-09-17 15:15:35.000000000 +0200 +@@ -123,9 +123,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -353,7 +353,7 @@ static int dbif_env_init(void) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -379,7 +379,7 @@ static int dbif_env_init(void) + } + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c +--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2007-09-17 15:14:59.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2007-09-17 15:16:54.000000000 +0200 +@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char * + int ret; + + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); + #else +- ret = db->open(db, file, name, type, DB_CREATE, mode); ++ ret = (db->open)(db, file, name, type, DB_CREATE, mode); + #endif + + if (ret) { +@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment: %s", + db_strerror(ret)); + db_env->close(db_env, 0); +@@ -198,7 +198,7 @@ int dbif_env_init(struct db_param *dbp) + + if (db_errlog != NULL) + db_env->set_errfile(db_env, db_errlog); +- if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) { ++ if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) { + LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s", + db_strerror(ret)); + db_env->close(db_env, 0); diff --git a/netatalk.spec b/netatalk.spec index 76ad578..efbd72f 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -16,7 +16,7 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch -Patch5: netatalk-2.0.3-build_open.patch +Patch5: netatalk-2.0.3-open_call.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -49,7 +49,7 @@ programs. %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 -%patch5 -p1 -b .build_open +%patch5 -p1 -b .open_call ln -s ./NEWS ChangeLog @@ -188,7 +188,7 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog -* Wed Sep 12 2007 Maros Barabas <mbarabas(a)redhat.com> -4:2.0.3-14 +* Wed Sep 12 2007 Maros Barabas <mbarabas(a)redhat.com> -4:2.0.3-15 - patch to build on FC, bad open call * Tue Sep 11 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-13 commit 3183e5f76424681bd86630a6d35a5c65201d31fe Author: Maros Barabas <mbarabas(a)fedoraproject.org> Date: Wed Sep 12 11:09:00 2007 +0000 Build fix diff --git a/netatalk-2.0.3-build_open.patch b/netatalk-2.0.3-build_open.patch new file mode 100644 index 0000000..c883eac --- /dev/null +++ b/netatalk-2.0.3-build_open.patch @@ -0,0 +1,36 @@ +--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.old 2004-03-22 05:38:51.000000000 +0100 ++++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2007-09-11 17:59:59.000000000 +0200 +@@ -131,9 +131,9 @@ + static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) + { + #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) +- return p->open(p, NULL, f, d, t, flags, mode); ++ return (p->open)(p, NULL, f, d, t, flags, mode); + #else +- return p->open(p, f, d, t, flags, mode); ++ return (p->open)(p, f, d, t, flags, mode); + #endif + } + +@@ -275,7 +275,7 @@ + } + + /* Open the database environment. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc)); + /* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */ + if (rc == DB_RUNRECOVERY) { +@@ -288,10 +288,10 @@ + /* We can't get a full transactional environment, so multi-access + * is out of the question. Let's assume a read-only environment, + * and try to at least get a shared memory pool. */ +- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { + /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to + * open the environment with no flags. */ +- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { ++ if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) { + LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); + goto fail_lock; + } diff --git a/netatalk.spec b/netatalk.spec index 3b3910c..76ad578 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -16,6 +16,7 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch +Patch5: netatalk-2.0.3-build_open.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -48,6 +49,7 @@ programs. %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 +%patch5 -p1 -b .build_open ln -s ./NEWS ChangeLog @@ -186,6 +188,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Wed Sep 12 2007 Maros Barabas <mbarabas(a)redhat.com> -4:2.0.3-14 +- patch to build on FC, bad open call + * Tue Sep 11 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-13 - rebuild commit 63fc7de278d2d1e10ca6ba6cd8f71ebf4dbd1a97 Author: Maros Barabas <mbarabas(a)fedoraproject.org> Date: Tue Sep 11 15:28:28 2007 +0000 rebuild diff --git a/netatalk.spec b/netatalk.spec index 242e9e1..3b3910c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -186,6 +186,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Sep 11 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-13 +- rebuild + * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 - Rebuild for selinux ppc32 issue. commit 8f0e36bc3a090005a8c7f4d12248d59881f22c97 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Wed Aug 29 04:52:17 2007 +0000 - Rebuild for selinux ppc32 issue. diff --git a/netatalk.spec b/netatalk.spec index d1c5edf..242e9e1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,7 +1,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -186,6 +186,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4:2.0.3-12 +- Rebuild for selinux ppc32 issue. + * Thu May 10 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.4-11 - fix from merge review - Resolves #226190 commit 21e5d8b57d57f61b3a4c2edf5ad19850fb39ee1f Author: Maros Barabas <mbarabas(a)fedoraproject.org> Date: Thu Jun 28 12:51:12 2007 +0000 Fix merge review diff --git a/netatalk.spec b/netatalk.spec index 28f771e..d1c5edf 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,16 +1,13 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: atalk.init -#Source2: netatalk.config -#Source3: AppleVolumes.system -Source4: ICDumpSuffixMap -Source5: netatalk.pam-system-auth +Source2: netatalk.pam-system-auth #Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch @@ -34,12 +31,12 @@ AppleTalk networking protocol. It includes a daemon to allow Linux to act as a file server over EtherTalk or IP for Mac's. %package devel -Summary: Headers and static libraries for Appletalk development +Summary: Headers for Appletalk development Group: Development/Libraries %description devel -This package contains the header files, and static libraries for building -Appletalk networking programs. +This package contains the header files for building Appletalk networking +programs. %prep %setup -q @@ -120,15 +117,22 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install #cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ chmod a-x bin/afile/acleandir.rc rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* -install -m644 %{SOURCE4} . # # install example config files in doc mkdir config.example cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example -cp -fp %{SOURCE5} config.example +cp -fp %{SOURCE2} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h +# Fix up ICDumpSuffixMap +sed -e 's/\r/\n/' -e 's:#!perl:#!%{__perl}:' contrib/ICDumpSuffixMap > ICDumpSuffixMap +touch -r contrib/ICDumpSuffixMap ICDumpSuffixMap + +# Clean up .a and .la files +find $RPM_BUILD_ROOT -name \*.a -exec rm {} \; +find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; + %clean rm -rf $RPM_BUILD_ROOT @@ -155,7 +159,7 @@ fi %doc bin/afile/acleandir.rc %doc config.example %dir /etc/atalk -%attr(755,root,root) %config %{_initrddir}/atalk +%attr(755,root,root) %{_initrddir}/atalk %config(noreplace) /etc/atalk/AppleVolumes.default %config(noreplace) /etc/atalk/AppleVolumes.system %config(noreplace) /etc/atalk/netatalk.conf @@ -165,7 +169,9 @@ fi %config(noreplace) /etc/pam.d/netatalk %{_sbindir}/* %{_bindir}/* +%exclude %{_bindir}/netatalk-config %{_mandir}/man*/* +%exclude %{_mandir}/man*/netatalk-config* %{_datadir}/netatalk %{_libdir}/atalk/*.so %{_libexecdir}/* @@ -173,15 +179,17 @@ fi %files devel %defattr(-,root,root) %dir %{_includedir}/atalk -%{_libdir}/*.a -%{_libdir}/*.la %attr(0644,root,root) %{_includedir}/atalk/* %attr(0644,root,root) %{_includedir}/netatalk/* %{_datadir}/aclocal/netatalk.m4 -%{_libdir}/atalk/*.a -%{_libdir}/atalk/*.la %{_bindir}/netatalk-config +%{_mandir}/man*/netatalk-config.1* + %changelog +* Thu May 10 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.4-11 +- fix from merge review +- Resolves #226190 + * Tue Apr 17 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-10 - fix fiew problems in spec commit f8586500ca23f99a72ebd429ae2591dc12c53127 Author: Maros Barabas <mbarabas(a)fedoraproject.org> Date: Tue Apr 17 10:17:43 2007 +0000 Few problems in spec file diff --git a/netatalk.spec b/netatalk.spec index 6db71aa..28f771e 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -19,7 +19,6 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch -Patch5: netatalk-2.0.3-wrong_script_interpreter.patch Url: http://netatalk.sourceforge.net/ Requires: pam Requires(post): /sbin/chkconfig /sbin/ldconfig @@ -52,7 +51,6 @@ Appletalk networking programs. %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 -%patch5 -p1 ln -s ./NEWS ChangeLog @@ -185,9 +183,7 @@ fi %{_bindir}/netatalk-config %changelog * Tue Apr 17 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-10 -- fix merge review -- fix nonstandard line endings -- Resolves: #226190 +- fix fiew problems in spec * Tue Jan 23 2007 Jindrich Novy <jnovy(a)redhat.com> - 4:2.0.3-9 - rebuild against new db4 commit 56db01793cd739d92d21effda81bd174d905fa52 Author: Maros Barabas <mbarabas(a)fedoraproject.org> Date: Tue Apr 17 10:11:03 2007 +0000 Fixed review #226190 diff --git a/netatalk.spec b/netatalk.spec index 6c54046..6db71aa 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,12 +1,10 @@ - %define initdir /etc/rc.d/init.d - Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 4 License: GPL -Group: System Environment/Daemons +Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: atalk.init #Source2: netatalk.config @@ -21,11 +19,15 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Patch4: netatalk-2.0.3-nodefault.patch +Patch5: netatalk-2.0.3-wrong_script_interpreter.patch Url: http://netatalk.sourceforge.net/ -Prereq: /sbin/chkconfig, /sbin/service -Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel -BuildRoot: %{_tmppath}/%{name}-root +Requires: pam +Requires(post): /sbin/chkconfig /sbin/ldconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(postun): /sbin/service /sbin/ldconfig +BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This package enables Linux to talk to Macintosh computers via the @@ -50,6 +52,7 @@ Appletalk networking programs. %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator %patch4 -p1 +%patch5 -p1 ln -s ./NEWS ChangeLog @@ -92,13 +95,13 @@ if [ "%{_lib}" != lib ]; then -e 's,-L/lib,-L/%{_lib},g' fi -make all +make %{?_smp_mflags} all %install rm -rf $RPM_BUILD_ROOT #mkdir -p $RPM_BUILD_ROOT/etc/pam.d -#mkdir -p $RPM_BUILD_ROOT%{initdir} +#mkdir -p $RPM_BUILD_ROOT%{_initrddir} #mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install @@ -114,7 +117,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install # # Use netatalk's redhat initscript # -#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk +#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/atalk #cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ #cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ chmod a-x bin/afile/acleandir.rc @@ -133,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add atalk +/sbin/ldconfig %preun if [ "$1" = "0" ] ; then @@ -144,6 +148,7 @@ fi if [ "$1" -ge "1" ]; then /sbin/service atalk condrestart > /dev/null 2>&1 || : fi +/sbin/ldconfig %files %defattr(-,root,root) @@ -152,7 +157,7 @@ fi %doc bin/afile/acleandir.rc %doc config.example %dir /etc/atalk -%attr(755,root,root) %config %{initdir}/atalk +%attr(755,root,root) %config %{_initrddir}/atalk %config(noreplace) /etc/atalk/AppleVolumes.default %config(noreplace) /etc/atalk/AppleVolumes.system %config(noreplace) /etc/atalk/netatalk.conf @@ -177,8 +182,13 @@ fi %{_datadir}/aclocal/netatalk.m4 %{_libdir}/atalk/*.a %{_libdir}/atalk/*.la - +%{_bindir}/netatalk-config %changelog +* Tue Apr 17 2007 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-10 +- fix merge review +- fix nonstandard line endings +- Resolves: #226190 + * Tue Jan 23 2007 Jindrich Novy <jnovy(a)redhat.com> - 4:2.0.3-9 - rebuild against new db4 @@ -304,7 +314,7 @@ fi * Thu Jan 04 2001 Than Ngo <than(a)redhat.com> - fixed uams-path -- added noreplace to %config +- added noreplace to %%config * Mon Nov 20 2000 Tim Powers <timp(a)redhat.com> - rebuilt to fix bad dir perms @@ -372,7 +382,7 @@ fi - gzip man pages - fixed netatalk-asun.librpcsvc.patch, -lnss_nis too - changed group -- added %defattr to %files section +- added %%defattr to %%files section * Tue Aug 3 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - rpm-3.0 needs to remove vogus files from source. @@ -413,7 +423,7 @@ fi * Mon Nov 16 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Fix rcX.d's symbolic links. * Wed Oct 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> -- Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line. +- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line. * Sat Oct 24 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. * Mon Oct 5 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> commit efd27d6ea03e1781c6cbc48e6e83537e326b5743 Author: Jindrich Novy <jnovy(a)fedoraproject.org> Date: Tue Jan 23 13:54:57 2007 +0000 - fix typo diff --git a/netatalk-2.0.3-db4_5.patch b/netatalk-2.0.3-db4_5.patch index 494c6ad..0d95146 100644 --- a/netatalk-2.0.3-db4_5.patch +++ b/netatalk-2.0.3-db4_5.patch @@ -4,7 +4,7 @@ AC_DEFUN([NETATALK_BERKELEY_LINK], [ atalk_cv_lib_db=no -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.5]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_5,[-ldb-4.5]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) commit 1abbbf332d76956b97f40dd0a568d45e6da3145f Author: Jindrich Novy <jnovy(a)fedoraproject.org> Date: Tue Jan 23 13:42:18 2007 +0000 - rebuild against new db4 diff --git a/netatalk-2.0.3-db4_5.patch b/netatalk-2.0.3-db4_5.patch new file mode 100644 index 0000000..494c6ad --- /dev/null +++ b/netatalk-2.0.3-db4_5.patch @@ -0,0 +1,11 @@ +--- netatalk-2.0.3/macros/db3-check.m4.db4_3 2004-08-11 05:01:11.000000000 +0200 ++++ netatalk-2.0.3/macros/db3-check.m4 2007-01-23 14:27:14.000000000 +0100 +@@ -115,6 +115,8 @@ + AC_DEFUN([NETATALK_BERKELEY_LINK], + [ + atalk_cv_lib_db=no ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.5]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42]) diff --git a/netatalk.spec b/netatalk.spec index 8390264..6c54046 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -16,7 +16,7 @@ Source5: netatalk.pam-system-auth #Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch -Patch0: netatalk-2.0.2-db4_3.patch +Patch0: netatalk-2.0.3-db4_5.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch @@ -45,7 +45,7 @@ Appletalk networking programs. #%patch0 -p 1 -b .norc #%patch1 -p 1 -b .openssl097 #%patch2 -p1 -b .pathcat -%patch0 -p1 -b .db4_3 +%patch0 -p1 -b .db4_5 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Tue Jan 23 2007 Jindrich Novy <jnovy(a)redhat.com> - 4:2.0.3-9 +- rebuild against new db4 + * Mon Dec 04 2006 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-8 - BuildRequires changed from cracklib to cracklib-devel commit e3aa513f58c1369178df16a690cc2a3a1ed7e1d1 Author: Maros Barabas <mbarabas(a)fedoraproject.org> Date: Mon Dec 4 15:31:23 2006 +0000 updating BuildRequires #212903 diff --git a/netatalk.spec b/netatalk.spec index 19d1914..8390264 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -24,7 +24,7 @@ Patch4: netatalk-2.0.3-nodefault.patch Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf db4-devel pam-devel +BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel BuildRoot: %{_tmppath}/%{name}-root %description @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Mon Dec 04 2006 Maros Barabas <mbarabas(a)redhat.com> - 4:2.0.3-8 +- BuildRequires changed from cracklib to cracklib-devel + * Fri Aug 18 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-7 - rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* (#203001) commit ababea5001878e218ba0a8c641422c2c929fb1f7 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Fri Aug 18 20:15:48 2006 +0000 rebuilt with latest binutils diff --git a/netatalk.spec b/netatalk.spec index c038ec4..19d1914 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 6.fc6.1 +Release: 7%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,11 @@ fi %{_libdir}/atalk/*.la %changelog +* Fri Aug 18 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-7 +- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* + (#203001) +- Add dist tag + * Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-6.fc6.1 - rebuild commit 7c34b28330d886d5dc086343d9a7ad1059ee8279 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Wed Jul 12 07:26:40 2006 +0000 bumped for rebuild diff --git a/netatalk.spec b/netatalk.spec index 57f33b3..c038ec4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 6.fc6 +Release: 6.fc6.1 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-6.fc6.1 +- rebuild + * Fri Jun 09 2006 Jason Vas Dias <jvdias(a)redhat.com> - 4:2.0.3-6.fc6 - rebuild for broken libgssapi deps and brew build commit 31787b05a70bc0c0bf07963aaab77674075bdb2d Author: jvdias <jvdias(a)fedoraproject.org> Date: Fri Jun 9 14:32:01 2006 +0000 rebuild for libgssapi deps and brew build diff --git a/netatalk.spec b/netatalk.spec index 497ad1b..57f33b3 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 4.2.1 +Release: 6.fc6 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Fri Jun 09 2006 Jason Vas Dias <jvdias(a)redhat.com> - 4:2.0.3-6.fc6 +- rebuild for broken libgssapi deps and brew build + * Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-4.2.1 - bump again for double-long bug on ppc(64) commit 3e9feb30961e197fbdd56a09361d8e8671b8a231 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Sat Feb 11 04:43:48 2006 +0000 bump for bug in double-long on ppc(64) diff --git a/netatalk.spec b/netatalk.spec index 46d61af..497ad1b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 4.2 +Release: 4.2.1 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 4:2.0.3-4.2.1 +- bump again for double-long bug on ppc(64) + * Tue Feb 07 2006 Jason Vas Dias <jvdias(a)redhat.com> - rebuild for new gcc, glibc, glibc-kernheaders commit 1efc91cbd1ebe8ac83f3c8f1b9675d305cbfed09 Author: jvdias <jvdias(a)fedoraproject.org> Date: Wed Feb 8 00:32:18 2006 +0000 rebuild for new gcc, glibc, glibc-kernheaders diff --git a/netatalk.spec b/netatalk.spec index 79ab59b..46d61af 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 4.1 +Release: 4.2 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Tue Feb 07 2006 Jason Vas Dias <jvdias(a)redhat.com> +- rebuild for new gcc, glibc, glibc-kernheaders + * Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> - rebuilt commit 35e9e6b48979dca4347ec2a6cf7407bdc6187cf6 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Fri Dec 9 22:42:20 2005 +0000 gcc update bump diff --git a/netatalk.spec b/netatalk.spec index 1368f2c..79ab59b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 4 +Release: 4.1 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com> +- rebuilt + * Wed Nov 09 2005 Jason Vas Dias <jvdias(a)redhat.com> - Rebuild for new openssl dependencies commit ceca5e3483172b93adb76c9b50f8a7f22b040f71 Author: jvdias <jvdias(a)fedoraproject.org> Date: Thu Nov 10 00:26:03 2005 +0000 rebuild to fix broken openssl dependency diff --git a/netatalk.spec b/netatalk.spec index 5e19b7a..1368f2c 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 3 +Release: 4 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Wed Nov 09 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Rebuild for new openssl dependencies + * Thu Oct 13 2005 Tomas Mraz <tmraz(a)redhat.com> - use include instead of pam_stack in pam config commit 073d6e6d701bcddfd0c86a35a9366b21d94a57ae Author: Tom Mrz <tmraz(a)fedoraproject.org> Date: Thu Oct 13 21:29:58 2005 +0000 - use include instead of pam_stack in pam config diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth new file mode 100644 index 0000000..8147016 --- /dev/null +++ b/netatalk.pam-system-auth @@ -0,0 +1,10 @@ +# /etc/pam.d/netatalk +# +# PAM configuration file for netatalk using system-auth substack +# (this would enable use of netatalk by LDAP or NIS users). +# +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth diff --git a/netatalk.spec b/netatalk.spec index a3c2db1..5e19b7a 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 2 +Release: 3 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -12,7 +12,7 @@ Source1: atalk.init #Source2: netatalk.config #Source3: AppleVolumes.system Source4: ICDumpSuffixMap -Source5: netatalk.pam_stack +Source5: netatalk.pam-system-auth #Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch @@ -179,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Thu Oct 13 2005 Tomas Mraz <tmraz(a)redhat.com> +- use include instead of pam_stack in pam config + * Wed Jul 20 2005 Bill Nottingham <notting(a)redhat.com> - don't run by default commit f53bad7cc3ae9ce10974e70831b4fc040e88246b Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Wed Jul 20 21:29:52 2005 +0000 don't run by default diff --git a/netatalk-2.0.3-nodefault.patch b/netatalk-2.0.3-nodefault.patch new file mode 100644 index 0000000..ae30fc8 --- /dev/null +++ b/netatalk-2.0.3-nodefault.patch @@ -0,0 +1,9 @@ +--- netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.tmpl.foo 2005-07-20 17:23:05.000000000 -0400 ++++ netatalk-2.0.3/distrib/initscripts/rc.atalk.redhat.tmpl 2005-07-20 17:23:14.000000000 -0400 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# chkconfig: 345 91 35 ++# chkconfig: - 91 35 + # description: This package enables Linux to talk to Macintosh + # computers via the AppleTalk networking protocol and + # provides printer, file sharing, and AppleTalk routing diff --git a/netatalk.spec b/netatalk.spec index 0f57e73..a3c2db1 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -20,7 +20,7 @@ Patch0: netatalk-2.0.2-db4_3.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch -Obsoletes: netatalk-1.6.4, netatalk-1.5.5 +Patch4: netatalk-2.0.3-nodefault.patch Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib @@ -49,6 +49,7 @@ Appletalk networking programs. %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator +%patch4 -p1 ln -s ./NEWS ChangeLog @@ -178,6 +179,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Wed Jul 20 2005 Bill Nottingham <notting(a)redhat.com> +- don't run by default + * Thu Jun 16 2005 Jason Vas Dias <jvdias(a)redhat.com> - Upgrade to upstream version 2.0.3 - fix bug 160486: use netatalk's initscript commit d0c209ab2280492e49a886d678f07b59094a51f1 Author: jvdias <jvdias(a)fedoraproject.org> Date: Thu Jun 16 23:44:00 2005 +0000 Upgrade to 2.0.3; fix bugs 160486, 89671 diff --git a/netatalk.spec b/netatalk.spec index a85c3e3..0f57e73 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -12,6 +12,7 @@ Source1: atalk.init #Source2: netatalk.config #Source3: AppleVolumes.system Source4: ICDumpSuffixMap +Source5: netatalk.pam_stack #Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch @@ -122,7 +123,7 @@ install -m644 %{SOURCE4} . # install example config files in doc mkdir config.example cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example - +cp -fp %{SOURCE5} config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h commit e41596f59e2535a8c0bbdae35c6338310ba812a8 Author: jvdias <jvdias(a)fedoraproject.org> Date: Thu Jun 16 22:32:48 2005 +0000 fix bug 123791: BuildRequires += db4-devel pam-devel diff --git a/netatalk.spec b/netatalk.spec index 4a449e5..a85c3e3 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 1 +Release: 2 Epoch: 4 License: GPL Group: System Environment/Daemons @@ -23,7 +23,7 @@ Obsoletes: netatalk-1.6.4, netatalk-1.5.5 Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf +BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf db4-devel pam-devel BuildRoot: %{_tmppath}/%{name}-root %description commit 8e4ed927a8e6b6667d6b71f0497f2510a4a948c1 Author: jvdias <jvdias(a)fedoraproject.org> Date: Thu Jun 16 21:08:02 2005 +0000 upgrade to 2.0.3; fix bug 160486 diff --git a/.cvsignore b/.cvsignore index c4fe991..abb0106 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ netatalk-1.6.4.tar.bz2 netatalk-2.0.2.tar.bz2 +netatalk-2.0.3.tar.bz2 diff --git a/netatalk.spec b/netatalk.spec index e672686..4a449e5 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,12 +1,12 @@ %define initdir /etc/rc.d/init.d Summary: AppleTalk networking programs -Name: netatalk -Version: 2.0.2 -Release: 3 -Epoch: 3 +Name: netatalk +Version: 2.0.3 +Release: 1 +Epoch: 4 License: GPL -Group: System Environment/Daemons +Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: atalk.init #Source2: netatalk.config @@ -20,8 +20,8 @@ Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch Obsoletes: netatalk-1.6.4, netatalk-1.5.5 -Url: http://netatalk.sourceforge.net/ -Prereq: /sbin/chkconfig, /sbin/service +Url: http://netatalk.sourceforge.net/ +Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf BuildRoot: %{_tmppath}/%{name}-root @@ -95,23 +95,33 @@ make all %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/pam.d -mkdir -p $RPM_BUILD_ROOT%{initdir} -mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} +#mkdir -p $RPM_BUILD_ROOT/etc/pam.d +#mkdir -p $RPM_BUILD_ROOT%{initdir} +#mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install - -install -m644 config/AppleVolumes.default $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.default -install -m644 config/afpd.conf $RPM_BUILD_ROOT/etc/atalk/afpd.conf -install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf -install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf -install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk -install -m644 %{SOURCE4} . -install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk -cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ -cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ -rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* +# +# netatalk now installs its own config files, which are more +# appropriate for v2.0 than the ones we used to ship. +# +#install -m644 config/AppleVolumes.default $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.default +#install -m644 config/afpd.conf $RPM_BUILD_ROOT/etc/atalk/afpd.conf +#install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf +#install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf +#install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk +# +# Use netatalk's redhat initscript +# +#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk +#cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ +#cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ chmod a-x bin/afile/acleandir.rc +rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* +install -m644 %{SOURCE4} . +# +# install example config files in doc +mkdir config.example +cp -fp `ls config/* | egrep -v 'tmpl$|Makefile' | tr '\n' ' '` config.example # XXX bad hack until this file is updated in glibc-headers: rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h @@ -138,14 +148,15 @@ fi %doc COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc %doc bin/afile/acleandir.rc +%doc config.example %dir /etc/atalk +%attr(755,root,root) %config %{initdir}/atalk %config(noreplace) /etc/atalk/AppleVolumes.default %config(noreplace) /etc/atalk/AppleVolumes.system %config(noreplace) /etc/atalk/netatalk.conf %config(noreplace) /etc/atalk/afpd.conf %config(noreplace) /etc/atalk/atalkd.conf %config(noreplace) /etc/atalk/papd.conf -%attr(755,root,root) %config %{initdir}/atalk %config(noreplace) /etc/pam.d/netatalk %{_sbindir}/* %{_bindir}/* @@ -166,6 +177,10 @@ fi %{_libdir}/atalk/*.la %changelog +* Thu Jun 16 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Upgrade to upstream version 2.0.3 +- fix bug 160486: use netatalk's initscript + * Wed Mar 30 2005 Florian La Roche <laroche(a)redhat.com> - quick fix: rm -f /usr/include/netatalk/at.h until this is resolved the correct way diff --git a/sources b/sources index 26ae7eb..bde5f18 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -8bed0582d51deef7a31da1b6ae5df2e6 netatalk-1.6.4.tar.bz2 -539e1f60681db40a4c4e2157854cb3eb netatalk-2.0.2.tar.bz2 +28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 commit 5ee834fc79ee5b2932a8232f47587bfd74eda267 Author: Florian La Roche <laroche(a)fedoraproject.org> Date: Wed Mar 30 17:45:05 2005 +0000 - quickhack for fileconflict with glibc-headers diff --git a/netatalk.spec b/netatalk.spec index 37f569a..e672686 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.2 -Release: 2 +Release: 3 Epoch: 3 License: GPL Group: System Environment/Daemons @@ -113,6 +113,9 @@ cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* chmod a-x bin/afile/acleandir.rc +# XXX bad hack until this file is updated in glibc-headers: +rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h + %clean rm -rf $RPM_BUILD_ROOT @@ -163,6 +166,10 @@ fi %{_libdir}/atalk/*.la %changelog +* Wed Mar 30 2005 Florian La Roche <laroche(a)redhat.com> +- quick fix: rm -f /usr/include/netatalk/at.h until this + is resolved the correct way + * Mon Mar 07 2005 Jason Vas Dias <jvdias(a)redhat.com> - Fix for gcc4 compilation: extern_ucreator.patch @@ -322,7 +329,7 @@ fi - Change Copyright tag to BSD. Add /usr/bin/adv1tov2. * Thu Apr 22 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> -- Correct librpcsvc.patch. Move %changelog section last. +- Correct librpcsvc.patch. Move %%changelog section last. Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since LinuxPPC may need. * Wed Mar 31 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> commit 244f4c5f1b9f3ed264414bb39faa08aee4220312 Author: jvdias <jvdias(a)fedoraproject.org> Date: Mon Mar 7 20:53:21 2005 +0000 Fix for gcc4 compilation: extern_ucreator.patch diff --git a/netatalk-2.0.2-extern_ucreator.patch b/netatalk-2.0.2-extern_ucreator.patch new file mode 100644 index 0000000..3eaab67 --- /dev/null +++ b/netatalk-2.0.2-extern_ucreator.patch @@ -0,0 +1,11 @@ +--- netatalk-2.0.2/etc/afpd/desktop.c.extern_ucreator 2004-10-09 08:48:21.000000000 -0400 ++++ netatalk-2.0.2/etc/afpd/desktop.c 2005-03-07 15:44:07.000000000 -0500 +@@ -310,7 +310,7 @@ + } + + static u_char utag[] = { 0, 0, 0, 0 }; +-static u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ ++u_char ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/ + static u_char utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/ + static short usize = 256; + static u_char uicon[] = { diff --git a/netatalk.spec b/netatalk.spec index b4cf560..37f569a 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.2 -Release: 1 +Release: 2 Epoch: 3 License: GPL Group: System Environment/Daemons commit fac99a2202357e642409ea90152563a5abf240ec Author: jvdias <jvdias(a)fedoraproject.org> Date: Mon Mar 7 20:52:32 2005 +0000 Fix for gcc4 compilation: extern_ucreator.patch diff --git a/netatalk.spec b/netatalk.spec index 7f91381..b4cf560 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -4,7 +4,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.2 Release: 1 -Epoch: 2 +Epoch: 3 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 @@ -18,6 +18,7 @@ Source4: ICDumpSuffixMap Patch0: netatalk-2.0.2-db4_3.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch +Patch3: netatalk-2.0.2-extern_ucreator.patch Obsoletes: netatalk-1.6.4, netatalk-1.5.5 Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service @@ -46,6 +47,8 @@ Appletalk networking programs. %patch0 -p1 -b .db4_3 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie +%patch3 -p1 -b .extern_ucreator + ln -s ./NEWS ChangeLog %build @@ -160,6 +163,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Mon Mar 07 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Fix for gcc4 compilation: extern_ucreator.patch + * Mon Feb 21 2005 Jason Vas Dias <jvdias(a)redhat.com> - Upgraded to upstream version 2.0.2 . commit 37396dfdf24797fd7a671ab41addbb314521791d Author: jvdias <jvdias(a)fedoraproject.org> Date: Mon Feb 21 22:59:37 2005 +0000 Upgrade to upstream version 2.0.2 diff --git a/netatalk.spec b/netatalk.spec index 0c4277b..7f91381 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -55,12 +55,12 @@ aclocal -I macros automake --add-missing autoconf autoheader +export CFLAGS="$RPM_OPT_FLAGS" %ifnarch x86_64 -export CFLAGS="$RPM_OPT_FLAGS -fPIE" -%else -export CFLAGS="$RPM_OPT_FLAGS -fPIC" -%endif +# XXX : enable for x86_64 when glibc bug 149284 is fixed! +export CFLAGS="$CFLAGS -fPIE" export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen" +%endif %ifarch ppc ppc64 s390 s390x export CFLAGS="$CFLAGS -fsigned-char" %endif commit b32e39fb36330b9fe3ea13f63e17b09b75a9bc33 Author: jvdias <jvdias(a)fedoraproject.org> Date: Mon Feb 21 21:21:02 2005 +0000 Upgrade to upstream version 2.0.2 diff --git a/.cvsignore b/.cvsignore index 94c6fa6..c4fe991 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ netatalk-1.6.4.tar.bz2 +netatalk-2.0.2.tar.bz2 diff --git a/netatalk-2.0.2-db4_2-db4_3.patch b/netatalk-2.0.2-db4_2-db4_3.patch new file mode 100644 index 0000000..a4fd7ea --- /dev/null +++ b/netatalk-2.0.2-db4_2-db4_3.patch @@ -0,0 +1,30 @@ +--- netatalk-2.0.2/etc/cnid_dbd/dbif.c.db4_2-db4_3 2004-12-21 08:36:12.000000000 -0500 ++++ netatalk-2.0.2/etc/cnid_dbd/dbif.c 2005-02-21 13:21:45.000000000 -0500 +@@ -514,10 +514,10 @@ + DB_BTREE_STAT *sp; + DB *db = db_table[dbi].db; + +- ret = db->stat(db, &sp, 0); ++ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); + + if (ret) { +- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); ++ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); + return -1; + } + +--- netatalk-2.0.2/bin/cnid/cnid_index.c.db4_2-db4_3 2005-01-03 08:49:55.000000000 -0500 ++++ netatalk-2.0.2/bin/cnid/cnid_index.c 2005-02-21 13:23:12.000000000 -0500 +@@ -274,10 +274,10 @@ + DB_BTREE_STAT *sp; + DB *db = db_table[dbi].db; + +- ret = db->stat(db, &sp, 0); ++ ret = db->stat(db, (DB_TXN*)0L, &sp, 0); + + if (ret) { +- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno)); ++ LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno)); + return -1; + } + diff --git a/netatalk-2.0.2-uams_no_pie.patch b/netatalk-2.0.2-uams_no_pie.patch new file mode 100644 index 0000000..09ab725 --- /dev/null +++ b/netatalk-2.0.2-uams_no_pie.patch @@ -0,0 +1,20 @@ +--- netatalk-2.0.2/etc/uams/Makefile.am.uams_no_pie 2004-08-10 23:11:07.000000000 -0400 ++++ netatalk-2.0.2/etc/uams/Makefile.am 2005-02-21 14:30:23.000000000 -0500 +@@ -1,5 +1,5 @@ + # Makefile.am for etc/uams/ +- ++LDFLAGS = + SUBDIRS = uams_krb4 + + # +--- netatalk-2.0.2/macros/gssapi-check.m4.uams_no_pie 2004-06-18 03:57:19.000000000 -0400 ++++ netatalk-2.0.2/macros/gssapi-check.m4 2005-02-21 14:58:26.000000000 -0500 +@@ -126,7 +126,7 @@ + if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then + AC_DEFINE(HAVE_GSSAPI,1,[Whether to enable GSSAPI support]) + AC_MSG_RESULT([yes]) +- GSSAPI_LIBS="$LDFLAGS $LIBS" ++ GSSAPI_LIBS="$LIBS" + else + AC_MSG_RESULT([no]) + if test x"$compilegssapi" = x"yes"; then diff --git a/netatalk.spec b/netatalk.spec index 5da5ef0..0c4277b 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -55,7 +55,11 @@ aclocal -I macros automake --add-missing autoconf autoheader +%ifnarch x86_64 export CFLAGS="$RPM_OPT_FLAGS -fPIE" +%else +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%endif export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen" %ifarch ppc ppc64 s390 s390x export CFLAGS="$CFLAGS -fsigned-char" diff --git a/sources b/sources index 154d50c..26ae7eb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 8bed0582d51deef7a31da1b6ae5df2e6 netatalk-1.6.4.tar.bz2 +539e1f60681db40a4c4e2157854cb3eb netatalk-2.0.2.tar.bz2 commit 09fd47fb90dc82db2eefc6606b8f5529f87d4761 Author: jvdias <jvdias(a)fedoraproject.org> Date: Mon Feb 21 20:53:29 2005 +0000 Upgrade to upstream version 2.0.2 diff --git a/netatalk.spec b/netatalk.spec index 7245326..5da5ef0 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -156,6 +156,9 @@ fi %{_libdir}/atalk/*.la %changelog +* Mon Feb 21 2005 Jason Vas Dias <jvdias(a)redhat.com> +- Upgraded to upstream version 2.0.2 . + * Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com> - rebuilt commit ffdfbdc42804d3ec25fe677d9b1e04b0d8d70464 Author: jvdias <jvdias(a)fedoraproject.org> Date: Mon Feb 21 20:42:29 2005 +0000 Upgrade to upstream version 2.0.2 diff --git a/netatalk.spec b/netatalk.spec index 403f863..7245326 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -4,6 +4,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.2 Release: 1 +Epoch: 2 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 commit 69ac297e5b2ba59078dc055bbad243b9218bcf3a Author: jvdias <jvdias(a)fedoraproject.org> Date: Mon Feb 21 20:40:30 2005 +0000 Upgrade to upstream version 2.0.2 diff --git a/netatalk.spec b/netatalk.spec index fd02613..403f863 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -2,8 +2,8 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 1.6.4 -Release: 3 +Version: 2.0.2 +Release: 1 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 @@ -11,11 +11,13 @@ Source1: atalk.init #Source2: netatalk.config #Source3: AppleVolumes.system Source4: ICDumpSuffixMap -Patch0: netatalk-1.6.3-norc.patch +#Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch -Epoch: 2 -Obsoletes: netatalk-1.5.5 +Patch0: netatalk-2.0.2-db4_3.patch +Patch1: netatalk-2.0.2-db4_2-db4_3.patch +Patch2: netatalk-2.0.2-uams_no_pie.patch +Obsoletes: netatalk-1.6.4, netatalk-1.5.5 Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib @@ -37,9 +39,13 @@ Appletalk networking programs. %prep %setup -q -%patch0 -p 1 -b .norc +#%patch0 -p 1 -b .norc #%patch1 -p 1 -b .openssl097 #%patch2 -p1 -b .pathcat +%patch0 -p1 -b .db4_3 +%patch1 -p1 -b .db4_2-db4_3 +%patch2 -p1 -b .uams_no_pie +ln -s ./NEWS ChangeLog %build touch AUTHORS @@ -48,10 +54,25 @@ aclocal -I macros automake --add-missing autoconf autoheader -CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %configure \ - --with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \ - --with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \ - --with-uams-path=%{_libdir} +export CFLAGS="$RPM_OPT_FLAGS -fPIE" +export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen" +%ifarch ppc ppc64 s390 s390x +export CFLAGS="$CFLAGS -fsigned-char" +%endif +%configure \ + --with-pkgconfdir=/etc/atalk/ \ + --with-cracklib \ + --with-pam \ + --with-shadow \ + --with-tcp-wrappers \ + --with-ssl \ + --with-flock-locksi \ + --with-uams-path=%{_libdir}/atalk \ + --enable-shared \ + --enable-krbV-uam \ + --enable-overwrite \ + --with-gnu-ld \ + --enable-redhat # Grrrr. Fix broken libtool/autoFOO Makefiles. if [ "%{_lib}" != lib ]; then @@ -66,7 +87,6 @@ make all %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/atalk/{uams,nls} mkdir -p $RPM_BUILD_ROOT/etc/pam.d mkdir -p $RPM_BUILD_ROOT%{initdir} mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} @@ -79,21 +99,11 @@ install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk install -m644 %{SOURCE4} . -#install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system -#install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/netatalk.conf install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ - -rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h || : - -cd $RPM_BUILD_ROOT/etc/atalk/nls -$RPM_BUILD_ROOT/usr/bin/makecode || true - -# Remove .la files in buildroot -rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_bindir}/acleandir.rc \ - $RPM_BUILD_ROOT%{_mandir}/man1/acleandir.1* +rm -f $RPM_BUILD_ROOT/usr/bin/acleandir.rc $RPM_BUILD_ROOT/usr/share/man/man1/acleandir* +chmod a-x bin/afile/acleandir.rc %clean rm -rf $RPM_BUILD_ROOT @@ -114,12 +124,10 @@ fi %files %defattr(-,root,root) -%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc +%doc bin/afile/acleandir.rc %dir /etc/atalk -%dir /etc/atalk/nls -%config /etc/atalk/nls/* -%{_libdir}/*.so %config(noreplace) /etc/atalk/AppleVolumes.default %config(noreplace) /etc/atalk/AppleVolumes.system %config(noreplace) /etc/atalk/netatalk.conf @@ -132,14 +140,19 @@ fi %{_bindir}/* %{_mandir}/man*/* %{_datadir}/netatalk +%{_libdir}/atalk/*.so +%{_libexecdir}/* %files devel %defattr(-,root,root) %dir %{_includedir}/atalk %{_libdir}/*.a +%{_libdir}/*.la %attr(0644,root,root) %{_includedir}/atalk/* %attr(0644,root,root) %{_includedir}/netatalk/* %{_datadir}/aclocal/netatalk.m4 +%{_libdir}/atalk/*.a +%{_libdir}/atalk/*.la %changelog * Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com> commit 960e4bcfd26bb2f5ee42967d75dec60e41fa6535 Author: cvsdist <cvsdist(a)fedoraproject.org> Date: Thu Sep 9 09:10:30 2004 +0000 auto-import changelog data from netatalk-1.6.4-3.src.rpm Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com> - rebuilt diff --git a/netatalk.spec b/netatalk.spec index 7d058f4..fd02613 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 1.6.4 -Release: 2.1 +Release: 3 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 @@ -142,6 +142,9 @@ fi %{_datadir}/aclocal/netatalk.m4 %changelog +* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com> +- rebuilt + * Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com> - rebuilt commit befe7e7cac7370d22605b398323730330e0424fa Author: cvsdist <cvsdist(a)fedoraproject.org> Date: Thu Sep 9 09:10:21 2004 +0000 auto-import changelog data from netatalk-1.6.4-2.1.src.rpm Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com> - rebuilt Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com> - rebuilt diff --git a/netatalk.spec b/netatalk.spec index d74bc58..7d058f4 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 1.6.4 -Release: 1 +Release: 2.1 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 @@ -142,6 +142,12 @@ fi %{_datadir}/aclocal/netatalk.m4 %changelog +* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com> +- rebuilt + +* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com> +- rebuilt + * Wed Jan 07 2004 Florian La Roche <Florian.LaRoche(a)redhat.de> - 1.6.4 commit 1e73502496efd9af90389bd51c9ac8ae2d35e49a Author: cvsdist <cvsdist(a)fedoraproject.org> Date: Thu Sep 9 09:09:27 2004 +0000 auto-import changelog data from netatalk-1.6.4-1.src.rpm Wed Jan 07 2004 Florian La Roche <Florian.LaRoche(a)redhat.de> - 1.6.4 Fri Aug 01 2003 Charlie Bennett <ccb(a)redhat.com> - Update with 1.6.3 upstream sources diff --git a/.cvsignore b/.cvsignore index a0d59f9..94c6fa6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-1.5.5.tar.bz2 +netatalk-1.6.4.tar.bz2 diff --git a/netatalk-1.6.3-norc.patch b/netatalk-1.6.3-norc.patch new file mode 100644 index 0000000..0c4c7d3 --- /dev/null +++ b/netatalk-1.6.3-norc.patch @@ -0,0 +1,20 @@ +--- netatalk-1.6.3/bin/afile/Makefile.in.norc 2003-06-12 19:07:40.000000000 -0400 ++++ netatalk-1.6.3/bin/afile/Makefile.in 2003-07-08 14:22:28.000000000 -0400 +@@ -184,7 +184,6 @@ + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys + + bin_PROGRAMS = afile achfile +-bin_SCRIPTS = acleandir.rc + + afile_SOURCES = afile.c common.c common.h + achfile_SOURCES = achfile.c common.c common.h +--- netatalk-1.6.3/man/man1/Makefile.in.norc 2003-06-09 11:59:12.000000000 -0400 ++++ netatalk-1.6.3/man/man1/Makefile.in 2003-07-08 14:22:28.000000000 -0400 +@@ -188,7 +188,6 @@ + GENERATED_MANS = apple_cp.1 apple_mv.1 apple_rm.1 + TEMPLATE_FILES = $(foreach f,$(GENERATED_MANS),$(f).tmpl) + NONGENERATED_MANS = achfile.1 \ +- acleandir.1 \ + aecho.1 \ + afile.1 \ + afppasswd.1 \ diff --git a/netatalk.spec b/netatalk.spec index d94fa94..d74bc58 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -2,24 +2,24 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 1.5.5 -Release: 9 +Version: 1.6.4 +Release: 1 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: atalk.init -Source2: netatalk.config -Source3: AppleVolumes.system +#Source2: netatalk.config +#Source3: AppleVolumes.system Source4: ICDumpSuffixMap -Patch0: netatalk-1.5.3.1-norc.patch -Patch1: netatalk-1.5.5-openssl097.patch -Patch2: netatalk-1.5.5-pathcat.patch +Patch0: netatalk-1.6.3-norc.patch +#Patch1: netatalk-1.5.5-openssl097.patch +#Patch2: netatalk-1.5.5-pathcat.patch Epoch: 2 -Obsoletes: netatalk-1.4b2+asun +Obsoletes: netatalk-1.5.5 Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib openssl-devel pam quota libtool automake14 autoconf +BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf BuildRoot: %{_tmppath}/%{name}-root %description @@ -38,14 +38,14 @@ Appletalk networking programs. %prep %setup -q %patch0 -p 1 -b .norc -%patch1 -p 1 -b .openssl097 -%patch2 -p1 -b .pathcat +#%patch1 -p 1 -b .openssl097 +#%patch2 -p1 -b .pathcat %build touch AUTHORS libtoolize --force -aclocal-1.4 -I macros -automake-1.4 --add-missing +aclocal -I macros +automake --add-missing autoconf autoheader CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %configure \ @@ -79,8 +79,8 @@ install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk install -m644 %{SOURCE4} . -install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system -install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/netatalk.conf +#install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system +#install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/netatalk.conf install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ @@ -114,7 +114,7 @@ fi %files %defattr(-,root,root) -%doc CHANGES COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc %dir /etc/atalk %dir /etc/atalk/nls @@ -142,6 +142,12 @@ fi %{_datadir}/aclocal/netatalk.m4 %changelog +* Wed Jan 07 2004 Florian La Roche <Florian.LaRoche(a)redhat.de> +- 1.6.4 + +* Fri Aug 1 2003 Charlie Bennett <ccb(a)redhat.com> +- Update with 1.6.3 upstream sources + * Tue Jul 29 2003 Elliot Lee <sopwith(a)redhat.com> - Rebuild - Fix perl multilib path editing diff --git a/sources b/sources index 12174ca..154d50c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93ec251d47f355c99daad19de0b40eb2 netatalk-1.5.5.tar.bz2 +8bed0582d51deef7a31da1b6ae5df2e6 netatalk-1.6.4.tar.bz2 commit c036a8ff40ce83671c4652f2862365f0e1c93df4 Author: cvsdist <cvsdist(a)fedoraproject.org> Date: Thu Sep 9 09:09:20 2004 +0000 auto-import changelog data from netatalk-1.5.5-9.src.rpm Tue Jul 29 2003 Elliot Lee <sopwith(a)redhat.com> - Rebuild - Fix perl multilib path editing - Add pathcat patch Thu May 01 2003 Elliot Lee <sopwith(a)redhat.com> 1.5.5-7 - Make multilib generic - Add builddep on quota (for rpcsvc/rquota.h) diff --git a/netatalk.spec b/netatalk.spec index 74ce8da..d94fa94 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,9 +1,9 @@ -%define initdir /etc/rc.d/init.d + %define initdir /etc/rc.d/init.d Summary: AppleTalk networking programs Name: netatalk Version: 1.5.5 -Release: 6 +Release: 9 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 @@ -13,12 +13,13 @@ Source3: AppleVolumes.system Source4: ICDumpSuffixMap Patch0: netatalk-1.5.3.1-norc.patch Patch1: netatalk-1.5.5-openssl097.patch +Patch2: netatalk-1.5.5-pathcat.patch Epoch: 2 Obsoletes: netatalk-1.4b2+asun Url: http://netatalk.sourceforge.net/ Prereq: /sbin/chkconfig, /sbin/service Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib -BuildRequires: cracklib, openssl-devel, pam +BuildRequires: cracklib openssl-devel pam quota libtool automake14 autoconf BuildRoot: %{_tmppath}/%{name}-root %description @@ -38,17 +39,27 @@ Appletalk networking programs. %setup -q %patch0 -p 1 -b .norc %patch1 -p 1 -b .openssl097 +%patch2 -p1 -b .pathcat %build +touch AUTHORS +libtoolize --force +aclocal-1.4 -I macros +automake-1.4 --add-missing +autoconf +autoheader CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %configure \ --with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \ --with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \ --with-uams-path=%{_libdir} # Grrrr. Fix broken libtool/autoFOO Makefiles. -%ifarch x86_64 -perl -pi -e 's/-L\/usr\/lib/-L\/usr\/lib64/g' Makefile */Makefile */*/Makefile */*/*/Makefile -%endif +if [ "%{_lib}" != lib ]; then + find . -name Makefile | xargs perl -pi \ + -e 's,-L/usr/lib,-L%{_libdir},g' + find . -name Makefile | xargs perl -pi \ + -e 's,-L/lib,-L/%{_lib},g' +fi make all @@ -81,6 +92,8 @@ $RPM_BUILD_ROOT/usr/bin/makecode || true # Remove .la files in buildroot rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_bindir}/acleandir.rc \ + $RPM_BUILD_ROOT%{_mandir}/man1/acleandir.1* %clean rm -rf $RPM_BUILD_ROOT @@ -129,6 +142,15 @@ fi %{_datadir}/aclocal/netatalk.m4 %changelog +* Tue Jul 29 2003 Elliot Lee <sopwith(a)redhat.com> +- Rebuild +- Fix perl multilib path editing +- Add pathcat patch + +* Thu May 1 2003 Elliot Lee <sopwith(a)redhat.com> 1.5.5-7 +- Make multilib generic +- Add builddep on quota (for rpcsvc/rquota.h) + * Wed Feb 18 2003 Bill Nottingham <notting(a)redhat.com> 1.5.5-5 - fix initscript error (#82118) commit aeac6e0b1a251b3f4122de985b5ef1128e747619 Author: cvsdist <cvsdist(a)fedoraproject.org> Date: Thu Sep 9 09:08:50 2004 +0000 auto-import changelog data from netatalk-1.5.5-6.src.rpm Tue Feb 18 2003 Bill Nottingham <notting(a)redhat.com> 1.5.5-5 - fix initscript error (#82118) Wed Jan 22 2003 Tim Powers <timp(a)redhat.com> - rebuilt Tue Jan 07 2003 Nalin Dahyabhai <nalin(a)redhat.com> 1.5.5-3 - patch for compile errors with new ssl libs - rebuild Mon Dec 02 2002 Florian La Roche <Florian.LaRoche(a)redhat.de> - postun should never fail Thu Nov 28 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.5-1 - Updated to 1.5.5 diff --git a/.cvsignore b/.cvsignore index c493109..a0d59f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-1.5.3.1.tar.bz2 +netatalk-1.5.5.tar.bz2 diff --git a/atalk.init b/atalk.init index 87751d2..817c16e 100644 --- a/atalk.init +++ b/atalk.init @@ -14,7 +14,7 @@ . /etc/sysconfig/network # Source Appletalk configuration -. /etc/atalk/config +. /etc/atalk/netatalk.conf # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 diff --git a/netatalk.spec b/netatalk.spec index 0956771..74ce8da 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -2,8 +2,8 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 1.5.3.1 -Release: 4 +Version: 1.5.5 +Release: 6 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 @@ -12,6 +12,7 @@ Source2: netatalk.config Source3: AppleVolumes.system Source4: ICDumpSuffixMap Patch0: netatalk-1.5.3.1-norc.patch +Patch1: netatalk-1.5.5-openssl097.patch Epoch: 2 Obsoletes: netatalk-1.4b2+asun Url: http://netatalk.sourceforge.net/ @@ -36,13 +37,19 @@ Appletalk networking programs. %prep %setup -q %patch0 -p 1 -b .norc +%patch1 -p 1 -b .openssl097 %build -CFLAGS="$RPM_OPT_FLAGS -fsigned-char" ./configure --prefix=%{_prefix} \ +CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %configure \ --with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \ --with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \ --with-uams-path=%{_libdir} - + +# Grrrr. Fix broken libtool/autoFOO Makefiles. +%ifarch x86_64 +perl -pi -e 's/-L\/usr\/lib/-L\/usr\/lib64/g' Makefile */Makefile */*/Makefile */*/*/Makefile +%endif + make all %install @@ -62,7 +69,7 @@ install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk install -m644 %{SOURCE4} . install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system -install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/config +install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/netatalk.conf install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ @@ -72,6 +79,9 @@ rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h || : cd $RPM_BUILD_ROOT/etc/atalk/nls $RPM_BUILD_ROOT/usr/bin/makecode || true +# Remove .la files in buildroot +rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT @@ -86,12 +96,12 @@ fi %postun if [ "$1" -ge "1" ]; then - /sbin/service atalk condrestart > /dev/null 2>&1 + /sbin/service atalk condrestart > /dev/null 2>&1 || : fi %files %defattr(-,root,root) -%doc BUGS CHANGES COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc CHANGES COPYRIGHT ChangeLog README* TODO VERSION NEWS %doc ICDumpSuffixMap doc %dir /etc/atalk %dir /etc/atalk/nls @@ -99,7 +109,7 @@ fi %{_libdir}/*.so %config(noreplace) /etc/atalk/AppleVolumes.default %config(noreplace) /etc/atalk/AppleVolumes.system -%config(noreplace) /etc/atalk/config +%config(noreplace) /etc/atalk/netatalk.conf %config(noreplace) /etc/atalk/afpd.conf %config(noreplace) /etc/atalk/atalkd.conf %config(noreplace) /etc/atalk/papd.conf @@ -119,6 +129,22 @@ fi %{_datadir}/aclocal/netatalk.m4 %changelog +* Wed Feb 18 2003 Bill Nottingham <notting(a)redhat.com> 1.5.5-5 +- fix initscript error (#82118) + +* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com> +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai <nalin(a)redhat.com> 1.5.5-3 +- patch for compile errors with new ssl libs +- rebuild + +* Mon Dec 02 2002 Florian La Roche <Florian.LaRoche(a)redhat.de> +- postun should never fail + +* Thu Nov 28 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.5-1 +- Updated to 1.5.5 + * Tue Jun 25 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-4 - Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) - Fixed missing /usr/share/netatalk dir (#67222) @@ -217,7 +243,7 @@ fi * Thu Dec 16 1999 Tim Powers <timp(a)redhat.com> - renewed source so it is pristine, delete the problematic files in spec file instead -- general spec file cleanups, create buildroot and dirs in the %install +- general spec file cleanups, create buildroot and dirs in the %%install section - strip binaries - gzip man pages diff --git a/sources b/sources index 83f96e8..12174ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d9fe0fce60bccb1264fdbb42fa1465b netatalk-1.5.3.1.tar.bz2 +93ec251d47f355c99daad19de0b40eb2 netatalk-1.5.5.tar.bz2 commit a6dd7fa958db6d5cad3f2192822ee174be0687f2 Author: cvsdist <cvsdist(a)fedoraproject.org> Date: Thu Sep 9 09:08:46 2004 +0000 auto-import netatalk-1.5.3.1-4 from netatalk-1.5.3.1-4.src.rpm diff --git a/netatalk.spec b/netatalk.spec index 1df7c65..0956771 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 1.5.3.1 -Release: 3 +Release: 4 License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 @@ -108,6 +108,7 @@ fi %{_sbindir}/* %{_bindir}/* %{_mandir}/man*/* +%{_datadir}/netatalk %files devel %defattr(-,root,root) @@ -118,8 +119,9 @@ fi %{_datadir}/aclocal/netatalk.m4 %changelog -* Tue Jun 25 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-3 -- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] +* Tue Jun 25 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-4 +- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) +- Fixed missing /usr/share/netatalk dir (#67222) * Fri Jun 21 2002 Tim Powers <timp(a)redhat.com> 1.5.3.1-2 - automated rebuild commit 973964e1804cfc5ea2e325eaced276c945c592b0 Author: cvsdist <cvsdist(a)fedoraproject.org> Date: Thu Sep 9 09:08:42 2004 +0000 auto-import changelog data from netatalk-1.5.3.1-3.src.rpm Tue Jun 25 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-3 - Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] Fri Jun 21 2002 Tim Powers <timp(a)redhat.com> 1.5.3.1-2 - automated rebuild Tue Jun 18 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-1 - Updated to latest version 1.5.3.1. - Fixed bug for nls file lookup (#66300). Mon May 27 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-4 - Fixed initscript bug where you can't use blanks inside of names (#64926). diff --git a/.cvsignore b/.cvsignore index f085180..c493109 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netatalk-1.5.2.tar.gz +netatalk-1.5.3.1.tar.bz2 diff --git a/atalk.init b/atalk.init index af2b172..87751d2 100644 --- a/atalk.init +++ b/atalk.init @@ -31,7 +31,7 @@ start() { daemon papd -f /etc/atalk/papd.conf fi if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system + daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system fi } >/dev/null & else @@ -42,7 +42,7 @@ start() { daemon papd -f /etc/atalk/papd.conf fi if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system + daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system fi fi echo diff --git a/netatalk.spec b/netatalk.spec index e424d31..1df7c65 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -2,15 +2,16 @@ Summary: AppleTalk networking programs Name: netatalk -Version: 1.5.2 +Version: 1.5.3.1 Release: 3 License: GPL Group: System Environment/Daemons -Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.gz +Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 Source1: atalk.init Source2: netatalk.config Source3: AppleVolumes.system Source4: ICDumpSuffixMap +Patch0: netatalk-1.5.3.1-norc.patch Epoch: 2 Obsoletes: netatalk-1.4b2+asun Url: http://netatalk.sourceforge.net/ @@ -34,11 +35,13 @@ Appletalk networking programs. %prep %setup -q +%patch0 -p 1 -b .norc %build CFLAGS="$RPM_OPT_FLAGS -fsigned-char" ./configure --prefix=%{_prefix} \ - --with-cracklib --with-pam --with-shadow --with-tcp-wrappers \ - --with-ssl --with-flock-locksi --with-uams-path=%{_libdir} + --with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \ + --with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \ + --with-uams-path=%{_libdir} make all @@ -115,7 +118,20 @@ fi %{_datadir}/aclocal/netatalk.m4 %changelog -* Wed Apr 10 2002 Phil Knirsch <pknirsch(a)redhat.com> +* Tue Jun 25 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-3 +- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] + +* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com> 1.5.3.1-2 +- automated rebuild + +* Tue Jun 18 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.3.1-1 +- Updated to latest version 1.5.3.1. +- Fixed bug for nls file lookup (#66300). + +* Mon May 27 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-4 +- Fixed initscript bug where you can't use blanks inside of names (#64926). + +* Wed Apr 10 2002 Phil Knirsch <pknirsch(a)redhat.com> 1.5.2-3 - Fixed initscript to use correct config files from /etc/atalk (#62803) - Changed initscript to use $0 instead of direct string (#61734) - Change Copyright to Licencse and switch from BSD to GPL (#61746) diff --git a/sources b/sources index 7971316..83f96e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9355653d6b2c18f10d1be02624db65f6 netatalk-1.5.2.tar.gz +7d9fe0fce60bccb1264fdbb42fa1465b netatalk-1.5.3.1.tar.bz2 commit 808cded35815b5dcf66f079ded3207b270039c70 Author: cvsdist <cvsdist(a)fedoraproject.org> Date: Thu Sep 9 09:08:31 2004 +0000 auto-import changelog data from netatalk-1.5.2-3.src.rpm Wed Apr 10 2002 Phil Knirsch <pknirsch(a)redhat.com> - Fixed initscript to use correct config files from /etc/atalk (#62803) - Changed initscript to use $0 instead of direct string (#61734) - Change Copyright to Licencse and switch from BSD to GPL (#61746) diff --git a/atalk.init b/atalk.init index cbf3ece..af2b172 100644 --- a/atalk.init +++ b/atalk.init @@ -24,25 +24,25 @@ start() { if [ ${ATALK_BGROUND} = yes ] ; then echo -n "(backgrounded)" { - daemon atalkd + daemon atalkd -f /etc/atalk/atalkd.conf nbprgstr -p 4 "${ATALK_NAME}:Workstation" nbprgstr -p 4 "${ATALK_NAME}:netatalk" if [ ${PAPD_RUN} = yes ] ; then - daemon papd + daemon papd -f /etc/atalk/papd.conf fi if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} + daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system fi } >/dev/null & else - daemon atalkd + daemon atalkd -f /etc/atalk/atalkd.conf nbprgstr -p 4 "${ATALK_NAME}:Workstation" nbprgstr -p 4 "${ATALK_NAME}:netatalk" if [ ${PAPD_RUN} = yes ] ; then - daemon papd + daemon papd -f /etc/atalk/papd.conf fi if [ ${AFPD_RUN} = yes ] ; then - daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} + daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system fi fi echo @@ -51,11 +51,11 @@ start() { stop() { echo -n $"Shutting down AppleTalk services: " - killall afpd - killall papd + killproc afpd + killproc papd nbpunrgstr "${ATALK_NAME}:Workstation@*" nbpunrgstr "${ATALK_NAME}:netatalk@*" - killall atalkd + killproc atalkd # Attempt to zap the module, so that we can restart the # Appletalk daemons cleanly if [ -e /proc/modules ] && [ -x /sbin/modprobe ] ; then @@ -88,7 +88,7 @@ case "$1" in status atalkd ;; *) - echo $"Usage: atalk {start|stop|restart|status|condrestart}" + echo $"Usage: $0 {start|stop|restart|status|condrestart}" exit 1 esac diff --git a/netatalk.spec b/netatalk.spec index 396f9fb..e424d31 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -3,8 +3,8 @@ Summary: AppleTalk networking programs Name: netatalk Version: 1.5.2 -Release: 2 -Copyright: BSD +Release: 3 +License: GPL Group: System Environment/Daemons Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.gz Source1: atalk.init @@ -115,6 +115,11 @@ fi %{_datadir}/aclocal/netatalk.m4 %changelog +* Wed Apr 10 2002 Phil Knirsch <pknirsch(a)redhat.com> +- Fixed initscript to use correct config files from /etc/atalk (#62803) +- Changed initscript to use $0 instead of direct string (#61734) +- Change Copyright to Licencse and switch from BSD to GPL (#61746) + * Thu Mar 14 2002 Bill Nottingham <notting(a)redhat.com> - don't run by default commit 303281c9b97a39cb914726b67921e01b80d14922 Author: cvsdist <cvsdist(a)fedoraproject.org> Date: Thu Sep 9 09:08:20 2004 +0000 auto-import changelog data from netatalk-1.5.2-2.src.rpm Thu Mar 14 2002 Bill Nottingham <notting(a)redhat.com> - don't run by default Wed Mar 13 2002 Bill Nottingham <notting(a)redhat.com> - it's back Fri Mar 02 2001 Tim Powers <timp(a)redhat.com> - rebuilt against openssl-0.9.6-1 Sun Feb 25 2001 Tim Powers <timp(a)redhat.com> - fixed bug 29370. This package is trying to include a file glibc already includes Tue Jan 23 2001 Tim Powers <timp(a)redhat.com> - updated initscript Thu Jan 04 2001 Than Ngo <than(a)redhat.com> - fixed uams-path - added noreplace to %config Mon Nov 20 2000 Tim Powers <timp(a)redhat.com> - rebuilt to fix bad dir perms Fri Nov 10 2000 Than Ngo <than(a)redhat.com> - update to 1.5pre2 (bug #19737, #20397) - update Url and ftp site - clean up specfile - netatalk-1.4b2+asun obsolete Mon Aug 07 2000 Than Ngo <than(a)redhat.de> - fix dependency with glibc-devel (Bug #15589) - fix typo in description (Bug #15479) Wed Aug 02 2000 Tim Powers <timp(a)redhat.com> - fix symlinks not being relative. Fri Jul 28 2000 Than Ngo <than(a)redhat.de> - add missing restart function in startup script Fri Jul 28 2000 Tim Powers <timp(a)redhat.com> - fixed initscripts so that condrestart doesn't return 1 when the test fails Mon Jul 24 2000 Prospector <prospector(a)redhat.com> - rebuilt Sun Jul 23 2000 Tim Powers <timp(a)redhat.com> - rebuilt Mon Jul 17 2000 Tim Powers <timp(a)redhat.com> - inits back to rc.d/init.d, using service to start inits Wed Jul 12 2000 Than Ngo <than(a)redhat.de> - rebuilt Thu Jul 06 2000 Tim Powers <timp(a)redhat.com> - fixed broken PreReq, now PreReq's /etc/init.d Tue Jun 27 2000 Than Ngo <than(a)redhat.de> - remove prereq initscripts, add requires initscripts - clean up specfile Mon Jun 26 2000 Than Ngo <than(a)redhat.de> - /etc/rc.d/init.d -> /etc/init.d - add condrestart directive - fix post/preun/postun scripts - prereq initscripts >= 5.20 Tue Jun 20 2000 Tim Powers <timp(a)redhat.com> - fixed bug 11420 concerning the building with -O2. Thu Jun 08 2000 Tim Powers <timp(a)redhat.com> - fix bug #11978 - fix man page locations to be FHS compliant Thu Jun 01 2000 Nalin Dahyabhai <nalin(a)redhat.com> - modify PAM setup to use system-auth Thu Dec 16 1999 Tim Powers <timp(a)redhat.com> - renewed source so it is pristine, delete the problematic files in spec file instead - general spec file cleanups, create buildroot and dirs in the %install section - strip binaries - gzip man pages - fixed netatalk-asun.librpcsvc.patch, -lnss_nis too - changed group - added %defattr to %files section Tue Aug 03 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - rpm-3.0 needs to remove vogus files from source. Removed files: etc/papd/.#magics.c, etc/.#diff Fri Jul 30 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - Change Copyright tag to BSD. Add /usr/bin/adv1tov2. Thu Apr 22 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - Correct librpcsvc.patch. Move %changelog section last. Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since LinuxPPC may need. Wed Mar 31 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. Sat Mar 20 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - Correct symbolic links to psf. Remove asciize function from nbplkup so as to display Japanese hostname. Thu Mar 11 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping containd in Internet Config Preference. Tue Mar 02 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - [asun2.1.3] Mon Feb 15 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - [pre-asun2.1.2-8] Sun Feb 07 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> - [pre-asun2.1.2-6] Mon Jan 25 1999 iNOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - [pre-asun2.1.2-3] Thu Dec 17 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - [pre-asun2.1.2] Remove crlf patch. It is now a server's option. Thu Dec 03 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz Add uams directory Sat Nov 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.1-3 source. Mon Nov 23 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.1-2 source. Mon Nov 16 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Fix rcX.d's symbolic links. Wed Oct 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line. Sat Oct 24 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. Mon Oct 05 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-10a source. Sat Sep 19 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-8 source. Add chkconfig support. Sat Sep 12 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Comment out -DCRLF. Use RPM_OPT_FLAGS. Tue Sep 08 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. Sat Aug 22 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-6 source. Mon Jul 27 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use pre-asun2.1.0-5 source. Tue Jul 21 1998 INOUE Koichi <inoue(a)ma.ns.musashi-techa.c.jp> - Use pre-asun2.1.0-3 source. Tue Jul 07 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Add afpovertcp entries to /etc/services - Remove BuildRoot in man8 pages Mon Jun 29 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> - Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun <asun(a)saul9.u.washington.edu> to provide an AppleShareIP file server - Included AppleVolumes.system file maintained by Johnson <johnson(a)stpt.usf.edu> Mon Aug 25 1997 David Gibson <D.Gibson(a)student.anu.edu.au> - Used a buildroot - Use RPM_OPT_FLAGS - Moved configuration parameters/files from atalk.init to /etc/atalk - Separated devel package - Built with shared libraries Sun Jul 13 1997 Paul H. Hargrove <hargrove(a)sccm.Stanford.EDU> - Updated sources from 1.3.3 to 1.4b2 - Included endian patch for Linux/SPARC - Use all the configuration files supplied in the source. This has the following advantages over the ones in the previous rpm release: The printer 'lp' isn't automatically placed in papd.conf The default file conversion is binary rather than text. - Automatically add and remove DDP services from /etc/services - Placed the recommended /etc/services in the documentation - Changed atalk.init to give daemons a soft kill - Changed atalk.init to make configuration easier Wed May 28 1997 Mark Cornick <mcornick(a)zorak.gsfc.nasa.gov> Updated for /etc/pam.d diff --git a/.cvsignore b/.cvsignore index e69de29..f085180 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +netatalk-1.5.2.tar.gz diff --git a/ICDumpSuffixMap b/ICDumpSuffixMap new file mode 100644 index 0000000..3a8283f --- /dev/null +++ b/ICDumpSuffixMap @@ -0,0 +1 @@ +#!perl # # ICDumpMap # --- Dump suffix mappings from your Internet Config extension. # # iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> # use Mac::InternetConfig; open MAP, ">AppleVolumes"; printf MAP "%-9s \"%4s\" \"%4s\" %-30s %-25s %-15s\n\n", ".", "TEXT", "ttxt", "ASCII Text", "SimpleText", "text/plain"; print MAP "\# The following lines are extracted from Internet Config Preference.\n\n"; for my $entry (keys %InternetConfigMap) { next unless $entry->extension =~ /^\./; $_ = sprintf "%-9s \"%4s\" \"%4s\" %-30s %-25s %-15s", $entry->extension, $entry->file_type, $entry->file_creator, $entry->entry_name, $entry->creator_app_name, $entry->MIME_type; s/\s*$/\n/; print MAP; } close MAP; \ No newline at end of file diff --git a/atalk.init b/atalk.init new file mode 100644 index 0000000..cbf3ece --- /dev/null +++ b/atalk.init @@ -0,0 +1,95 @@ +#!/bin/sh +# chkconfig: - 91 35 +# description: This package enables Linux to talk to Macintosh computers via the \ +# AppleTalk networking protocol. It includes a daemon to allow Linux \ +# to act as a file server over EtherTalk or IP for Mac's. +# processname: atalkd +# pidfile: /var/run/atalkd.pid +# config: /etc/atalk/* + +# Source function library. +. /etc/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Source Appletalk configuration +. /etc/atalk/config + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +start() { + echo -n $"Starting AppleTalk services: " + if [ ${ATALK_BGROUND} = yes ] ; then + echo -n "(backgrounded)" + { + daemon atalkd + nbprgstr -p 4 "${ATALK_NAME}:Workstation" + nbprgstr -p 4 "${ATALK_NAME}:netatalk" + if [ ${PAPD_RUN} = yes ] ; then + daemon papd + fi + if [ ${AFPD_RUN} = yes ] ; then + daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} + fi + } >/dev/null & + else + daemon atalkd + nbprgstr -p 4 "${ATALK_NAME}:Workstation" + nbprgstr -p 4 "${ATALK_NAME}:netatalk" + if [ ${PAPD_RUN} = yes ] ; then + daemon papd + fi + if [ ${AFPD_RUN} = yes ] ; then + daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} + fi + fi + echo + touch /var/lock/subsys/atalk +} + +stop() { + echo -n $"Shutting down AppleTalk services: " + killall afpd + killall papd + nbpunrgstr "${ATALK_NAME}:Workstation@*" + nbpunrgstr "${ATALK_NAME}:netatalk@*" + killall atalkd + # Attempt to zap the module, so that we can restart the + # Appletalk daemons cleanly + if [ -e /proc/modules ] && [ -x /sbin/modprobe ] ; then + modprobe -r appletalk + fi + rm -f /var/lock/subsys/atalk + echo "" +} + + +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + condrestart) + [ -f /var/lock/subsys/atalk ] && restart || : + ;; + status) + status atalkd + ;; + *) + echo $"Usage: atalk {start|stop|restart|status|condrestart}" + exit 1 +esac + +exit 0 diff --git a/netatalk.spec b/netatalk.spec new file mode 100644 index 0000000..396f9fb --- /dev/null +++ b/netatalk.spec @@ -0,0 +1,288 @@ +%define initdir /etc/rc.d/init.d + +Summary: AppleTalk networking programs +Name: netatalk +Version: 1.5.2 +Release: 2 +Copyright: BSD +Group: System Environment/Daemons +Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.gz +Source1: atalk.init +Source2: netatalk.config +Source3: AppleVolumes.system +Source4: ICDumpSuffixMap +Epoch: 2 +Obsoletes: netatalk-1.4b2+asun +Url: http://netatalk.sourceforge.net/ +Prereq: /sbin/chkconfig, /sbin/service +Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib +BuildRequires: cracklib, openssl-devel, pam +BuildRoot: %{_tmppath}/%{name}-root + +%description +This package enables Linux to talk to Macintosh computers via the +AppleTalk networking protocol. It includes a daemon to allow Linux +to act as a file server over EtherTalk or IP for Mac's. + +%package devel +Summary: Headers and static libraries for Appletalk development +Group: Development/Libraries + +%description devel +This package contains the header files, and static libraries for building +Appletalk networking programs. + +%prep +%setup -q + +%build +CFLAGS="$RPM_OPT_FLAGS -fsigned-char" ./configure --prefix=%{_prefix} \ + --with-cracklib --with-pam --with-shadow --with-tcp-wrappers \ + --with-ssl --with-flock-locksi --with-uams-path=%{_libdir} + +make all + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT/etc/atalk/{uams,nls} +mkdir -p $RPM_BUILD_ROOT/etc/pam.d +mkdir -p $RPM_BUILD_ROOT%{initdir} +mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} + +make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install + +install -m644 config/AppleVolumes.default $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.default +install -m644 config/afpd.conf $RPM_BUILD_ROOT/etc/atalk/afpd.conf +install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf +install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf +install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk +install -m644 %{SOURCE4} . +install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system +install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/config +install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk +cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ +cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ + +rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h || : + +cd $RPM_BUILD_ROOT/etc/atalk/nls +$RPM_BUILD_ROOT/usr/bin/makecode || true + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/chkconfig --add atalk + +%preun +if [ "$1" = "0" ] ; then + /sbin/service atalk stop > /dev/null 2>&1 + /sbin/chkconfig --del atalk +fi + +%postun +if [ "$1" -ge "1" ]; then + /sbin/service atalk condrestart > /dev/null 2>&1 +fi + +%files +%defattr(-,root,root) +%doc BUGS CHANGES COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc ICDumpSuffixMap doc +%dir /etc/atalk +%dir /etc/atalk/nls +%config /etc/atalk/nls/* +%{_libdir}/*.so +%config(noreplace) /etc/atalk/AppleVolumes.default +%config(noreplace) /etc/atalk/AppleVolumes.system +%config(noreplace) /etc/atalk/config +%config(noreplace) /etc/atalk/afpd.conf +%config(noreplace) /etc/atalk/atalkd.conf +%config(noreplace) /etc/atalk/papd.conf +%attr(755,root,root) %config %{initdir}/atalk +%config(noreplace) /etc/pam.d/netatalk +%{_sbindir}/* +%{_bindir}/* +%{_mandir}/man*/* + +%files devel +%defattr(-,root,root) +%dir %{_includedir}/atalk +%{_libdir}/*.a +%attr(0644,root,root) %{_includedir}/atalk/* +%attr(0644,root,root) %{_includedir}/netatalk/* +%{_datadir}/aclocal/netatalk.m4 + +%changelog +* Thu Mar 14 2002 Bill Nottingham <notting(a)redhat.com> +- don't run by default + +* Wed Mar 13 2002 Bill Nottingham <notting(a)redhat.com> +- it's back + +* Fri Mar 2 2001 Tim Powers <timp(a)redhat.com> +- rebuilt against openssl-0.9.6-1 + +* Sun Feb 25 2001 Tim Powers <timp(a)redhat.com> +- fixed bug 29370. This package is trying to include a file glibc already includes + +* Tue Jan 23 2001 Tim Powers <timp(a)redhat.com> +- updated initscript + +* Thu Jan 04 2001 Than Ngo <than(a)redhat.com> +- fixed uams-path +- added noreplace to %config + +* Mon Nov 20 2000 Tim Powers <timp(a)redhat.com> +- rebuilt to fix bad dir perms + +* Fri Nov 10 2000 Than Ngo <than(a)redhat.com> +- update to 1.5pre2 (bug #19737, #20397) +- update Url and ftp site +- clean up specfile +- netatalk-1.4b2+asun obsolete + +* Mon Aug 07 2000 Than Ngo <than(a)redhat.de> +- fix dependency with glibc-devel (Bug #15589) +- fix typo in description (Bug #15479) + +* Wed Aug 2 2000 Tim Powers <timp(a)redhat.com> +- fix symlinks not being relative. + +* Fri Jul 28 2000 Than Ngo <than(a)redhat.de> +- add missing restart function in startup script + +* Fri Jul 28 2000 Tim Powers <timp(a)redhat.com> +- fixed initscripts so that condrestart doesn't return 1 when the test fails + +* Mon Jul 24 2000 Prospector <prospector(a)redhat.com> +- rebuilt + +* Sun Jul 23 2000 Tim Powers <timp(a)redhat.com> +- rebuilt + +* Mon Jul 17 2000 Tim Powers <timp(a)redhat.com> +- inits back to rc.d/init.d, using service to start inits + +* Wed Jul 12 2000 Than Ngo <than(a)redhat.de> +- rebuilt + +* Thu Jul 06 2000 Tim Powers <timp(a)redhat.com> +- fixed broken PreReq, now PreReq's /etc/init.d + +* Tue Jun 27 2000 Than Ngo <than(a)redhat.de> +- remove prereq initscripts, add requires initscripts +- clean up specfile + +* Mon Jun 26 2000 Than Ngo <than(a)redhat.de> +- /etc/rc.d/init.d -> /etc/init.d +- add condrestart directive +- fix post/preun/postun scripts +- prereq initscripts >= 5.20 + +* Tue Jun 20 2000 Tim Powers <timp(a)redhat.com> +- fixed bug 11420 concerning the building with -O2. + +* Thu Jun 8 2000 Tim Powers <timp(a)redhat.com> +- fix bug #11978 +- fix man page locations to be FHS compliant + +* Thu Jun 1 2000 Nalin Dahyabhai <nalin(a)redhat.com> +- modify PAM setup to use system-auth + +* Thu Dec 16 1999 Tim Powers <timp(a)redhat.com> +- renewed source so it is pristine, delete the problematic files in spec file + instead +- general spec file cleanups, create buildroot and dirs in the %install + section +- strip binaries +- gzip man pages +- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too +- changed group +- added %defattr to %files section + +* Tue Aug 3 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- rpm-3.0 needs to remove vogus files from source. + Removed files: etc/papd/.#magics.c, etc/.#diff +* Fri Jul 30 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Change Copyright tag to BSD. + Add /usr/bin/adv1tov2. +* Thu Apr 22 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Correct librpcsvc.patch. Move %changelog section last. + Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since + LinuxPPC may need. +* Wed Mar 31 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. +* Sat Mar 20 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Correct symbolic links to psf. + Remove asciize function from nbplkup so as to display Japanese hostname. +* Thu Mar 11 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping + containd in Internet Config Preference. +* Tue Mar 2 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- [asun2.1.3] +* Mon Feb 15 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2-8] +* Sun Feb 7 1999 iNOUE Koich! <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2-6] +* Mon Jan 25 1999 iNOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2-3] +* Thu Dec 17 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- [pre-asun2.1.2] + Remove crlf patch. It is now a server's option. +* Thu Dec 3 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz + Add uams directory +* Sat Nov 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.1-3 source. +* Mon Nov 23 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.1-2 source. +* Mon Nov 16 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Fix rcX.d's symbolic links. +* Wed Oct 28 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line. +* Sat Oct 24 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. +* Mon Oct 5 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-10a source. +* Thu Sep 19 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-8 source. Add chkconfig support. +* Sat Sep 12 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Comment out -DCRLF. Use RPM_OPT_FLAGS. +* Mon Sep 8 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. +* Mon Aug 22 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-6 source. +* Mon Jul 27 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use pre-asun2.1.0-5 source. +* Tue Jul 21 1998 INOUE Koichi <inoue(a)ma.ns.musashi-techa.c.jp> +- Use pre-asun2.1.0-3 source. +* Tue Jul 7 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Add afpovertcp entries to /etc/services +- Remove BuildRoot in man8 pages +* Mon Jun 29 1998 INOUE Koichi <inoue(a)ma.ns.musashi-tech.ac.jp> +- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun + <asun(a)saul9.u.washington.edu> to provide an AppleShareIP file server +- Included AppleVolumes.system file maintained by Johnson + <johnson(a)stpt.usf.edu> +* Mon Aug 25 1997 David Gibson <D.Gibson(a)student.anu.edu.au> +- Used a buildroot +- Use RPM_OPT_FLAGS +- Moved configuration parameters/files from atalk.init to /etc/atalk +- Separated devel package +- Built with shared libraries +* Sun Jul 13 1997 Paul H. Hargrove <hargrove(a)sccm.Stanford.EDU> +- Updated sources from 1.3.3 to 1.4b2 +- Included endian patch for Linux/SPARC +- Use all the configuration files supplied in the source. This has the + following advantages over the ones in the previous rpm release: + + The printer 'lp' isn't automatically placed in papd.conf + + The default file conversion is binary rather than text. +- Automatically add and remove DDP services from /etc/services +- Placed the recommended /etc/services in the documentation +- Changed atalk.init to give daemons a soft kill +- Changed atalk.init to make configuration easier + +* Wed May 28 1997 Mark Cornick <mcornick(a)zorak.gsfc.nasa.gov> +Updated for /etc/pam.d diff --git a/sources b/sources index e69de29..7971316 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9355653d6b2c18f10d1be02624db65f6 netatalk-1.5.2.tar.gz

1 0

[Report] Packages Restricting Arches
by root 04 May '19

04 May '19

List of packages currently excluding arches (2753) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - 90-Second-Portraits ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - GoldenCheetah ExclusiveArch: %{qt5_qtwebengine_arches} - GtkAda ExclusiveArch: %{GPRbuild_arches} - GtkAda3 ExclusiveArch: %{GPRbuild_arches} - PragmARC ExclusiveArch: %{GPRbuild_arches} - R-V8 ExclusiveArch: %{nodejs_arches} - RdRand ExclusiveArch: %{ix86} x86_64 - SLOF ExclusiveArch: ppc64le - YafaRay ExclusiveArch: %{ix86} x86_64 - aboot ExclusiveArch: alpha - acpid ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 - ahven ExclusiveArch: %{GPRbuild_arches} - alleyoop ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64 - american-fuzzy-lop ExclusiveArch: %{ix86} x86_64 - anet ExclusiveArch: %{GPRbuild_arches} - apmd ExclusiveArch: %{ix86} - appstream-generator ExclusiveArch: x86_64 %{ix86} %{arm} - arduino ExclusiveArch: %{go_arches} - arduino-builder ExclusiveArch: %{go_arches} - arm-trusted-firmware ExclusiveArch: aarch64 - aunit ExclusiveArch: %GPRbuild_arches - avgtime ExclusiveArch: %{ldc_arches} - aws ExclusiveArch: %GPRbuild_arches - banshee ExclusiveArch: %{mono_arches} - banshee-community-extensions ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x - bareftp ExclusiveArch: %{mono_arches} - bcal ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x - bcc ExclusiveArch: x86_64 %{power64} aarch64 s390x - bcm283x-firmware ExclusiveArch: %{arm} aarch64 - berusky2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} - biosdevname ExclusiveArch: %{ix86} x86_64 - bless ExclusiveArch: %mono_arches - boo ExclusiveArch: %{mono_arches} - bpftrace ExclusiveArch: x86_64 %{power64} aarch64 s390x - buildah ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x - bwa ExclusiveArch: x86_64 - caddy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}} - cadvisor ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le - calamares ExclusiveArch: %{ix86} x86_64 - carto ExclusiveArch: %{nodejs_arches} noarch - ccdciel ExclusiveArch: %{fpc_arches} - cdcollect ExclusiveArch: %{mono_arches} - chromium ExclusiveArch: x86_64 i686 ExclusiveArch: x86_64 i686 aarch64 - cjdns ExclusiveArch: %{nodejs_arches} - cmospwd ExclusiveArch: %{ix86} x86_64 - cmrt ExclusiveArch: %{ix86} x86_64 ia64 - coffee-script ExclusiveArch: %{nodejs_arches} noarch - colorful ExclusiveArch: %{fpc_arches} - compat-gcc-296 ExclusiveArch: %{ix86} ia64 ppc - consul ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - containerd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}} - containers ExclusiveArch: %{ldc_arches} - cpuid ExclusiveArch: %{ix86} x86_64 - cqrlog ExclusiveArch: %{fpc_arches} - crash ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - cri-tools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - criu ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - cryptlib ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le - cryptobone ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64 - daq ExclusiveArch: x86_64 aarch64 - darktable ExclusiveArch: x86_64 aarch64 ppc64le - dbus-sharp ExclusiveArch: %mono_arches - dbus-sharp-glib ExclusiveArch: %mono_arches - dbxtool ExclusiveArch: i386 x86_64 aarch64 - deepin-clone ExclusiveArch: x86_64 %{ix86} aarch64 - deepin-daemon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-dbus-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-gir-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - derelict ExclusiveArch: %{ldc_arches} - direnv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - discord-irc ExclusiveArch: %{nodejs_arches} noarch - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - dmtcp ExclusiveArch: %ix86 x86_64 aarch64 - docco ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - docker-anaconda-addon ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dolphin-emu ExclusiveArch: x86_64 armv7l aarch64 - douceur ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dssi-vst ExclusiveArch: %{ix86} x86_64 - dsymbol ExclusiveArch: %{ldc_arches} - dustmite ExclusiveArch: %{ldc_arches} - dyninst ExclusiveArch: %{ix86} x86_64 ppc64le - e3 ExclusiveArch: %{ix86} x86_64 - edac-utils ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - edb ExclusiveArch: %{ix86} x86_64 - edk2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: x86_64 aarch64 - efibootmgr ExclusiveArch: %{efi} - efivar ExclusiveArch: %{efi} - elasticdump ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - elk ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - embree ExclusiveArch: x86_64 - embree2 ExclusiveArch: x86_64 - envytools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - exciting ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{power64} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - exercism ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - expresso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - extlinux-bootloader ExclusiveArch: %{arm} aarch64 - fcitx-libpinyin ExclusiveArch: %{qt5_qtwebengine_arches} - fedora-dockerfiles ExclusiveArch: %{go_arches} - fedora-gnat-project-common ExclusiveArch: noarch %{GNAT_arches} - fence-virt ExclusiveArch: i686 x86_64 - fes ExclusiveArch: %{ix86} x86_64 - flannel ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - florist ExclusiveArch: %{GPRbuild_arches} - fluxcapacitor ExclusiveArch: %{ix86} x86_64 %{arm} - fpc ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 - freshmaker ExclusiveArch: %{ix86} x86_64 - frysk ExclusiveArch: %{ix86} x86_64 ppc64 - fst ExclusiveArch: i686 - fwts ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64} - fwupdate ExclusiveArch: %{efi} - ga ExclusiveArch: %{ix86} x86_64 - gbrainy ExclusiveArch: %mono_arches - gdata-sharp ExclusiveArch: %mono_arches - gdb-exploitable ExclusiveArch: x86_64 i386 ExclusiveArch: x86_64 noarch - gela-asis ExclusiveArch: %GPRbuild_arches - geoipupdate ExclusiveArch: %{go_arches} - ghdl ExclusiveArch: %{GNAT_arches} - gio-sharp ExclusiveArch: %mono_arches - gir-to-d ExclusiveArch: %{ldc_arches} - git-octopus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - giver ExclusiveArch: %{mono_arches} - gkeyfile-sharp ExclusiveArch: %mono_arches - gl3n ExclusiveArch: %{ldc_arches} - glibc32 ExclusiveArch: x86_64 ppc64 s390x - glibd ExclusiveArch: %{ldc_arches} - glusterd2 ExclusiveArch: %{go_arches} - gmqcc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - gnatcoll ExclusiveArch: %{GPRbuild_arches} - gnatcoll-bindings ExclusiveArch: %{GPRbuild_arches} - gnome-boxes ExclusiveArch: x86_64 - gnome-desktop-sharp ExclusiveArch: %mono_arches - gnome-do ExclusiveArch: %mono_arches - gnome-guitar ExclusiveArch: %{mono_arches} - gnome-keyring-sharp ExclusiveArch: %mono_arches - gnome-rdp ExclusiveArch: %{mono_arches} - gnome-sharp ExclusiveArch: %mono_arches - gnome-subtitles ExclusiveArch: %mono_arches - gnu-efi ExclusiveArch: %{efi} - go-bindata ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - go-compilers ExclusiveArch: %{go_arches} - go-i18n ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - godep ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - godotenv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang ExclusiveArch: %{golang_arches} - golang-deepin-dbus-factory ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-toml-test ExclusiveArch: %{go_arches} - golang-github-PuerkitoBio-goquery ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-purell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-urlesc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-RangelReale-osin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-RangelReale-osincli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-SeanDolphin-bqschema ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-SermoDigital-jose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-Shopify-sarama ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-andybalholm-cascadia ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-auth0-go-jwt-middleware ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bep-gitmap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bep-inflect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-client9-gospell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-codegangsta-negroni ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-danwakefield-fnmatch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dchest-cssmin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dchest-siphash ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dlclark-regexp2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-docker-libkv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-duosecurity-duo_api_golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-eknkc-amber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-flynn-go-shlex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fortytw2-leaktest ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fsouza-go-dockerclient ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fullsailor-pkcs7 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-glacjay-goini ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-errors-errors ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-macaron-inject ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gobuffalo-envy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-goraft-raft ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-css ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gosexy-gettext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hailocab-go-hostpool ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-hclog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-rootcerts ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-howeyc-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-inconshreveable-go-vhost ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-influxdb-influxdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jdkato-prose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jdkato-syllables ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jefferai-jsonx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-justinas-alice ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-klauspost-cpuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-knieriem-markdown ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kyokomi-emoji ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-lpabon-godbc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mgutz-ansi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mgutz-logxi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-michaelklishin-rabbit-hole ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-miekg-mmark ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-milochristiansen-axis2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-milochristiansen-lua ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-go-testing-interface ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-goamz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-montanaflynn-stats ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-muesli-smartcrop ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mvo5-goconfigparser ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mvo5-uboot-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-neurosnap-sentences ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-noahdesu-go-ceph ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-ojii-gettext.go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-opencontainers-specs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-openshift-go-json-rest ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-go-systemd ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-openshift-sdn ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-paulrosania-go-charset ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-prometheus-prometheus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-rackspace-gophercloud ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-rakyll-globalconf ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rakyll-pb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-rakyll-statik ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rasky-go-xdr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-remeh-sizedwaitgroup ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-samuel-go-zookeeper ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-shiena-ansicolor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shogo82148-go-shuffle ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shurcooL-sanitized_anchor_name ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-skarademir-naturalsort ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-skynetservices-skydns ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-smartystreets-go-aws-auth ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-spacejam-loghisto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-spacemonkeygo-openssl ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} ppc64le s390x} - golang-github-spaolacci-murmur3 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-fsync ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-nitro ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-sstarcher-go-okta ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stathat-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-stevvooe-resumable ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-streadway-amqp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stretchr-objx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-syndtr-gocapability ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-tent-http-link-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-tonnerre-golang-pretty ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-vaughan0-go-ini ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-vishvananda-netlink ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}} - golang-github-vishvananda-netns ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vjeantet-asn1-ber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-wsxiaoys-terminal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonpointer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonreference ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonschema ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xiang90-probing ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-xrash-smetrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-ace ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-gohtml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yvasiyarov-go-metrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-gorelic ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-newrelic_platform_go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-googlecode-gcfg ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-go-decimal-inf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-go-exp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-googlecode-log4go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-sqlite ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-uuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-go-check-check ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-go-macaroon-macaroon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-retry-v1 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-torproject-pluggable-transports-goptlib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golint ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gomtree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gotags ExclusiveArch: %{go_arches} - gotun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: x86_64 - gprbuild ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch} - gprolog ExclusiveArch: x86_64 %{ix86} ppc alpha - grafana ExclusiveArch: %{grafana_arches} - gsf-sharp ExclusiveArch: %mono_arches - gtk-sharp-beans ExclusiveArch: %mono_arches - gtk-sharp2 ExclusiveArch: %mono_arches - gtk-sharp3 ExclusiveArch: %{mono_arches} - gtkd ExclusiveArch: %{ldc_arches} - gudev-sharp ExclusiveArch: %mono_arches - hcc ExclusiveArch: x86_64 aarch64 - hedgewars ExclusiveArch: %{fpc_arches} - heketi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - hsakmt ExclusiveArch: x86_64 aarch64 - hub ExclusiveArch: %{go_arches} - hyena ExclusiveArch: %{mono_arches} - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 - icaro ExclusiveArch: %{ix86} %{arm} x86_64 noarch - ignition ExclusiveArch: x86_64 ppc64le aarch64 s390x ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - ikarus ExclusiveArch: %{ix86} - imvirt ExclusiveArch: %{ix86} x86_64 ia64 - indistarter ExclusiveArch: %{fpc_arches} - infinipath-psm ExclusiveArch: x86_64 - insect ExclusiveArch: %{nodejs_arches} noarch - intel-cmt-cat ExclusiveArch: x86_64 i686 i586 ExclusiveArch: x86_64 i686 i586 - intel-gmmlib ExclusiveArch: x86_64 i686 - ioport ExclusiveArch: %{ix86} x86_64 - ipmctl ExclusiveArch: x86_64 - ipw2100-firmware ExclusiveArch: noarch i386 x86_64 - ipw2200-firmware ExclusiveArch: noarch i386 x86_64 - ispc ExclusiveArch: %{arm} %{ix86} x86_64 - iucode-tool ExclusiveArch: %{ix86} x86_64 - iwyu ExclusiveArch: %{ix86} x86_64 - jake ExclusiveArch: %{nodejs_arches} noarch - jasmine-node ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - java-1.8.0-openjdk-aarch32 ExclusiveArch: %{arm} - josm ExclusiveArch: %{ix86} x86_64 - keepass ExclusiveArch: %{mono_arches} - kernel ExclusiveArch: %{all_x86} x86_64 s390x %{arm} aarch64 ppc64le - kicad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - knot-resolver ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - kompose ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x - kosmtik ExclusiveArch: %{nodejs_arches} noarch - kubernetes ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm} - latrace ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - lazarus ExclusiveArch: %{fpc_arches} - ldc ExclusiveArch: %{ldc_arches} - libbsr ExclusiveArch: %{power64} - libclc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - libcxl ExclusiveArch: %{power64} - libdparse ExclusiveArch: %{ldc_arches} - libflatarray ExclusiveArch: %{ix86} x86_64 - libica ExclusiveArch: s390 s390x - libipt ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - libmfx ExclusiveArch: %{ix86} x86_64 - libocxl ExclusiveArch: ppc64le - libpmemobj-cpp ExclusiveArch: x86_64 - libpsm2 ExclusiveArch: x86_64 - libquentier ExclusiveArch: %{qt5_qtwebengine_arches} - librtas ExclusiveArch: %{power64} - libseccomp ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x - libservicelog ExclusiveArch: ppc %{power64} - libsmbios ExclusiveArch: x86_64 %{ix86} - libunwind ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64 - libva-intel-hybrid-driver ExclusiveArch: %{ix86} x86_64 ia64 - libvmi ExclusiveArch: x86_64 - libvpd ExclusiveArch: %{power64} - libxsmm ExclusiveArch: x86_64 - libzfcphbaapi ExclusiveArch: s390 s390x - lodash ExclusiveArch: %{nodejs_arches} noarch - log4net ExclusiveArch: %mono_arches - lrmi ExclusiveArch: %{ix86} - lsvpd ExclusiveArch: %{power64} - luajit ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 s390x - luxcorerender ExclusiveArch: x86_64 - mactel-boot ExclusiveArch: x86_64 - manifest-tool ExclusiveArch: x86_64 aarch64 ppc64le s390x - mantle ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - matreshka ExclusiveArch: %GPRbuild_arches - maven-eclipse-plugin ExclusiveArch: %{ix86} x86_64 - maxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - mcelog ExclusiveArch: i686 x86_64 - mediaconch ExclusiveArch: %{qt5_qtwebengine_arches} - mellowplayer ExclusiveArch: %{qt5_qtwebengine_arches} - memkind ExclusiveArch: x86_64 - memtest86+ ExclusiveArch: %{ix86} x86_64 - microcode_ctl ExclusiveArch: %{ix86} x86_64 - micropython ExclusiveArch: %{arm} %{ix86} x86_64 - mine_detector ExclusiveArch: %{GPRbuild_arches} - minetest ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mingw-wine-gecko ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - mkbootdisk ExclusiveArch: %{ix86} sparc sparc64 x86_64 - mnemosyne ExclusiveArch: noarch %{qt5_qtwebengine_arches} - mocha ExclusiveArch: %{nodejs_arches} noarch - mod_mono ExclusiveArch: %mono_arches - module-build-service ExclusiveArch: %{ix86} x86_64 noarch - mokutil ExclusiveArch: %{ix86} x86_64 aarch64 - mono ExclusiveArch: %mono_arches - mono-addins ExclusiveArch: %mono_arches - mono-basic ExclusiveArch: %{mono_arches} - mono-bouncycastle ExclusiveArch: %mono_arches - mono-cecil ExclusiveArch: %mono_arches - mono-cecil-flowanalysis ExclusiveArch: %mono_arches - mono-debugger ExclusiveArch: %ix86 x86_64 - mono-reflection ExclusiveArch: %mono_arches - mono-tools ExclusiveArch: %mono_arches - mono-zeroconf ExclusiveArch: %mono_arches - monobristol ExclusiveArch: %{mono_arches} - monodevelop ExclusiveArch: %mono_arches - monodevelop-debugger-gdb ExclusiveArch: %{mono_arches} - monosim ExclusiveArch: %mono_arches - mozilla-iot-gateway ExclusiveArch: %{nodejs_arches} noarch - mozilla-iot-gateway-addon-node ExclusiveArch: %{nodejs_arches} noarch - mrrescue ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - msgpack-d ExclusiveArch: %{ldc_arches} - msr-tools ExclusiveArch: %{ix86} x86_64 - mustache-d ExclusiveArch: %{ldc_arches} - mysql-connector-net ExclusiveArch: %{mono_arches} - nacl-arm-binutils ExclusiveArch: x86_64 - nacl-binutils ExclusiveArch: x86_64 - nacl-gcc ExclusiveArch: x86_64 - nacl-newlib ExclusiveArch: x86_64 - nant ExclusiveArch: %mono_arches - nbc ExclusiveArch: %{fpc_arches} - nbdkit ExclusiveArch: x86_64 - ndesk-dbus ExclusiveArch: %{mono_arches} - ndesk-dbus-glib ExclusiveArch: %{mono_arches} - newtonsoft-json ExclusiveArch: %{mono_arches} - nim ExclusiveArch: %{nim_arches} - node-gyp ExclusiveArch: %{nodejs_arches} noarch - nodejs ExclusiveArch: %{nodejs_arches} - nodejs-Base64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-abbrev ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-dynamic-import ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn-jsx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-object-spread ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-add-stream ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-after ExclusiveArch: %{nodejs_arches} noarch - nodejs-agentkeepalive ExclusiveArch: %{nodejs_arches} noarch - nodejs-ain2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-align-text ExclusiveArch: %{nodejs_arches} noarch - nodejs-alter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblack ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgcyan ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bggreen ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgmagenta ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgred ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgwhite ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgyellow ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-black ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-blue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bold ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-cyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-dim ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-escapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-font ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-gray ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-green ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-grey ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-hidden ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-inverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-italic ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-magenta ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-red ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-reset ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-strikethrough ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-styles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-underline ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-white ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-wrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-yellow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansicolors ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansidiff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansistyles ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ap ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-field ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-archiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-archiver-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-archy ExclusiveArch: %{nodejs_arches} noarch - nodejs-are-we-there-yet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-argparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-argsparser ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-exclude ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-union ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-buffer-from-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-differ ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-find ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-find-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-foreach ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-ify ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-union ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-uniq ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-unique ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arraybuffer-dot-slice ExclusiveArch: %{nodejs_arches} noarch - nodejs-arraybuffer-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-arrify ExclusiveArch: %{nodejs_arches} noarch - nodejs-asap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ascii-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-ascli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-asn1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-assert-plus ExclusiveArch: %{nodejs_arches} noarch - nodejs-assertion-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-assume ExclusiveArch: %{nodejs_arches} noarch - nodejs-ast-traverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ast-types ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-astral ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-angular-annotate ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-pass ExclusiveArch: %{nodejs_arches} noarch - nodejs-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-async-arrays ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-limiter ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-queue ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-some ExclusiveArch: %{nodejs_arches} noarch - nodejs-asynckit ExclusiveArch: %{nodejs_arches} noarch - nodejs-atob ExclusiveArch: %{nodejs_arches} noarch - nodejs-auto-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-autoresolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-ava-init ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-aws-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws-sign2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-code-frame ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-messages ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-plugin-syntax-async-functions ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-plugin-syntax-async-generators ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-runtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-babylon ExclusiveArch: %{nodejs_arches} noarch - nodejs-backbone ExclusiveArch: %{nodejs_arches} noarch - nodejs-backoff ExclusiveArch: %{nodejs_arches} noarch - nodejs-balanced-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-option ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-plugins ExclusiveArch: %{nodejs_arches} noarch - nodejs-base32-encode ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-arraybuffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64id ExclusiveArch: %{nodejs_arches} noarch - nodejs-bash-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-basic-auth-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-batch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bcrypt ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-bcryptjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-beeper ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-benchmark ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-than-before ExclusiveArch: %{nodejs_arches} noarch - nodejs-bignumber-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-bind-obj-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-bindings ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bit-mask ExclusiveArch: %{nodejs_arches} noarch - nodejs-bl ExclusiveArch: %{nodejs_arches} noarch - nodejs-blob ExclusiveArch: %{nodejs_arches} noarch - nodejs-block-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-bluebird ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-body-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-boolbase ExclusiveArch: %{nodejs_arches} noarch - nodejs-boom ExclusiveArch: %{nodejs_arches} noarch - nodejs-brace-expansion ExclusiveArch: %{nodejs_arches} noarch - nodejs-braces ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-breakable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-browser-stdout ExclusiveArch: %{nodejs_arches} noarch - nodejs-bson ExclusiveArch: %{nodejs_arches} noarch - nodejs-buble ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buf-compare ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-crc32 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-buffertools ExclusiveArch: %{nodejs_arches} - nodejs-bufferutil ExclusiveArch: %{nodejs_arches} - nodejs-builtin-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-builtins ExclusiveArch: %{nodejs_arches} noarch - nodejs-bundle-dependencies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-burrito ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-busboy ExclusiveArch: %{nodejs_arches} noarch - nodejs-byline ExclusiveArch: %{nodejs_arches} noarch - nodejs-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cache-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-caching-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-call-delayed ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-matcher ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-me-maybe ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-callback-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsites ExclusiveArch: %{nodejs_arches} noarch - nodejs-camel-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-caniuse-db ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-carrier ExclusiveArch: %{nodejs_arches} noarch - nodejs-caseless ExclusiveArch: %{nodejs_arches} noarch - nodejs-center-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-as-promised ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-cheerio ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-connect-middleware ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-json-schema ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-oauth2orize-grant ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-spies-next ExclusiveArch: %{nodejs_arches} noarch - nodejs-chainer ExclusiveArch: %{nodejs_arches} noarch - nodejs-chalk ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-change-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-char-spinner ExclusiveArch: %{nodejs_arches} noarch - nodejs-character-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-chardet ExclusiveArch: %{nodejs_arches} noarch - nodejs-charenc ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-charm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-check-env ExclusiveArch: %{nodejs_arches} noarch - nodejs-check-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-cheerio ExclusiveArch: %{nodejs_arches} noarch - nodejs-child-process-close ExclusiveArch: %{nodejs_arches} noarch - nodejs-chmodr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chownr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chroma-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-chrono ExclusiveArch: %{nodejs_arches} noarch - nodejs-ci-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-circular-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-cjson ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-class-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-clean-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clean-yaml-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clear-require ExclusiveArch: %{nodejs_arches} noarch - nodejs-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-spinner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-cliui ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-stats ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-closure-compiler ExclusiveArch: %{nodejs_arches} noarch - nodejs-cls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cmd-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-co ExclusiveArch: %{nodejs_arches} noarch - nodejs-co-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-co-with-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coa ExclusiveArch: %{nodejs_arches} noarch - nodejs-code-point-at ExclusiveArch: %{nodejs_arches} noarch - nodejs-codemirror ExclusiveArch: %{nodejs_arches} noarch - nodejs-coffee-coverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-collection-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-collections ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-color-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-colour ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-columnify ExclusiveArch: %{nodejs_arches} noarch - nodejs-combined-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-commander ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-common-path-prefix ExclusiveArch: %{nodejs_arches} noarch - nodejs-commondir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-commoner ExclusiveArch: %{nodejs_arches} noarch - nodejs-commonmark ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compare-func ExclusiveArch: %{nodejs_arches} noarch - nodejs-compare-versions ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-emitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-inherit ExclusiveArch: %{nodejs_arches} noarch - nodejs-compress-commons ExclusiveArch: %{nodejs_arches} noarch - nodejs-compressible ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compression ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-map ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-config-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-livereload ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-console-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-console-dot-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-console-group ExclusiveArch: %{nodejs_arches} noarch - nodejs-consolemd ExclusiveArch: %{nodejs_arches} noarch - nodejs-constant-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-constantinople ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-disposition ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-conventional-changelog-angular ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-atom ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-codemirror ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-core ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-conventional-changelog-ember ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-eslint ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-express ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-jquery ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-jscs ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-jshint ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-preset-loader ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-filter ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-recommended-bump ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-hex ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-jar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookiejar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-copy-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-core-assert ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-util-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-couch-login ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coveralls ExclusiveArch: %{nodejs_arches} noarch - nodejs-crc ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crc32-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-cross-spawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cross-spawn-async ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crypt ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cryptiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-csrf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-select ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-what ExclusiveArch: %{nodejs_arches} noarch - nodejs-csscomb-core ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cssom ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csurf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-generate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-spectrum ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ctype ExclusiveArch: %{nodejs_arches} noarch - nodejs-currently-unhandled ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cycle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cyclist ExclusiveArch: %{nodejs_arches} noarch - nodejs-d ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dargs ExclusiveArch: %{nodejs_arches} noarch - nodejs-dashdash ExclusiveArch: %{nodejs_arches} noarch - nodejs-data-uri-to-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-date-now ExclusiveArch: %{nodejs_arches} noarch - nodejs-dateformat ExclusiveArch: %{nodejs_arches} noarch - nodejs-death ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-debug-fabulous ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-debuglog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-decamelize ExclusiveArch: %{nodejs_arches} noarch - nodejs-decamelize-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-decimal-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-dedent ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-eql ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deep-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-default-require-extensions ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-default-resolution ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defaults ExclusiveArch: %{nodejs_arches} noarch - nodejs-defence ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defence-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-properties ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-defined ExclusiveArch: %{nodejs_arches} noarch - nodejs-defs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-degenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-del ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delayed-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-delegates ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delete ExclusiveArch: %{nodejs_arches} noarch - nodejs-dep-graph ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-depd ExclusiveArch: %{nodejs_arches} noarch - nodejs-deprecated ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-newline ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-detective ExclusiveArch: %{nodejs_arches} noarch - nodejs-dezalgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-dicer ExclusiveArch: %{nodejs_arches} noarch - nodejs-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dirty-chai ExclusiveArch: %{nodejs_arches} noarch - nodejs-discord-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-docopt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-doctrine ExclusiveArch: %{nodejs_arches} noarch - nodejs-dom-serializer ExclusiveArch: %{nodejs_arches} noarch - nodejs-domelementtype ExclusiveArch: %{nodejs_arches} noarch - nodejs-domhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-domutils ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-prop ExclusiveArch: %{nodejs_arches} noarch - nodejs-dotfile-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dreamopt ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-dryice ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-duplexer ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexer2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-duplexify ExclusiveArch: %{nodejs_arches} noarch - nodejs-duration ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-ebnf-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-echomd ExclusiveArch: %{nodejs_arches} noarch - nodejs-editor ExclusiveArch: %{nodejs_arches} noarch - nodejs-ee-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-ejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-emojione ExclusiveArch: %{nodejs_arches} noarch - nodejs-empty-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-encodeurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-end-of-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-client ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-entities ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-ex ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-errorhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-abstract ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-to-primitive ExclusiveArch: %{nodejs_arches} noarch - nodejs-es5-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es5-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-iterator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-promisify ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-set ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escallmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-html ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-regexp-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escape-string-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-escodegen ExclusiveArch: %{nodejs_arches} noarch - nodejs-escope ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower-location-detector ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-fb ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-harmony-jscs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espurify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esrecurse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse-fb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estree-walker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esutils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-etag ExclusiveArch: %{nodejs_arches} noarch - nodejs-event-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-eventemitter2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-events-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-everything-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-execa ExclusiveArch: %{nodejs_arches} noarch - nodejs-exit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-brackets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-tilde ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extended-emitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extsprintf ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-eyes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fake ExclusiveArch: %{nodejs_arches} noarch - nodejs-fancy-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-far ExclusiveArch: %{nodejs_arches} noarch - nodejs-fast-levenshtein ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fastfall ExclusiveArch: %{nodejs_arches} noarch - nodejs-faucet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-faye-websocket ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fd ExclusiveArch: %{nodejs_arches} noarch - nodejs-fg-lodash ExclusiveArch: %{nodejs_arches} noarch - nodejs-figures ExclusiveArch: %{nodejs_arches} noarch - nodejs-file-entry-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-sync-cmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-uri-to-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-filelist ExclusiveArch: %{nodejs_arches} noarch - nodejs-filename-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fileset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fill-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-fill-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-finalhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-find-cache-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-find-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-findup-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-first-chunk-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flagged-respawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flat-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flot ExclusiveArch: %{nodejs_arches} noarch - nodejs-flush-write-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fmix ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-dot-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-follow-redirects ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-in ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-for-own ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-foreach ExclusiveArch: %{nodejs_arches} noarch - nodejs-foreground-child ExclusiveArch: %{nodejs_arches} noarch - nodejs-forever-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-form-data ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-formatio ExclusiveArch: %{nodejs_arches} noarch - nodejs-formidable ExclusiveArch: %{nodejs_arches} noarch - nodejs-forwarded ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fragment-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-freetree ExclusiveArch: %{nodejs_arches} noarch - nodejs-fresh ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-dot-notify ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-cached ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fs-ext ExclusiveArch: %{nodejs_arches} - nodejs-fs-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-temp ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-vacuum ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-write-stream-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-ignore ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-npm ExclusiveArch: %{nodejs_arches} noarch - nodejs-ftp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-function-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-function-loop ExclusiveArch: %{nodejs_arches} noarch - nodejs-gauge ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gaze ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gdal ExclusiveArch: %{nodejs_arches} - nodejs-generate-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-generate-object-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-generic-pool ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-pkg-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-stdin ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-uri ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-getobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-git-dummy-commit ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-raw-commits ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-remote-origin-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-semver-tags ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-tails ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gitconfiglocal ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-username-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob-base ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-expand ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-parent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-to-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-global-modules ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-global-prefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globby ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globule ExclusiveArch: %{nodejs_arches} noarch - nodejs-glogg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gnode ExclusiveArch: %{nodejs_arches} noarch - nodejs-gonzales-pe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-graceful-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-graceful-readlink ExclusiveArch: %{nodejs_arches} noarch - nodejs-grip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-growl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-angular-templates ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-banner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-cli ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-compare-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-clean ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-concat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-cssmin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-htmlmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-internal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-less ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-requirejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-uglify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-watch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-git-authors ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-init ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-known-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-lib-contrib ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-sed ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-simple-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-process ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-gulp-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulp-ng-classify ExclusiveArch: %{nodejs_arches} noarch - nodejs-gulp-util ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gzip-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-handle-thing ExclusiveArch: %{nodejs_arches} noarch - nodejs-handlebars ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-har-validator ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-has ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-flag ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-symbols ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-unicode ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-yarn ExclusiveArch: %{nodejs_arches} noarch - nodejs-hash_file ExclusiveArch: %{nodejs_arches} noarch - nodejs-hawk ExclusiveArch: %{nodejs_arches} noarch - nodejs-heap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hex-to-array-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-highlight-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-historic-readline ExclusiveArch: %{nodejs_arches} noarch - nodejs-hock ExclusiveArch: %{nodejs_arches} noarch - nodejs-hoek ExclusiveArch: %{nodejs_arches} noarch - nodejs-homedir-polyfill ExclusiveArch: %{nodejs_arches} noarch - nodejs-hook-std ExclusiveArch: %{nodejs_arches} noarch - nodejs-hooker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hosted-git-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-hsluv ExclusiveArch: %{nodejs_arches} noarch - nodejs-html-minifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-htmlparser2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-deceiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-errors ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-http-signature ExclusiveArch: %{nodejs_arches} noarch - nodejs-http2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-https-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-humanize-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-i ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-i18n-transform ExclusiveArch: %{nodejs_arches} noarch - nodejs-i2c ExclusiveArch: %{nodejs_arches} - nodejs-iconv ExclusiveArch: %{nodejs_arches} - nodejs-iconv-lite ExclusiveArch: %{nodejs_arches} noarch - nodejs-iferr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ignore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-image-size ExclusiveArch: %{nodejs_arches} noarch - nodejs-immutable ExclusiveArch: %{nodejs_arches} noarch - nodejs-import-local ExclusiveArch: %{nodejs_arches} noarch - nodejs-imul ExclusiveArch: %{nodejs_arches} noarch - nodejs-imurmurhash ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-indent-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-inflight ExclusiveArch: %{nodejs_arches} noarch - nodejs-info-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-inherits ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherits1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-ini ExclusiveArch: %{nodejs_arches} noarch - nodejs-init-package-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-inline-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-install ExclusiveArch: %{nodejs_arches} noarch - nodejs-int64-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-intercept-require ExclusiveArch: %{nodejs_arches} noarch - nodejs-interpret ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-invert-kv ExclusiveArch: %{nodejs_arches} noarch - nodejs-ip ExclusiveArch: %{nodejs_arches} noarch - nodejs-ipaddr-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-irc-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-irc-formatting ExclusiveArch: %{nodejs_arches} noarch - nodejs-irc-upd ExclusiveArch: %{nodejs_arches} noarch - nodejs-irregular-plurals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-absolute ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-accessor-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrayish ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrow-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-boolean-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-builtin-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-callable ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-data-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-date-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-dotfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-equal-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-extendable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-finite ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-fullwidth-code-point ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-generator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-my-json-valid ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-negated-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-number ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-number-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-odd ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-path-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-in-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-inside ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-plain-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-plain-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-primitive ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-registered ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-relative ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-subset ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-text-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-typedarray ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-unc-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-valid-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-valid-instance ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-windows ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isarray ExclusiveArch: %{nodejs_arches} noarch - nodejs-isexe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-iso8601 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isodate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-coverage ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-hook ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-report ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-source-maps ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-reports ExclusiveArch: %{nodejs_arches} noarch - nodejs-jade ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-growl-reporter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-reporters ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jest-mock ExclusiveArch: %{nodejs_arches} noarch - nodejs-jison ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jison-lex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jju ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joose ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-namespace-depended ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-simplerequest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-base64 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-string-escape ExclusiveArch: %{nodejs_arches} noarch - nodejs-js-tokens ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-yaml ExclusiveArch: %{nodejs_arches} noarch - nodejs-jschardet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jscoverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jshint ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-localizer ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-parse-helpfulerror ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stable-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stringify-safe ExclusiveArch: %{nodejs_arches} noarch - nodejs-json3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonm ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonpointer ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonpointer-dot-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonselect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jwt-simple ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keep-alive-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-keygrip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keypress ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-kind-of ExclusiveArch: %{nodejs_arches} noarch - nodejs-klaw ExclusiveArch: %{nodejs_arches} noarch - nodejs-kuler2gpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-latest-version ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazy-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazystream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lcid ExclusiveArch: %{nodejs_arches} noarch - nodejs-lcov-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-leaflet ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-formbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-hash ExclusiveArch: %{nodejs_arches} noarch - nodejs-leche ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-left-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-less ExclusiveArch: %{nodejs_arches} noarch - nodejs-less-plugin-clean-css ExclusiveArch: %{nodejs_arches} noarch - nodejs-levn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lex-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-libpq ExclusiveArch: %{nodejs_arches} - nodejs-libxmljs ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-line-numbers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-line-reader ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linkify-it ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-grunt-tasks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-locate-character ExclusiveArch: %{nodejs_arches} noarch - nodejs-locate-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-lockfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-log-driver ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-ok ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-symbols ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-lolex ExclusiveArch: %{nodejs_arches} noarch - nodejs-long ExclusiveArch: %{nodejs_arches} noarch - nodejs-longest ExclusiveArch: %{nodejs_arches} noarch - nodejs-loophole ExclusiveArch: %{nodejs_arches} noarch - nodejs-loud-rejection ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-lower-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ltx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-magic-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-make-arrow-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-generator-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-makedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-makeerror ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik ExclusiveArch: %{nodejs_arches} - nodejs-mapnik-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik-vector-tile ExclusiveArch: %{nodejs_arches} noarch - nodejs-markdown ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-markdown-it-testgen ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-matched ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-max-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-maxmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mbtiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-md5 ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-hex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-o-matic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mdn-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-mdurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-media-typer ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoizee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-memwatch-next ExclusiveArch: %{nodejs_arches} - nodejs-meow ExclusiveArch: %{nodejs_arches} noarch - nodejs-merge-descriptors ExclusiveArch: %{nodejs_arches} noarch - nodejs-merge-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-metascript ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-method-override ExclusiveArch: %{nodejs_arches} noarch - nodejs-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-micromatch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-millstone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mime-db ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-mimeparse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minimalistic-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minimist-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-minipass ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkfiletree ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-bin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-modify-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-module-not-found-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-moment ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-moment-timezone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb-core ExclusiveArch: %{nodejs_arches} noarch - nodejs-monocle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-morgan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-muffin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiline ExclusiveArch: %{nodejs_arches} noarch - nodejs-multimatch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiparty ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multipipe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-murmur-32 ExclusiveArch: %{nodejs_arches} noarch - nodejs-mustache ExclusiveArch: %{nodejs_arches} noarch - nodejs-mutate-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-mute-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-mv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mysql ExclusiveArch: %{nodejs_arches} noarch - nodejs-mz ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-nan0 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-nanomatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-nanomsg ExclusiveArch: %{nodejs_arches} - nodejs-nanoseconds ExclusiveArch: %{nodejs_arches} noarch - nodejs-ncp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-needle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-negative-zero ExclusiveArch: %{nodejs_arches} noarch - nodejs-negotiator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-net-browserify-alt ExclusiveArch: %{nodejs_arches} noarch - nodejs-netmask ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-next ExclusiveArch: %{nodejs_arches} noarch - nodejs-next-tick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ng-classify ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-expat ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-node-int64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-static ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-stringprep ExclusiveArch: %{nodejs_arches} - nodejs-node-uuid ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nomnom ExclusiveArch: %{nodejs_arches} noarch - nodejs-noncharacters ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt-usage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-noptify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-normalize-git-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-package-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-cache-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-install-checks ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-package-arg ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-registry-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-run-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-user-validate ExclusiveArch: %{nodejs_arches} noarch - nodejs-npmlog ExclusiveArch: %{nodejs_arches} noarch - nodejs-nth-check ExclusiveArch: %{nodejs_arches} noarch - nodejs-number-is-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-numeral ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth2orize ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-assign ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-dot-assign ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-dot-entries ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-omit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-pick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-inspect ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-observable-to-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-obuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-okay ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-finished ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-headers ExclusiveArch: %{nodejs_arches} noarch - nodejs-once ExclusiveArch: %{nodejs_arches} noarch - nodejs-onetime ExclusiveArch: %{nodejs_arches} noarch - nodejs-only-shallow ExclusiveArch: %{nodejs_arches} noarch - nodejs-oop ExclusiveArch: %{nodejs_arches} noarch - nodejs-opal-runtime ExclusiveArch: %{nodejs_arches} noarch - nodejs-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opener ExclusiveArch: %{nodejs_arches} noarch - nodejs-opn ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-optionator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-optjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opts ExclusiveArch: %{nodejs_arches} noarch - nodejs-orchestrator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ordered-read-streams ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-os-homedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-locale ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-tmpdir ExclusiveArch: %{nodejs_arches} noarch - nodejs-osenv ExclusiveArch: %{nodejs_arches} noarch - nodejs-output-file-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-own-or ExclusiveArch: %{nodejs_arches} noarch - nodejs-own-or-env ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-finally ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-locate ExclusiveArch: %{nodejs_arches} noarch - nodejs-pac-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pac-resolver ExclusiveArch: %{nodejs_arches} noarch - nodejs-package ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-packaging ExclusiveArch: %{nodejs_arches} noarch - nodejs-packet-reader ExclusiveArch: %{nodejs_arches} noarch - nodejs-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pad-left ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-paperboy ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parallel-transform ExclusiveArch: %{nodejs_arches} noarch - nodejs-param-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-github-repo-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parse-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-passwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-parsejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseqs ExclusiveArch: %{nodejs_arches} noarch - nodejs-parserlib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parseuri ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pascal-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-pascalcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-http-bearer ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2-client-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-array ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-dirname ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-exists ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-absolute ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-inside ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-key ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-parse ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-to-regexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-path2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pathval ExclusiveArch: %{nodejs_arches} noarch - nodejs-pause ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pbkdf2-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-pedding ExclusiveArch: %{nodejs_arches} noarch - nodejs-pend ExclusiveArch: %{nodejs_arches} noarch - nodejs-pff ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-connection-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-cursor ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-escape ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-int8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-native ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-pgpass ExclusiveArch: %{nodejs_arches} noarch - nodejs-pify ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkg-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkginfo ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-platform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-plur ExclusiveArch: %{nodejs_arches} noarch - nodejs-portscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-posix-character-classes ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-bytea ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-date ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-interval ExclusiveArch: %{nodejs_arches} noarch - nodejs-precond ExclusiveArch: %{nodejs_arches} noarch - nodejs-prelude-ls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-preserve ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-hrtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-pretty-time ExclusiveArch: %{nodejs_arches} noarch - nodejs-prism-media ExclusiveArch: %{nodejs_arches} noarch - nodejs-private ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-process-nextick-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-proclaim ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promises-aplus-tests ExclusiveArch: %{nodejs_arches} noarch - nodejs-prompt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promzard ExclusiveArch: %{nodejs_arches} noarch - nodejs-propagate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-propget ExclusiveArch: %{nodejs_arches} noarch - nodejs-proto-list ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy-addr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proxyquire ExclusiveArch: %{nodejs_arches} noarch - nodejs-pruddy-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-pseudomap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pubcontrol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pump ExclusiveArch: %{nodejs_arches} noarch - nodejs-pumpify ExclusiveArch: %{nodejs_arches} noarch - nodejs-q ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-q-io ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qs ExclusiveArch: %{nodejs_arches} noarch - nodejs-qtdatastream ExclusiveArch: %{nodejs_arches} noarch - nodejs-queue-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-quick-lru ExclusiveArch: %{nodejs_arches} noarch - nodejs-qunit-extras ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qunitjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-rainbowsocks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-random-bytes ExclusiveArch: %{nodejs_arches} noarch - nodejs-random-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-randomatic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-range-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-raw-body ExclusiveArch: %{nodejs_arches} noarch - nodejs-re-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-all-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-cmd-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-dir-files ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-installed ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-json-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-readable-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-readdir-enhanced ExclusiveArch: %{nodejs_arches} noarch - nodejs-readdir-scoped-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-readdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-realize-package-specifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-recast ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rechoir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-redent ExclusiveArch: %{nodejs_arches} noarch - nodejs-reduce-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-regex-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regex-not ExclusiveArch: %{nodejs_arches} noarch - nodejs-relateurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-remove-trailing-separator ExclusiveArch: %{nodejs_arches} noarch - nodejs-repeat-element ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeat-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeating ExclusiveArch: %{nodejs_arches} noarch - nodejs-repl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace-require-self ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-request ExclusiveArch: %{nodejs_arches} noarch - nodejs-requestretry ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-cs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-require-directory ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-inject ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-main-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-relative ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-uncached ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-yaml ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-requirejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-cwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-pkg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-response-time ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resumer ExclusiveArch: %{nodejs_arches} noarch - nodejs-ret ExclusiveArch: %{nodejs_arches} noarch - nodejs-retry ExclusiveArch: %{nodejs_arches} noarch - nodejs-reusify ExclusiveArch: %{nodejs_arches} noarch - nodejs-revalidator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rewire ExclusiveArch: %{nodejs_arches} noarch - nodejs-rfile ExclusiveArch: %{nodejs_arches} noarch - nodejs-rhea ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-right-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-rimraf ExclusiveArch: %{nodejs_arches} noarch - nodejs-rndm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rollup ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rollup-plugin-buble ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-commonjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-node-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-pluginutils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ronn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-run-parallel-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-runforcover ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safe-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-safe-json-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safe-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-safecb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-samsam ExclusiveArch: %{nodejs_arches} noarch - nodejs-sauce-tunnel ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sax ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-scmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-secure-random ExclusiveArch: %{nodejs_arches} noarch - nodejs-seedrandom ExclusiveArch: %{nodejs_arches} noarch - nodejs-select-hose ExclusiveArch: %{nodejs_arches} noarch - nodejs-semver ExclusiveArch: %{nodejs_arches} noarch - nodejs-send ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sentence-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-sentiment ExclusiveArch: %{nodejs_arches} noarch - nodejs-sequencify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serialize-error ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-static ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-server-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-blocking ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-getter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-set-immediate ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-immediate-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-setimmediate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-setprototypeof ExclusiveArch: %{nodejs_arches} noarch - nodejs-sha ExclusiveArch: %{nodejs_arches} noarch - nodejs-shallow-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-command ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-shelljs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-shelljs-nodecli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-format ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-http ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-showdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-sift ExclusiveArch: %{nodejs_arches} noarch - nodejs-sigmund ExclusiveArch: %{nodejs_arches} noarch - nodejs-signal-exit ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-asyncify ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-fmt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-single-line-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon-chai ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sinon-restore ExclusiveArch: %{nodejs_arches} noarch - nodejs-slash ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sliced ExclusiveArch: %{nodejs_arches} noarch - nodejs-slide ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-smart-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-snake-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture-set ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-snekfetch ExclusiveArch: %{nodejs_arches} noarch - nodejs-snockets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sntp ExclusiveArch: %{nodejs_arches} noarch - nodejs-socket-dot-io-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-socks-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-socks-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sort-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-sorted-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-fixtures ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-sparkles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-spawn-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-spawn-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-correct ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-exceptions ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-license-ids ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-speedometer ExclusiveArch: %{nodejs_arches} noarch - nodejs-split ExclusiveArch: %{nodejs_arches} noarch - nodejs-split-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-split2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-sqlite3 ExclusiveArch: %{nodejs_arches} - nodejs-srs ExclusiveArch: %{nodejs_arches} noarch - nodejs-ssri ExclusiveArch: %{nodejs_arches} noarch - nodejs-st ExclusiveArch: %{nodejs_arches} noarch - nodejs-stable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-trace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-utils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-static-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-static-favicon ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-statuses ExclusiveArch: %{nodejs_arches} noarch - nodejs-std-mocks ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-combiner ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-consume ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-counter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-pair ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-replace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-shift ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-spigot ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-streamsearch ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamsink ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamtest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-repeat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-trim ExclusiveArch: %{nodejs_arches} noarch - nodejs-string-width ExclusiveArch: %{nodejs_arches} noarch - nodejs-string_decoder ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringmap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-ansi ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-bom-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-color ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-eof ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-json-comments ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strong-log-transformer ExclusiveArch: %{nodejs_arches} noarch - nodejs-stylus ExclusiveArch: %{nodejs_arches} noarch - nodejs-success-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-superagent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-supertest ExclusiveArch: %{nodejs_arches} noarch - nodejs-supervisor ExclusiveArch: %{nodejs_arches} noarch - nodejs-supports-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-suspend ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-swap-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-symbol-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-mocha-reporter ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-out ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-spec ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tape ExclusiveArch: %{nodejs_arches} noarch - nodejs-tapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-pack ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp-write ExclusiveArch: %{nodejs_arches} noarch - nodejs-tempfile ExclusiveArch: %{nodejs_arches} noarch - nodejs-temporary ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-cordovajs ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-liferay ExclusiveArch: %{nodejs_arches} noarch - nodejs-terst ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-test-exclude ExclusiveArch: %{nodejs_arches} noarch - nodejs-testdata-w3c-json-form ExclusiveArch: %{nodejs_arches} noarch - nodejs-testjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testswarm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testutil ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-extensions ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-thenify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thenify-all ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-through ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-through2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-through2-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thunkify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tildify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tilejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive-mapnik ExclusiveArch: %{nodejs_arches} noarch - nodejs-tiletype ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-diff ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-stamp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-timekeeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-timers-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tiny-lr-fork ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tippex ExclusiveArch: %{nodejs_arches} noarch - nodejs-title-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-tlds ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmp ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-absolute-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-object-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-regex-range ExclusiveArch: %{nodejs_arches} noarch - nodejs-touch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tough-cookie ExclusiveArch: %{nodejs_arches} noarch - nodejs-tracejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-transformers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-traverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-treeify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tressa ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-trim-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim-off-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trivial-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-try-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-try-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-tryor ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tsame ExclusiveArch: %{nodejs_arches} noarch - nodejs-tslib ExclusiveArch: %{nodejs_arches} noarch - nodejs-tsscmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tunnel-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-tv4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-tweetnacl ExclusiveArch: %{nodejs_arches} noarch - nodejs-tweetnacl-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-check ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-type-detect ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-name ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-typeahead.js ExclusiveArch: %{nodejs_arches} noarch - nodejs-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-uc-dot-micro ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uglify-to-browserify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid-number ExclusiveArch: %{nodejs_arches} noarch - nodejs-uid-safe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ultron ExclusiveArch: %{nodejs_arches} noarch - nodejs-umask ExclusiveArch: %{nodejs_arches} noarch - nodejs-unc-path-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore-dot-logger ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unicode-length ExclusiveArch: %{nodejs_arches} noarch - nodejs-union-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-unique-filename ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-slug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-unpipe ExclusiveArch: %{nodejs_arches} noarch - nodejs-unset-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-uri-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-urix ExclusiveArch: %{nodejs_arches} noarch - nodejs-url2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-use ExclusiveArch: %{nodejs_arches} noarch - nodejs-user-home ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-utfx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-deprecate ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-inspect ExclusiveArch: %{nodejs_arches} noarch - nodejs-utile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utilities ExclusiveArch: %{nodejs_arches} noarch - nodejs-utils-merge ExclusiveArch: %{nodejs_arches} noarch - nodejs-uuid ExclusiveArch: %{nodejs_arches} noarch - nodejs-vali-date ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-validate-npm-package-license ExclusiveArch: %{nodejs_arches} noarch - nodejs-validate-npm-package-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-vary ExclusiveArch: %{nodejs_arches} noarch - nodejs-vasync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-verror ExclusiveArch: %{nodejs_arches} noarch - nodejs-vhost ExclusiveArch: %{nodejs_arches} noarch - nodejs-vinyl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vlq ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-vow-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vows ExclusiveArch: %{nodejs_arches} noarch - nodejs-walkdir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-walker ExclusiveArch: %{nodejs_arches} noarch - nodejs-ware ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-warning-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-watchit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-watershed ExclusiveArch: %{nodejs_arches} noarch - nodejs-wbuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-wcwidth ExclusiveArch: %{nodejs_arches} noarch - nodejs-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-websocket-driver ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-when ExclusiveArch: %{nodejs_arches} noarch - nodejs-whet-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-which ExclusiveArch: %{nodejs_arches} noarch - nodejs-win-spawn ExclusiveArch: %{nodejs_arches} noarch - nodejs-window-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-winston ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-with ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wolfy87-eventemitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-woothee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wordwrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrap-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-wrap-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrappy ExclusiveArch: %{nodejs_arches} noarch - nodejs-write ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-write-file-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-ws ExclusiveArch: %{nodejs_arches} noarch - nodejs-xdg-basedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-xml2js ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlhttprequest ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlhttprequest-ssl ExclusiveArch: %{nodejs_arches} noarch - nodejs-xregexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-xtend ExclusiveArch: %{nodejs_arches} noarch - nodejs-y18n ExclusiveArch: %{nodejs_arches} noarch - nodejs-yallist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yapool ExclusiveArch: %{nodejs_arches} noarch - nodejs-yargs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yargs-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-yarn ExclusiveArch: %{nodejs_arches} noarch - nodejs-yeast ExclusiveArch: %{nodejs_arches} noarch - nodejs-yn ExclusiveArch: %{nodejs_arches} noarch - nodejs-zap ExclusiveArch: %{nodejs_arches} noarch - nodejs-zeropad ExclusiveArch: %{nodejs_arches} noarch - nodejs-zip-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-zipfile ExclusiveArch: %{nodejs_arches} - nodejs-zlib-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-zlibjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - notify-sharp ExclusiveArch: %{mono_arches} - notify-sharp3 ExclusiveArch: %{mono_arches} - nuget ExclusiveArch: %{mono_arches} - numatop ExclusiveArch: x86_64 ppc64le - nunit ExclusiveArch: %{mono_arches} - nunit2 ExclusiveArch: %{mono_arches} - nvml ExclusiveArch: x86_64 - nwchem ExclusiveArch: x86_64 %{ix86} - obfs4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-kvm-hook ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-register-machine ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - oci-umount ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - ocitools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - oidn ExclusiveArch: x86_64 - olpc-kbdshim ExclusiveArch: %{ix86} %{arm} - olpc-netutils ExclusiveArch: %{ix86} %{arm} - olpc-powerd ExclusiveArch: %{ix86} %{arm} - olpc-utils ExclusiveArch: %{ix86} %{arm} - onedrive ExclusiveArch: %{ldc_arches} - opal-prd ExclusiveArch: ppc64le - open-vm-tools ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 - openblas ExclusiveArch: %{openblas_arches} - openjfx ExclusiveArch: %{ix86} x86_64 - openlibm ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64} - openni ExclusiveArch: %{ix86} x86_64 %{arm} - openni-primesense ExclusiveArch: %{ix86} x86_64 %{arm} - openssl-ibmca ExclusiveArch: s390 s390x - origin ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - orion ExclusiveArch: %{qt5_qtwebengine_arches} - orthorobot ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - oshinko-cli ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - paflib ExclusiveArch: ppc %{power64} - pcc ExclusiveArch: %{ix86} x86_64 - pcmciautils ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} - pdfmod ExclusiveArch: %mono_arches - peripety ExclusiveArch: %{rust_arches} - perl-Dumbbench ExclusiveArch: %{ix86} x86_64 noarch - perl-Parse-DMIDecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - pesign ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm} - pesign-test-app ExclusiveArch: i686 x86_64 ia64 aarch64 - pinta ExclusiveArch: %mono_arches - pioneer ExclusiveArch: %{ix86} x86_64 - playonlinux ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - pmdk-convert ExclusiveArch: x86_64 - pocl ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - podman ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 - poppler-sharp ExclusiveArch: %mono_arches - popub ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - powerpc-utils ExclusiveArch: ppc %{power64} - ppc64-diag ExclusiveArch: ppc %{power64} - publican-jboss ExclusiveArch: i686 x86_64 - pvs-sbcl ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - pyqtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - python-etcd ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - python-healpy ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-openoffice ExclusiveArch: noarch x86_64 - python-pymoc ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-rpi-gpio ExclusiveArch: %{arm} aarch64 - q4wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - qcint ExclusiveArch: x86_64 - qclib ExclusiveArch: s390 s390x - qevercloud ExclusiveArch: %{qt5_qtwebengine_arches} - qmapshack ExclusiveArch: %{qt5_qtwebengine_arches} - qt4pas ExclusiveArch: %{fpc_arches} - qt5-qtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - quantum-espresso ExclusiveArch: x86_64 %{ix86} ExclusiveArch: %{openblas_arches} - quentier ExclusiveArch: %{qt5_qtwebengine_arches} - reactfx ExclusiveArch: %{ix86} x86_64 noarch - rear ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 - redhat-lsb ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - reg ExclusiveArch: x86_64 - renderdoc ExclusiveArch: %{ix86} x86_64 - reptyr ExclusiveArch: %{ix86} x86_64 %{arm} - rescene ExclusiveArch: %{mono_arches} - restsharp ExclusiveArch: %{mono_arches} - rhythmbox-alternative-toolbar ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le - rkt ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - rocm-runtime ExclusiveArch: x86_64 aarch64 - rocminfo ExclusiveArch: x86_64 aarch64 - rpm-ostree ExclusiveArch: %{rust_arches} - rssguard ExclusiveArch: %{qt5_qtwebengine_arches} - runc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x - rust ExclusiveArch: %{rust_arches} - rust-abomonation ExclusiveArch: %{rust_arches} - rust-addr2line ExclusiveArch: %{rust_arches} - rust-adler32 ExclusiveArch: %{rust_arches} - rust-aes-soft ExclusiveArch: %{rust_arches} - rust-afterburn ExclusiveArch: %{rust_arches} - rust-aho-corasick ExclusiveArch: %{rust_arches} - rust-alga ExclusiveArch: %{rust_arches} - rust-alga_derive ExclusiveArch: %{rust_arches} - rust-ammonia ExclusiveArch: %{rust_arches} - rust-ansi_colours ExclusiveArch: %{rust_arches} - rust-ansi_term ExclusiveArch: %{rust_arches} - rust-antidote ExclusiveArch: %{rust_arches} - rust-aom-sys ExclusiveArch: %{rust_arches} - rust-approx ExclusiveArch: %{rust_arches} - rust-arc-swap ExclusiveArch: %{rust_arches} - rust-arg_enum_proc_macro ExclusiveArch: %{rust_arches} - rust-arraydeque ExclusiveArch: %{rust_arches} - rust-arrayref ExclusiveArch: %{rust_arches} - rust-arrayvec ExclusiveArch: %{rust_arches} - rust-ascii ExclusiveArch: %{rust_arches} - rust-askalono ExclusiveArch: %{rust_arches} - rust-askalono-cli ExclusiveArch: %{rust_arches} - rust-atk ExclusiveArch: %{rust_arches} - rust-atk-sys ExclusiveArch: %{rust_arches} - rust-atom ExclusiveArch: %{rust_arches} - rust-atomicwrites ExclusiveArch: %{rust_arches} - rust-atty ExclusiveArch: %{rust_arches} - rust-autocfg ExclusiveArch: %{rust_arches} - rust-backtrace ExclusiveArch: %{rust_arches} - rust-backtrace-sys ExclusiveArch: %{rust_arches} - rust-base100 ExclusiveArch: %{rust_arches} - rust-base64 ExclusiveArch: %{rust_arches} - rust-bat ExclusiveArch: %{rust_arches} - rust-bencher ExclusiveArch: %{rust_arches} - rust-bincode ExclusiveArch: %{rust_arches} - rust-bindgen ExclusiveArch: %{rust_arches} - rust-bit-set ExclusiveArch: %{rust_arches} - rust-bit-vec ExclusiveArch: %{rust_arches} - rust-bitflags ExclusiveArch: %{rust_arches} - rust-bitstream-io ExclusiveArch: %{rust_arches} - rust-blake2 ExclusiveArch: %{rust_arches} - rust-blobby ExclusiveArch: %{rust_arches} - rust-block-buffer ExclusiveArch: %{rust_arches} - rust-block-cipher-trait ExclusiveArch: %{rust_arches} - rust-block-modes ExclusiveArch: %{rust_arches} - rust-block-padding ExclusiveArch: %{rust_arches} - rust-brev ExclusiveArch: %{rust_arches} - rust-bstr ExclusiveArch: %{rust_arches} - rust-bufstream ExclusiveArch: %{rust_arches} - rust-build_const ExclusiveArch: %{rust_arches} - rust-byte-tools ExclusiveArch: %{rust_arches} - rust-bytecount ExclusiveArch: %{rust_arches} - rust-byteorder ExclusiveArch: %{rust_arches} - rust-bytes ExclusiveArch: %{rust_arches} - rust-bytes0.3 ExclusiveArch: %{rust_arches} - rust-bytesize ExclusiveArch: %{rust_arches} - rust-c_vec ExclusiveArch: %{rust_arches} - rust-cairo-rs ExclusiveArch: %{rust_arches} - rust-cairo-sys-rs ExclusiveArch: %{rust_arches} - rust-cargo ExclusiveArch: %{rust_arches} - rust-cargo_metadata ExclusiveArch: %{rust_arches} - rust-cargo_metadata0.6 ExclusiveArch: %{rust_arches} - rust-cast ExclusiveArch: %{rust_arches} - rust-cbindgen ExclusiveArch: %{rust_arches} - rust-cc ExclusiveArch: %{rust_arches} - rust-cexpr ExclusiveArch: %{rust_arches} - rust-cfg-if ExclusiveArch: %{rust_arches} - rust-chainerror ExclusiveArch: %{rust_arches} - rust-chbs ExclusiveArch: %{rust_arches} - rust-checked_int_cast ExclusiveArch: %{rust_arches} - rust-chrono ExclusiveArch: %{rust_arches} - rust-chrono-humanize ExclusiveArch: %{rust_arches} - rust-clang-sys ExclusiveArch: %{rust_arches} - rust-clap ExclusiveArch: %{rust_arches} - rust-clicolors-control ExclusiveArch: %{rust_arches} - rust-cmake ExclusiveArch: %{rust_arches} - rust-color_quant ExclusiveArch: %{rust_arches} - rust-colored ExclusiveArch: %{rust_arches} - rust-colored_json ExclusiveArch: %{rust_arches} - rust-config ExclusiveArch: %{rust_arches} - rust-console ExclusiveArch: %{rust_arches} - rust-content_inspector ExclusiveArch: %{rust_arches} - rust-cpp_demangle ExclusiveArch: %{rust_arches} - rust-crates-io ExclusiveArch: %{rust_arches} - rust-crc ExclusiveArch: %{rust_arches} - rust-crc-core ExclusiveArch: %{rust_arches} - rust-crc32fast ExclusiveArch: %{rust_arches} - rust-criterion ExclusiveArch: %{rust_arches} - rust-criterion-plot ExclusiveArch: %{rust_arches} - rust-crossbeam ExclusiveArch: %{rust_arches} - rust-crossbeam-channel ExclusiveArch: %{rust_arches} - rust-crossbeam-deque ExclusiveArch: %{rust_arches} - rust-crossbeam-deque0.4 ExclusiveArch: %{rust_arches} - rust-crossbeam-epoch ExclusiveArch: %{rust_arches} - rust-crossbeam-queue ExclusiveArch: %{rust_arches} - rust-crossbeam-utils ExclusiveArch: %{rust_arches} - rust-crossterm ExclusiveArch: %{rust_arches} - rust-crossterm_cursor ExclusiveArch: %{rust_arches} - rust-crossterm_input ExclusiveArch: %{rust_arches} - rust-crossterm_screen ExclusiveArch: %{rust_arches} - rust-crossterm_style ExclusiveArch: %{rust_arches} - rust-crossterm_terminal ExclusiveArch: %{rust_arches} - rust-crossterm_utils ExclusiveArch: %{rust_arches} - rust-crypto-hash ExclusiveArch: %{rust_arches} - rust-crypto-mac ExclusiveArch: %{rust_arches} - rust-cryptovec ExclusiveArch: %{rust_arches} - rust-cssparser ExclusiveArch: %{rust_arches} - rust-cssparser-macros ExclusiveArch: %{rust_arches} - rust-csv ExclusiveArch: %{rust_arches} - rust-csv-core ExclusiveArch: %{rust_arches} - rust-ctrlc ExclusiveArch: %{rust_arches} - rust-curl ExclusiveArch: %{rust_arches} - rust-curl-sys ExclusiveArch: %{rust_arches} - rust-custom_derive ExclusiveArch: %{rust_arches} - rust-darling ExclusiveArch: %{rust_arches} - rust-darling_core ExclusiveArch: %{rust_arches} - rust-darling_macro ExclusiveArch: %{rust_arches} - rust-data-encoding ExclusiveArch: %{rust_arches} - rust-data-url ExclusiveArch: %{rust_arches} - rust-datetime ExclusiveArch: %{rust_arches} - rust-dav1d-sys ExclusiveArch: %{rust_arches} - rust-dbus ExclusiveArch: %{rust_arches} - rust-decimal ExclusiveArch: %{rust_arches} - rust-deflate ExclusiveArch: %{rust_arches} - rust-defmac ExclusiveArch: %{rust_arches} - rust-delta_e ExclusiveArch: %{rust_arches} - rust-derive_builder ExclusiveArch: %{rust_arches} - rust-derive_builder_core ExclusiveArch: %{rust_arches} - rust-devicemapper ExclusiveArch: %{rust_arches} - rust-diff ExclusiveArch: %{rust_arches} - rust-difference ExclusiveArch: %{rust_arches} - rust-digest ExclusiveArch: %{rust_arches} - rust-directories ExclusiveArch: %{rust_arches} - rust-dirs ExclusiveArch: %{rust_arches} - rust-dns-parser ExclusiveArch: %{rust_arches} - rust-doc-comment ExclusiveArch: %{rust_arches} - rust-docmatic ExclusiveArch: %{rust_arches} - rust-docopt ExclusiveArch: %{rust_arches} - rust-downcast-rs ExclusiveArch: %{rust_arches} - rust-dtoa ExclusiveArch: %{rust_arches} - rust-dtoa-short ExclusiveArch: %{rust_arches} - rust-edit-distance ExclusiveArch: %{rust_arches} - rust-either ExclusiveArch: %{rust_arches} - rust-encode_unicode ExclusiveArch: %{rust_arches} - rust-encoding ExclusiveArch: %{rust_arches} - rust-encoding-index-japanese ExclusiveArch: %{rust_arches} - rust-encoding-index-korean ExclusiveArch: %{rust_arches} - rust-encoding-index-simpchinese ExclusiveArch: %{rust_arches} - rust-encoding-index-singlebyte ExclusiveArch: %{rust_arches} - rust-encoding-index-tradchinese ExclusiveArch: %{rust_arches} - rust-encoding_index_tests ExclusiveArch: %{rust_arches} - rust-encoding_rs ExclusiveArch: %{rust_arches} - rust-encoding_rs_io ExclusiveArch: %{rust_arches} - rust-entities ExclusiveArch: %{rust_arches} - rust-enum_primitive ExclusiveArch: %{rust_arches} - rust-env_logger ExclusiveArch: %{rust_arches} - rust-env_logger0.4 ExclusiveArch: %{rust_arches} - rust-env_logger0.5 ExclusiveArch: %{rust_arches} - rust-erased-serde ExclusiveArch: %{rust_arches} - rust-errln ExclusiveArch: %{rust_arches} - rust-errno ExclusiveArch: %{rust_arches} - rust-error-chain ExclusiveArch: %{rust_arches} - rust-exa ExclusiveArch: %{rust_arches} - rust-extprim ExclusiveArch: %{rust_arches} - rust-extprim_literals_macros ExclusiveArch: %{rust_arches} - rust-failure ExclusiveArch: %{rust_arches} - rust-failure_derive ExclusiveArch: %{rust_arches} - rust-fake-simd ExclusiveArch: %{rust_arches} - rust-fake_clock ExclusiveArch: %{rust_arches} - rust-fallible-iterator ExclusiveArch: %{rust_arches} - rust-fd-find ExclusiveArch: %{rust_arches} - rust-ffsend ExclusiveArch: %{rust_arches} - rust-ffsend-api ExclusiveArch: %{rust_arches} - rust-filetime ExclusiveArch: %{rust_arches} - rust-fixedbitset ExclusiveArch: %{rust_arches} - rust-flame ExclusiveArch: %{rust_arches} - rust-flate2 ExclusiveArch: %{rust_arches} - rust-float-cmp ExclusiveArch: %{rust_arches} - rust-fnv ExclusiveArch: %{rust_arches} - rust-foreign-types ExclusiveArch: %{rust_arches} - rust-foreign-types-shared ExclusiveArch: %{rust_arches} - rust-fragile ExclusiveArch: %{rust_arches} - rust-fs2 ExclusiveArch: %{rust_arches} - rust-fuse ExclusiveArch: %{rust_arches} - rust-futf ExclusiveArch: %{rust_arches} - rust-futures-async-runtime-preview ExclusiveArch: %{rust_arches} - rust-futures-channel-preview ExclusiveArch: %{rust_arches} - rust-futures-core ExclusiveArch: %{rust_arches} - rust-futures-core-preview ExclusiveArch: %{rust_arches} - rust-futures-cpupool ExclusiveArch: %{rust_arches} - rust-futures-executor-preview ExclusiveArch: %{rust_arches} - rust-futures-io-preview ExclusiveArch: %{rust_arches} - rust-futures-preview ExclusiveArch: %{rust_arches} - rust-futures-sink-preview ExclusiveArch: %{rust_arches} - rust-futures-stable-preview ExclusiveArch: %{rust_arches} - rust-futures-util-preview ExclusiveArch: %{rust_arches} - rust-futures0.1 ExclusiveArch: %{rust_arches} - rust-fuzzy-matcher ExclusiveArch: %{rust_arches} - rust-gcsf ExclusiveArch: %{rust_arches} - rust-gdk ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf-sys ExclusiveArch: %{rust_arches} - rust-gdk-sys ExclusiveArch: %{rust_arches} - rust-generic-array ExclusiveArch: %{rust_arches} - rust-getopts ExclusiveArch: %{rust_arches} - rust-gettext-sys ExclusiveArch: %{rust_arches} - rust-gif ExclusiveArch: %{rust_arches} - rust-gimli ExclusiveArch: %{rust_arches} - rust-gio ExclusiveArch: %{rust_arches} - rust-gio-sys ExclusiveArch: %{rust_arches} - rust-gir-format-check ExclusiveArch: %{rust_arches} - rust-git2 ExclusiveArch: %{rust_arches} - rust-git2-curl ExclusiveArch: %{rust_arches} - rust-glib ExclusiveArch: %{rust_arches} - rust-glib-sys ExclusiveArch: %{rust_arches} - rust-glob ExclusiveArch: %{rust_arches} - rust-globset ExclusiveArch: %{rust_arches} - rust-gobject-sys ExclusiveArch: %{rust_arches} - rust-goblin ExclusiveArch: %{rust_arches} - rust-google-drive3-fork ExclusiveArch: %{rust_arches} - rust-grep ExclusiveArch: %{rust_arches} - rust-grep-cli ExclusiveArch: %{rust_arches} - rust-grep-matcher ExclusiveArch: %{rust_arches} - rust-grep-pcre2 ExclusiveArch: %{rust_arches} - rust-grep-printer ExclusiveArch: %{rust_arches} - rust-grep-regex ExclusiveArch: %{rust_arches} - rust-grep-searcher ExclusiveArch: %{rust_arches} - rust-gstreamer-sys ExclusiveArch: %{rust_arches} - rust-gtk ExclusiveArch: %{rust_arches} - rust-gtk-rs-lgpl-docs ExclusiveArch: %{rust_arches} - rust-gtk-source-sys ExclusiveArch: %{rust_arches} - rust-gtk-sys ExclusiveArch: %{rust_arches} - rust-gzip-header ExclusiveArch: %{rust_arches} - rust-h2 ExclusiveArch: %{rust_arches} - rust-half ExclusiveArch: %{rust_arches} - rust-hamcrest ExclusiveArch: %{rust_arches} - rust-handlebars ExclusiveArch: %{rust_arches} - rust-hashbrown ExclusiveArch: %{rust_arches} - rust-headers ExclusiveArch: %{rust_arches} - rust-headers-core ExclusiveArch: %{rust_arches} - rust-headers-derive ExclusiveArch: %{rust_arches} - rust-heapsize ExclusiveArch: %{rust_arches} - rust-heatseeker ExclusiveArch: %{rust_arches} - rust-heck ExclusiveArch: %{rust_arches} - rust-hex ExclusiveArch: %{rust_arches} - rust-hex-literal ExclusiveArch: %{rust_arches} - rust-hex-literal-impl ExclusiveArch: %{rust_arches} - rust-hexyl ExclusiveArch: %{rust_arches} - rust-hkdf ExclusiveArch: %{rust_arches} - rust-hmac ExclusiveArch: %{rust_arches} - rust-home ExclusiveArch: %{rust_arches} - rust-horrorshow ExclusiveArch: %{rust_arches} - rust-hostname ExclusiveArch: %{rust_arches} - rust-html2pango ExclusiveArch: %{rust_arches} - rust-html5ever ExclusiveArch: %{rust_arches} - rust-http ExclusiveArch: %{rust_arches} - rust-httparse ExclusiveArch: %{rust_arches} - rust-humantime ExclusiveArch: %{rust_arches} - rust-hyper ExclusiveArch: %{rust_arches} - rust-hyper-native-tls ExclusiveArch: %{rust_arches} - rust-hyper-tls ExclusiveArch: %{rust_arches} - rust-hyper0.10 ExclusiveArch: %{rust_arches} - rust-hyperfine ExclusiveArch: %{rust_arches} - rust-id_tree ExclusiveArch: %{rust_arches} - rust-ident_case ExclusiveArch: %{rust_arches} - rust-idna ExclusiveArch: %{rust_arches} - rust-ignore ExclusiveArch: %{rust_arches} - rust-image ExclusiveArch: %{rust_arches} - rust-imgref ExclusiveArch: %{rust_arches} - rust-indexmap ExclusiveArch: %{rust_arches} - rust-indicatif ExclusiveArch: %{rust_arches} - rust-inflate ExclusiveArch: %{rust_arches} - rust-inotify ExclusiveArch: %{rust_arches} - rust-inotify-sys ExclusiveArch: %{rust_arches} - rust-input_buffer ExclusiveArch: %{rust_arches} - rust-interpolate_name ExclusiveArch: %{rust_arches} - rust-intervaltree ExclusiveArch: %{rust_arches} - rust-iovec ExclusiveArch: %{rust_arches} - rust-ipnetwork ExclusiveArch: %{rust_arches} - rust-iso8601 ExclusiveArch: %{rust_arches} - rust-iter-read ExclusiveArch: %{rust_arches} - rust-itertools ExclusiveArch: %{rust_arches} - rust-itertools-num ExclusiveArch: %{rust_arches} - rust-itoa ExclusiveArch: %{rust_arches} - rust-jobserver ExclusiveArch: %{rust_arches} - rust-jpeg-decoder ExclusiveArch: %{rust_arches} - rust-lab ExclusiveArch: %{rust_arches} - rust-language-tags ExclusiveArch: %{rust_arches} - rust-lazy-init ExclusiveArch: %{rust_arches} - rust-lazy_static ExclusiveArch: %{rust_arches} - rust-lazycell ExclusiveArch: %{rust_arches} - rust-letter-avatar ExclusiveArch: %{rust_arches} - rust-libc ExclusiveArch: %{rust_arches} - rust-libdbus-sys ExclusiveArch: %{rust_arches} - rust-libflate ExclusiveArch: %{rust_arches} - rust-libgit2-sys ExclusiveArch: %{rust_arches} - rust-libloading ExclusiveArch: %{rust_arches} - rust-libm ExclusiveArch: %{rust_arches} - rust-libmount ExclusiveArch: %{rust_arches} - rust-libssh2-sys ExclusiveArch: %{rust_arches} - rust-libudev ExclusiveArch: %{rust_arches} - rust-libudev-sys ExclusiveArch: %{rust_arches} - rust-libz-sys ExclusiveArch: %{rust_arches} - rust-line-wrap ExclusiveArch: %{rust_arches} - rust-linked-hash-map ExclusiveArch: %{rust_arches} - rust-linkify ExclusiveArch: %{rust_arches} - rust-lipsum ExclusiveArch: %{rust_arches} - rust-lmdb ExclusiveArch: %{rust_arches} - rust-lmdb-sys ExclusiveArch: %{rust_arches} - rust-locale ExclusiveArch: %{rust_arches} - rust-locale_config ExclusiveArch: %{rust_arches} - rust-lock_api ExclusiveArch: %{rust_arches} - rust-log ExclusiveArch: %{rust_arches} - rust-log0.3 ExclusiveArch: %{rust_arches} - rust-loopdev ExclusiveArch: %{rust_arches} - rust-lru_time_cache ExclusiveArch: %{rust_arches} - rust-lscolors ExclusiveArch: %{rust_arches} - rust-lsd ExclusiveArch: %{rust_arches} - rust-lzma-sys ExclusiveArch: %{rust_arches} - rust-lzw ExclusiveArch: %{rust_arches} - rust-mac ExclusiveArch: %{rust_arches} - rust-macro-attr ExclusiveArch: %{rust_arches} - rust-maplit ExclusiveArch: %{rust_arches} - rust-markup5ever ExclusiveArch: %{rust_arches} - rust-matches ExclusiveArch: %{rust_arches} - rust-matrixmultiply ExclusiveArch: %{rust_arches} - rust-md-5 ExclusiveArch: %{rust_arches} - rust-md5 ExclusiveArch: %{rust_arches} - rust-mdl ExclusiveArch: %{rust_arches} - rust-memchr ExclusiveArch: %{rust_arches} - rust-memmap ExclusiveArch: %{rust_arches} - rust-memoffset ExclusiveArch: %{rust_arches} - rust-metadeps ExclusiveArch: %{rust_arches} - rust-mime ExclusiveArch: %{rust_arches} - rust-mime-sniffer ExclusiveArch: %{rust_arches} - rust-mime0.2 ExclusiveArch: %{rust_arches} - rust-mime_guess ExclusiveArch: %{rust_arches} - rust-mime_guess1 ExclusiveArch: %{rust_arches} - rust-miniz-sys ExclusiveArch: %{rust_arches} - rust-miniz_oxide ExclusiveArch: %{rust_arches} - rust-miniz_oxide_c_api ExclusiveArch: %{rust_arches} - rust-mint ExclusiveArch: %{rust_arches} - rust-mio ExclusiveArch: %{rust_arches} - rust-mio-extras ExclusiveArch: %{rust_arches} - rust-mio-uds ExclusiveArch: %{rust_arches} - rust-mktemp ExclusiveArch: %{rust_arches} - rust-mnt ExclusiveArch: %{rust_arches} - rust-mockito ExclusiveArch: %{rust_arches} - rust-modifier ExclusiveArch: %{rust_arches} - rust-muldiv ExclusiveArch: %{rust_arches} - rust-multimap ExclusiveArch: %{rust_arches} - rust-nalgebra ExclusiveArch: %{rust_arches} - rust-nasm-rs ExclusiveArch: %{rust_arches} - rust-native-tls ExclusiveArch: %{rust_arches} - rust-natord ExclusiveArch: %{rust_arches} - rust-net2 ExclusiveArch: %{rust_arches} - rust-netmap_sys ExclusiveArch: %{rust_arches} - rust-new_debug_unreachable ExclusiveArch: %{rust_arches} - rust-newtype_derive ExclusiveArch: %{rust_arches} - rust-nix ExclusiveArch: %{rust_arches} - rust-no-panic ExclusiveArch: %{rust_arches} - rust-nodrop ExclusiveArch: %{rust_arches} - rust-nom ExclusiveArch: %{rust_arches} - rust-notify ExclusiveArch: %{rust_arches} - rust-num ExclusiveArch: %{rust_arches} - rust-num-bigint ExclusiveArch: %{rust_arches} - rust-num-complex ExclusiveArch: %{rust_arches} - rust-num-derive ExclusiveArch: %{rust_arches} - rust-num-integer ExclusiveArch: %{rust_arches} - rust-num-iter ExclusiveArch: %{rust_arches} - rust-num-rational ExclusiveArch: %{rust_arches} - rust-num-traits ExclusiveArch: %{rust_arches} - rust-num-traits0.1 ExclusiveArch: %{rust_arches} - rust-num_cpus ExclusiveArch: %{rust_arches} - rust-number_prefix ExclusiveArch: %{rust_arches} - rust-object ExclusiveArch: %{rust_arches} - rust-odds ExclusiveArch: %{rust_arches} - rust-once_cell ExclusiveArch: %{rust_arches} - rust-onig ExclusiveArch: %{rust_arches} - rust-onig_sys ExclusiveArch: %{rust_arches} - rust-opaque-debug ExclusiveArch: %{rust_arches} - rust-open ExclusiveArch: %{rust_arches} - rust-opener ExclusiveArch: %{rust_arches} - rust-openssh-keys ExclusiveArch: %{rust_arches} - rust-openssl ExclusiveArch: %{rust_arches} - rust-openssl-probe ExclusiveArch: %{rust_arches} - rust-openssl-sys ExclusiveArch: %{rust_arches} - rust-ord_subset ExclusiveArch: %{rust_arches} - rust-owning_ref ExclusiveArch: %{rust_arches} - rust-packaging ExclusiveArch: %{rust_arches} - rust-pad ExclusiveArch: %{rust_arches} - rust-pager ExclusiveArch: %{rust_arches} - rust-pango ExclusiveArch: %{rust_arches} - rust-pango-sys ExclusiveArch: %{rust_arches} - rust-pangocairo ExclusiveArch: %{rust_arches} - rust-pangocairo-sys ExclusiveArch: %{rust_arches} - rust-parity-wasm ExclusiveArch: %{rust_arches} - rust-parking_lot ExclusiveArch: %{rust_arches} - rust-parking_lot_core ExclusiveArch: %{rust_arches} - rust-paste ExclusiveArch: %{rust_arches} - rust-paste-impl ExclusiveArch: %{rust_arches} - rust-pbr ExclusiveArch: %{rust_arches} - rust-pcap ExclusiveArch: %{rust_arches} - rust-pcre2 ExclusiveArch: %{rust_arches} - rust-pcre2-sys ExclusiveArch: %{rust_arches} - rust-peeking_take_while ExclusiveArch: %{rust_arches} - rust-peg ExclusiveArch: %{rust_arches} - rust-percent-encoding ExclusiveArch: %{rust_arches} - rust-permutate ExclusiveArch: %{rust_arches} - rust-permutohedron ExclusiveArch: %{rust_arches} - rust-pest ExclusiveArch: %{rust_arches} - rust-pest_derive ExclusiveArch: %{rust_arches} - rust-pest_generator ExclusiveArch: %{rust_arches} - rust-pest_meta ExclusiveArch: %{rust_arches} - rust-petgraph ExclusiveArch: %{rust_arches} - rust-phf ExclusiveArch: %{rust_arches} - rust-phf_codegen ExclusiveArch: %{rust_arches} - rust-phf_generator ExclusiveArch: %{rust_arches} - rust-phf_shared ExclusiveArch: %{rust_arches} - rust-pkg-config ExclusiveArch: %{rust_arches} - rust-plain ExclusiveArch: %{rust_arches} - rust-plist ExclusiveArch: %{rust_arches} - rust-plugin ExclusiveArch: %{rust_arches} - rust-pnet_base ExclusiveArch: %{rust_arches} - rust-pnet_datalink ExclusiveArch: %{rust_arches} - rust-pnet_sys ExclusiveArch: %{rust_arches} - rust-png ExclusiveArch: %{rust_arches} - rust-precomputed-hash ExclusiveArch: %{rust_arches} - rust-pretty-git-prompt ExclusiveArch: %{rust_arches} - rust-pretty_assertions ExclusiveArch: %{rust_arches} - rust-pretty_env_logger ExclusiveArch: %{rust_arches} - rust-prettytable-rs ExclusiveArch: %{rust_arches} - rust-proc-macro-hack ExclusiveArch: %{rust_arches} - rust-proc-macro2 ExclusiveArch: %{rust_arches} - rust-proc-macro2-0.3 ExclusiveArch: %{rust_arches} - rust-procedural-masquerade ExclusiveArch: %{rust_arches} - rust-proptest ExclusiveArch: %{rust_arches} - rust-pulldown-cmark ExclusiveArch: %{rust_arches} - rust-pulse ExclusiveArch: %{rust_arches} - rust-qr2term ExclusiveArch: %{rust_arches} - rust-qrcode ExclusiveArch: %{rust_arches} - rust-quick-error ExclusiveArch: %{rust_arches} - rust-quickcheck ExclusiveArch: %{rust_arches} - rust-quickcheck0.6 ExclusiveArch: %{rust_arches} - rust-quickersort ExclusiveArch: %{rust_arches} - rust-quote ExclusiveArch: %{rust_arches} - rust-quote0.3 ExclusiveArch: %{rust_arches} - rust-quote0.5 ExclusiveArch: %{rust_arches} - rust-rand ExclusiveArch: %{rust_arches} - rust-rand0.4 ExclusiveArch: %{rust_arches} - rust-rand0.5 ExclusiveArch: %{rust_arches} - rust-rand_chacha ExclusiveArch: %{rust_arches} - rust-rand_core ExclusiveArch: %{rust_arches} - rust-rand_core0.2 ExclusiveArch: %{rust_arches} - rust-rand_core0.3 ExclusiveArch: %{rust_arches} - rust-rand_hc ExclusiveArch: %{rust_arches} - rust-rand_isaac ExclusiveArch: %{rust_arches} - rust-rand_jitter ExclusiveArch: %{rust_arches} - rust-rand_os ExclusiveArch: %{rust_arches} - rust-rand_pcg ExclusiveArch: %{rust_arches} - rust-rand_xorshift ExclusiveArch: %{rust_arches} - rust-rand_xoshiro ExclusiveArch: %{rust_arches} - rust-rawpointer ExclusiveArch: %{rust_arches} - rust-rawslice ExclusiveArch: %{rust_arches} - rust-rayon ExclusiveArch: %{rust_arches} - rust-rayon-core ExclusiveArch: %{rust_arches} - rust-recycler ExclusiveArch: %{rust_arches} - rust-regex ExclusiveArch: %{rust_arches} - rust-regex-automata ExclusiveArch: %{rust_arches} - rust-regex-syntax ExclusiveArch: %{rust_arches} - rust-relay ExclusiveArch: %{rust_arches} - rust-remove_dir_all ExclusiveArch: %{rust_arches} - rust-reqwest ExclusiveArch: %{rust_arches} - rust-resize ExclusiveArch: %{rust_arches} - rust-rgb ExclusiveArch: %{rust_arches} - rust-ripgrep ExclusiveArch: %{rust_arches} - rust-rmp ExclusiveArch: %{rust_arches} - rust-rmp-serde ExclusiveArch: %{rust_arches} - rust-ron ExclusiveArch: %{rust_arches} - rust-rpassword ExclusiveArch: %{rust_arches} - rust-rpick ExclusiveArch: %{rust_arches} - rust-rust-ini ExclusiveArch: %{rust_arches} - rust-rustc-demangle ExclusiveArch: %{rust_arches} - rust-rustc-serialize ExclusiveArch: %{rust_arches} - rust-rustc-test ExclusiveArch: %{rust_arches} - rust-rustc_version ExclusiveArch: %{rust_arches} - rust-rustdoc-stripper ExclusiveArch: %{rust_arches} - rust-rustfilt ExclusiveArch: %{rust_arches} - rust-rustfix ExclusiveArch: %{rust_arches} - rust-rusty-fork ExclusiveArch: %{rust_arches} - rust-ryu ExclusiveArch: %{rust_arches} - rust-safe-transmute ExclusiveArch: %{rust_arches} - rust-safemem ExclusiveArch: %{rust_arches} - rust-same-file ExclusiveArch: %{rust_arches} - rust-scan_fmt ExclusiveArch: %{rust_arches} - rust-scoped-tls ExclusiveArch: %{rust_arches} - rust-scoped_threadpool ExclusiveArch: %{rust_arches} - rust-scopeguard ExclusiveArch: %{rust_arches} - rust-scroll ExclusiveArch: %{rust_arches} - rust-scroll_derive ExclusiveArch: %{rust_arches} - rust-sd ExclusiveArch: %{rust_arches} - rust-seahash ExclusiveArch: %{rust_arches} - rust-semver ExclusiveArch: %{rust_arches} - rust-semver-parser ExclusiveArch: %{rust_arches} - rust-semver-parser0.7 ExclusiveArch: %{rust_arches} - rust-serde ExclusiveArch: %{rust_arches} - rust-serde-pickle ExclusiveArch: %{rust_arches} - rust-serde-xml-rs ExclusiveArch: %{rust_arches} - rust-serde0.8 ExclusiveArch: %{rust_arches} - rust-serde_bytes ExclusiveArch: %{rust_arches} - rust-serde_cbor ExclusiveArch: %{rust_arches} - rust-serde_derive ExclusiveArch: %{rust_arches} - rust-serde_ignored ExclusiveArch: %{rust_arches} - rust-serde_json ExclusiveArch: %{rust_arches} - rust-serde_json0.8 ExclusiveArch: %{rust_arches} - rust-serde_stacker ExclusiveArch: %{rust_arches} - rust-serde_test ExclusiveArch: %{rust_arches} - rust-serde_urlencoded ExclusiveArch: %{rust_arches} - rust-serde_yaml ExclusiveArch: %{rust_arches} - rust-sha-1 ExclusiveArch: %{rust_arches} - rust-sha1 ExclusiveArch: %{rust_arches} - rust-sha2 ExclusiveArch: %{rust_arches} - rust-shell-escape ExclusiveArch: %{rust_arches} - rust-shell-words ExclusiveArch: %{rust_arches} - rust-shlex ExclusiveArch: %{rust_arches} - rust-signal-hook ExclusiveArch: %{rust_arches} - rust-signal-hook-registry ExclusiveArch: %{rust_arches} - rust-silver ExclusiveArch: %{rust_arches} - rust-simple_logger ExclusiveArch: %{rust_arches} - rust-simplelog ExclusiveArch: %{rust_arches} - rust-siphasher ExclusiveArch: %{rust_arches} - rust-skeptic ExclusiveArch: %{rust_arches} - rust-skim ExclusiveArch: %{rust_arches} - rust-slab ExclusiveArch: %{rust_arches} - rust-slog ExclusiveArch: %{rust_arches} - rust-slog-async ExclusiveArch: %{rust_arches} - rust-slog-scope ExclusiveArch: %{rust_arches} - rust-slog-term ExclusiveArch: %{rust_arches} - rust-smallvec ExclusiveArch: %{rust_arches} - rust-snowflake ExclusiveArch: %{rust_arches} - rust-socket2 ExclusiveArch: %{rust_arches} - rust-sourceview ExclusiveArch: %{rust_arches} - rust-spin ExclusiveArch: %{rust_arches} - rust-spmc ExclusiveArch: %{rust_arches} - rust-stable_deref_trait ExclusiveArch: %{rust_arches} - rust-stacker ExclusiveArch: %{rust_arches} - rust-static_assertions ExclusiveArch: %{rust_arches} - rust-statistical ExclusiveArch: %{rust_arches} - rust-stb_truetype ExclusiveArch: %{rust_arches} - rust-stream-cipher ExclusiveArch: %{rust_arches} - rust-streaming-stats ExclusiveArch: %{rust_arches} - rust-string ExclusiveArch: %{rust_arches} - rust-string_cache ExclusiveArch: %{rust_arches} - rust-string_cache_codegen ExclusiveArch: %{rust_arches} - rust-string_cache_shared ExclusiveArch: %{rust_arches} - rust-strings ExclusiveArch: %{rust_arches} - rust-strsim ExclusiveArch: %{rust_arches} - rust-structopt ExclusiveArch: %{rust_arches} - rust-structopt-derive ExclusiveArch: %{rust_arches} - rust-subtle ExclusiveArch: %{rust_arches} - rust-syn ExclusiveArch: %{rust_arches} - rust-syn0.11 ExclusiveArch: %{rust_arches} - rust-synom ExclusiveArch: %{rust_arches} - rust-synstructure ExclusiveArch: %{rust_arches} - rust-syntect ExclusiveArch: %{rust_arches} - rust-sys-info ExclusiveArch: %{rust_arches} - rust-tabwriter ExclusiveArch: %{rust_arches} - rust-take ExclusiveArch: %{rust_arches} - rust-take_mut ExclusiveArch: %{rust_arches} - rust-tar ExclusiveArch: %{rust_arches} - rust-tempdir ExclusiveArch: %{rust_arches} - rust-tempfile ExclusiveArch: %{rust_arches} - rust-tendril ExclusiveArch: %{rust_arches} - rust-term ExclusiveArch: %{rust_arches} - rust-term_grid ExclusiveArch: %{rust_arches} - rust-term_size ExclusiveArch: %{rust_arches} - rust-termcolor ExclusiveArch: %{rust_arches} - rust-terminal_size ExclusiveArch: %{rust_arches} - rust-terminfo ExclusiveArch: %{rust_arches} - rust-termion ExclusiveArch: %{rust_arches} - rust-termios ExclusiveArch: %{rust_arches} - rust-test-assembler ExclusiveArch: %{rust_arches} - rust-textwrap ExclusiveArch: %{rust_arches} - rust-thread-id ExclusiveArch: %{rust_arches} - rust-thread-scoped ExclusiveArch: %{rust_arches} - rust-thread_local ExclusiveArch: %{rust_arches} - rust-threadpool ExclusiveArch: %{rust_arches} - rust-tiff ExclusiveArch: %{rust_arches} - rust-time ExclusiveArch: %{rust_arches} - rust-timer ExclusiveArch: %{rust_arches} - rust-timerfd ExclusiveArch: %{rust_arches} - rust-tinytemplate ExclusiveArch: %{rust_arches} - rust-tokei ExclusiveArch: %{rust_arches} - rust-tokio ExclusiveArch: %{rust_arches} - rust-tokio-async-await ExclusiveArch: %{rust_arches} - rust-tokio-codec ExclusiveArch: %{rust_arches} - rust-tokio-core ExclusiveArch: %{rust_arches} - rust-tokio-current-thread ExclusiveArch: %{rust_arches} - rust-tokio-executor ExclusiveArch: %{rust_arches} - rust-tokio-fs ExclusiveArch: %{rust_arches} - rust-tokio-io ExclusiveArch: %{rust_arches} - rust-tokio-mock-task ExclusiveArch: %{rust_arches} - rust-tokio-mockstream ExclusiveArch: %{rust_arches} - rust-tokio-process ExclusiveArch: %{rust_arches} - rust-tokio-reactor ExclusiveArch: %{rust_arches} - rust-tokio-service ExclusiveArch: %{rust_arches} - rust-tokio-signal ExclusiveArch: %{rust_arches} - rust-tokio-sync ExclusiveArch: %{rust_arches} - rust-tokio-tcp ExclusiveArch: %{rust_arches} - rust-tokio-threadpool ExclusiveArch: %{rust_arches} - rust-tokio-timer ExclusiveArch: %{rust_arches} - rust-tokio-tls ExclusiveArch: %{rust_arches} - rust-tokio-trace-core ExclusiveArch: %{rust_arches} - rust-tokio-udp ExclusiveArch: %{rust_arches} - rust-tokio-uds ExclusiveArch: %{rust_arches} - rust-toml ExclusiveArch: %{rust_arches} - rust-toml0.4 ExclusiveArch: %{rust_arches} - rust-traitobject ExclusiveArch: %{rust_arches} - rust-try-lock ExclusiveArch: %{rust_arches} - rust-tuikit ExclusiveArch: %{rust_arches} - rust-tungstenite ExclusiveArch: %{rust_arches} - rust-typeable ExclusiveArch: %{rust_arches} - rust-typed-arena ExclusiveArch: %{rust_arches} - rust-typemap ExclusiveArch: %{rust_arches} - rust-typenum ExclusiveArch: %{rust_arches} - rust-ucd-parse ExclusiveArch: %{rust_arches} - rust-ucd-trie ExclusiveArch: %{rust_arches} - rust-ucd-util ExclusiveArch: %{rust_arches} - rust-unchecked-index ExclusiveArch: %{rust_arches} - rust-unescape ExclusiveArch: %{rust_arches} - rust-unicase ExclusiveArch: %{rust_arches} - rust-unicase1 ExclusiveArch: %{rust_arches} - rust-unicode-bidi ExclusiveArch: %{rust_arches} - rust-unicode-normalization ExclusiveArch: %{rust_arches} - rust-unicode-segmentation ExclusiveArch: %{rust_arches} - rust-unicode-width ExclusiveArch: %{rust_arches} - rust-unicode-xid ExclusiveArch: %{rust_arches} - rust-unicode_categories ExclusiveArch: %{rust_arches} - rust-unindent ExclusiveArch: %{rust_arches} - rust-unix_socket ExclusiveArch: %{rust_arches} - rust-unreachable ExclusiveArch: %{rust_arches} - rust-unsafe-any ExclusiveArch: %{rust_arches} - rust-untrusted ExclusiveArch: %{rust_arches} - rust-url ExclusiveArch: %{rust_arches} - rust-url_serde ExclusiveArch: %{rust_arches} - rust-urlencoding ExclusiveArch: %{rust_arches} - rust-urlshortener ExclusiveArch: %{rust_arches} - rust-users ExclusiveArch: %{rust_arches} - rust-utf-8 ExclusiveArch: %{rust_arches} - rust-utf8-ranges ExclusiveArch: %{rust_arches} - rust-utf8parse ExclusiveArch: %{rust_arches} - rust-uuid ExclusiveArch: %{rust_arches} - rust-varlink ExclusiveArch: %{rust_arches} - rust-varlink-cli ExclusiveArch: %{rust_arches} - rust-varlink_generator ExclusiveArch: %{rust_arches} - rust-varlink_parser ExclusiveArch: %{rust_arches} - rust-varlink_stdinterfaces ExclusiveArch: %{rust_arches} - rust-vec_map ExclusiveArch: %{rust_arches} - rust-version-compare ExclusiveArch: %{rust_arches} - rust-version-sync ExclusiveArch: %{rust_arches} - rust-version_check ExclusiveArch: %{rust_arches} - rust-void ExclusiveArch: %{rust_arches} - rust-vte ExclusiveArch: %{rust_arches} - rust-wait-timeout ExclusiveArch: %{rust_arches} - rust-walkdir ExclusiveArch: %{rust_arches} - rust-want ExclusiveArch: %{rust_arches} - rust-warp ExclusiveArch: %{rust_arches} - rust-websocket ExclusiveArch: %{rust_arches} - rust-which ExclusiveArch: %{rust_arches} - rust-which1 ExclusiveArch: %{rust_arches} - rust-wild ExclusiveArch: %{rust_arches} - rust-x11 ExclusiveArch: %{rust_arches} - rust-xattr ExclusiveArch: %{rust_arches} - rust-xdg ExclusiveArch: %{rust_arches} - rust-xml-rs ExclusiveArch: %{rust_arches} - rust-xz2 ExclusiveArch: %{rust_arches} - rust-y4m ExclusiveArch: %{rust_arches} - rust-yaml-rust ExclusiveArch: %{rust_arches} - rust-yaml-rust0.3 ExclusiveArch: %{rust_arches} - rust-ybaas ExclusiveArch: %{rust_arches} - rust-yubibomb ExclusiveArch: %{rust_arches} - rust-yup-oauth2 ExclusiveArch: %{rust_arches} - rust-zoneinfo_compiled ExclusiveArch: %{rust_arches} - rust-zram-generator ExclusiveArch: %{rust_arches} - s390utils ExclusiveArch: s390 s390x - safetyblanket ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - sagemath ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9 - sbcl ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - sbd ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le - sbsigntools ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - seabios ExclusiveArch: x86_64 - seamonkey ExclusiveArch: %{ix86} x86_64 - servicelog ExclusiveArch: ppc %{power64} - sgabios ExclusiveArch: %{ix86} x86_64 - sharpfont ExclusiveArch: %mono_arches - sharpziplib ExclusiveArch: %{mono_arches} - shim ExclusiveArch: %{efi} - shim-unsigned-aarch64 ExclusiveArch: aarch64 - shim-unsigned-x64 ExclusiveArch: x86_64 - sigul ExclusiveArch: x86_64 - skychart ExclusiveArch: %{fpc_arches} - snapd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - source-to-image ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - sparkleshare ExclusiveArch: %{mono_arches} - spicctrl ExclusiveArch: %{ix86} x86_64 - spice ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - spring ExclusiveArch: %{ix86} x86_64 - springlobby ExclusiveArch: %{ix86} x86_64 - startdde ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - statsd ExclusiveArch: %{nodejs_arches} noarch - stdx-allocator ExclusiveArch: %{ldc_arches} - stratisd ExclusiveArch: %{rust_arches} - stripesnoop ExclusiveArch: %{ix86} x86_64 - supermin ExclusiveArch: x86_64 - swift-lang ExclusiveArch: x86_64 aarch64 - sysbench ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - syslinux ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - taglib-sharp ExclusiveArch: %{mono_arches} - tarantool ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl - tboot ExclusiveArch: %{ix86} x86_64 - tdlib ExclusiveArch: x86_64 - templates_parser ExclusiveArch: %GPRbuild_arches - termy-qt ExclusiveArch: %{ix86} x86_64 - ternimal ExclusiveArch: %{rust_arches} - themonospot-base ExclusiveArch: %mono_arches - themonospot-console ExclusiveArch: %mono_arches - themonospot-gui-gtk ExclusiveArch: %mono_arches - themonospot-plugin-avi ExclusiveArch: %mono_arches - themonospot-plugin-mkv ExclusiveArch: %mono_arches - thermald ExclusiveArch: %{ix86} x86_64 - tilix ExclusiveArch: %{ldc_arches} - tmux-top ExclusiveArch: %{go_arches} - tomboy ExclusiveArch: %{mono_arches} - toolbox ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 - tuned-profiles-nfv-host-bin ExclusiveArch: %{ix86} x86_64 - uClibc ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} - ucx ExclusiveArch: aarch64 ppc64le x86_64 - ugene ExclusiveArch: %{ix86} x86_64 - uglify-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - uglify-js1 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - unetbootin ExclusiveArch: %{ix86} x86_64 - ursa-major ExclusiveArch: %{ix86} x86_64 noarch - v8-314 ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64 - valgrind ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 - vboot-utils ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - vdsm ExclusiveArch: x86_64 %{power64} aarch64 - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - virtio-forwarder ExclusiveArch: x86_64 aarch64 ppc64le %ix86 - virtualbox-guest-additions ExclusiveArch: i686 x86_64 - virtualplanet ExclusiveArch: %{fpc_arches} - vkd3d ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - vmaf ExclusiveArch: x86_64 - vrq ExclusiveArch: %{ix86} x86_64 - warsow ExclusiveArch: %{ix86} x86_64 %{arm} - warsow-data ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{ix86} x86_64 %{arm} - webkit2-sharp ExclusiveArch: %mono_arches - wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: %{ix86} %{arm} - winetricks ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - wraplinux ExclusiveArch: %{ix86} x86_64 - wxMaxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 - x2goclient ExclusiveArch: x86_64 - x86info ExclusiveArch: %{ix86} x86_64 - xen ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 - xmlada ExclusiveArch: %{GPRbuild_arches} - xorg-x11-drv-armsoc ExclusiveArch: %{arm} aarch64 - xorg-x11-drv-geode ExclusiveArch: %{ix86} - xorg-x11-drv-intel ExclusiveArch: %{ix86} x86_64 ia64 - xorg-x11-drv-omap ExclusiveArch: %{arm} - xorg-x11-drv-openchrome ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-opentegra ExclusiveArch: %{arm} - xorg-x11-drv-vesa ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vmware ExclusiveArch: %{ix86} x86_64 ia64 - xsp ExclusiveArch: %mono_arches - ycssmin ExclusiveArch: %{nodejs_arches} noarch - zeromq-ada ExclusiveArch: %{GPRbuild_arches} - zlib-ada ExclusiveArch: %{GPRbuild_arches}

1 0

[Report] Packages Restricting Arches
by root 03 May '19

03 May '19

New package excluding arches (7) ============================ - rust-doc-comment ExclusiveArch: %{rust_arches} - rust-gstreamer-sys ExclusiveArch: %{rust_arches} - rust-html2pango ExclusiveArch: %{rust_arches} - rust-imgref ExclusiveArch: %{rust_arches} - rust-letter-avatar ExclusiveArch: %{rust_arches} - rust-linkify ExclusiveArch: %{rust_arches} - rust-rgb ExclusiveArch: %{rust_arches} Package that edited their arches constraints (1) ============================================= - tarantool was ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl aarch64 is ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl List of packages currently excluding arches (2753) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - 90-Second-Portraits ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - GoldenCheetah ExclusiveArch: %{qt5_qtwebengine_arches} - GtkAda ExclusiveArch: %{GPRbuild_arches} - GtkAda3 ExclusiveArch: %{GPRbuild_arches} - PragmARC ExclusiveArch: %{GPRbuild_arches} - R-V8 ExclusiveArch: %{nodejs_arches} - RdRand ExclusiveArch: %{ix86} x86_64 - SLOF ExclusiveArch: ppc64le - YafaRay ExclusiveArch: %{ix86} x86_64 - aboot ExclusiveArch: alpha - acpid ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 - ahven ExclusiveArch: %{GPRbuild_arches} - alleyoop ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64 - american-fuzzy-lop ExclusiveArch: %{ix86} x86_64 - anet ExclusiveArch: %{GPRbuild_arches} - apmd ExclusiveArch: %{ix86} - appstream-generator ExclusiveArch: x86_64 %{ix86} %{arm} - arduino ExclusiveArch: %{go_arches} - arduino-builder ExclusiveArch: %{go_arches} - arm-trusted-firmware ExclusiveArch: aarch64 - aunit ExclusiveArch: %GPRbuild_arches - avgtime ExclusiveArch: %{ldc_arches} - aws ExclusiveArch: %GPRbuild_arches - banshee ExclusiveArch: %{mono_arches} - banshee-community-extensions ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x - bareftp ExclusiveArch: %{mono_arches} - bcal ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x - bcc ExclusiveArch: x86_64 %{power64} aarch64 s390x - bcm283x-firmware ExclusiveArch: %{arm} aarch64 - berusky2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} - biosdevname ExclusiveArch: %{ix86} x86_64 - bless ExclusiveArch: %mono_arches - boo ExclusiveArch: %{mono_arches} - bpftrace ExclusiveArch: x86_64 %{power64} aarch64 s390x - buildah ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x - bwa ExclusiveArch: x86_64 - caddy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}} - cadvisor ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le - calamares ExclusiveArch: %{ix86} x86_64 - carto ExclusiveArch: %{nodejs_arches} noarch - ccdciel ExclusiveArch: %{fpc_arches} - cdcollect ExclusiveArch: %{mono_arches} - chromium ExclusiveArch: x86_64 i686 ExclusiveArch: x86_64 i686 aarch64 - cjdns ExclusiveArch: %{nodejs_arches} - cmospwd ExclusiveArch: %{ix86} x86_64 - cmrt ExclusiveArch: %{ix86} x86_64 ia64 - coffee-script ExclusiveArch: %{nodejs_arches} noarch - colorful ExclusiveArch: %{fpc_arches} - compat-gcc-296 ExclusiveArch: %{ix86} ia64 ppc - consul ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - containerd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}} - containers ExclusiveArch: %{ldc_arches} - cpuid ExclusiveArch: %{ix86} x86_64 - cqrlog ExclusiveArch: %{fpc_arches} - crash ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - cri-tools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - criu ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - cryptlib ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le - cryptobone ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64 - daq ExclusiveArch: x86_64 aarch64 - darktable ExclusiveArch: x86_64 aarch64 ppc64le - dbus-sharp ExclusiveArch: %mono_arches - dbus-sharp-glib ExclusiveArch: %mono_arches - dbxtool ExclusiveArch: i386 x86_64 aarch64 - deepin-clone ExclusiveArch: x86_64 %{ix86} aarch64 - deepin-daemon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-dbus-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-gir-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - derelict ExclusiveArch: %{ldc_arches} - direnv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - discord-irc ExclusiveArch: %{nodejs_arches} noarch - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - dmtcp ExclusiveArch: %ix86 x86_64 aarch64 - docco ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - docker-anaconda-addon ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dolphin-emu ExclusiveArch: x86_64 armv7l aarch64 - douceur ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dssi-vst ExclusiveArch: %{ix86} x86_64 - dsymbol ExclusiveArch: %{ldc_arches} - dustmite ExclusiveArch: %{ldc_arches} - dyninst ExclusiveArch: %{ix86} x86_64 ppc64le - e3 ExclusiveArch: %{ix86} x86_64 - edac-utils ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - edb ExclusiveArch: %{ix86} x86_64 - edk2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: x86_64 aarch64 - efibootmgr ExclusiveArch: %{efi} - efivar ExclusiveArch: %{efi} - elasticdump ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - elk ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - embree ExclusiveArch: x86_64 - embree2 ExclusiveArch: x86_64 - envytools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - exciting ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{power64} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - exercism ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - expresso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - extlinux-bootloader ExclusiveArch: %{arm} aarch64 - fcitx-libpinyin ExclusiveArch: %{qt5_qtwebengine_arches} - fedora-dockerfiles ExclusiveArch: %{go_arches} - fedora-gnat-project-common ExclusiveArch: noarch %{GNAT_arches} - fence-virt ExclusiveArch: i686 x86_64 - fes ExclusiveArch: %{ix86} x86_64 - flannel ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - florist ExclusiveArch: %{GPRbuild_arches} - fluxcapacitor ExclusiveArch: %{ix86} x86_64 %{arm} - fpc ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 - freshmaker ExclusiveArch: %{ix86} x86_64 - frysk ExclusiveArch: %{ix86} x86_64 ppc64 - fst ExclusiveArch: i686 - fwts ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64} - fwupdate ExclusiveArch: %{efi} - ga ExclusiveArch: %{ix86} x86_64 - gbrainy ExclusiveArch: %mono_arches - gdata-sharp ExclusiveArch: %mono_arches - gdb-exploitable ExclusiveArch: x86_64 i386 ExclusiveArch: x86_64 noarch - gela-asis ExclusiveArch: %GPRbuild_arches - geoipupdate ExclusiveArch: %{go_arches} - ghdl ExclusiveArch: %{GNAT_arches} - gio-sharp ExclusiveArch: %mono_arches - gir-to-d ExclusiveArch: %{ldc_arches} - git-octopus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - giver ExclusiveArch: %{mono_arches} - gkeyfile-sharp ExclusiveArch: %mono_arches - gl3n ExclusiveArch: %{ldc_arches} - glibc32 ExclusiveArch: x86_64 ppc64 s390x - glibd ExclusiveArch: %{ldc_arches} - glusterd2 ExclusiveArch: %{go_arches} - gmqcc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - gnatcoll ExclusiveArch: %{GPRbuild_arches} - gnatcoll-bindings ExclusiveArch: %{GPRbuild_arches} - gnome-boxes ExclusiveArch: x86_64 - gnome-desktop-sharp ExclusiveArch: %mono_arches - gnome-do ExclusiveArch: %mono_arches - gnome-guitar ExclusiveArch: %{mono_arches} - gnome-keyring-sharp ExclusiveArch: %mono_arches - gnome-rdp ExclusiveArch: %{mono_arches} - gnome-sharp ExclusiveArch: %mono_arches - gnome-subtitles ExclusiveArch: %mono_arches - gnu-efi ExclusiveArch: %{efi} - go-bindata ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - go-compilers ExclusiveArch: %{go_arches} - go-i18n ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - godep ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - godotenv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang ExclusiveArch: %{golang_arches} - golang-deepin-dbus-factory ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-toml-test ExclusiveArch: %{go_arches} - golang-github-PuerkitoBio-goquery ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-purell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-urlesc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-RangelReale-osin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-RangelReale-osincli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-SeanDolphin-bqschema ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-SermoDigital-jose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-Shopify-sarama ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-andybalholm-cascadia ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-auth0-go-jwt-middleware ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bep-gitmap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bep-inflect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-client9-gospell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-codegangsta-negroni ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-danwakefield-fnmatch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dchest-cssmin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dchest-siphash ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dlclark-regexp2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-docker-libkv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-duosecurity-duo_api_golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-eknkc-amber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-flynn-go-shlex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fortytw2-leaktest ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fsouza-go-dockerclient ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fullsailor-pkcs7 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-glacjay-goini ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-errors-errors ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-macaron-inject ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gobuffalo-envy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-goraft-raft ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-css ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gosexy-gettext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hailocab-go-hostpool ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-hclog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-rootcerts ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-howeyc-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-inconshreveable-go-vhost ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-influxdb-influxdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jdkato-prose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jdkato-syllables ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jefferai-jsonx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-justinas-alice ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-klauspost-cpuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-knieriem-markdown ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kyokomi-emoji ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-lpabon-godbc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mgutz-ansi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mgutz-logxi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-michaelklishin-rabbit-hole ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-miekg-mmark ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-milochristiansen-axis2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-milochristiansen-lua ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-go-testing-interface ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-goamz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-montanaflynn-stats ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-muesli-smartcrop ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mvo5-goconfigparser ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mvo5-uboot-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-neurosnap-sentences ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-noahdesu-go-ceph ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-ojii-gettext.go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-opencontainers-specs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-openshift-go-json-rest ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-go-systemd ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-openshift-sdn ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-paulrosania-go-charset ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-prometheus-prometheus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-rackspace-gophercloud ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-rakyll-globalconf ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rakyll-pb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-rakyll-statik ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rasky-go-xdr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-remeh-sizedwaitgroup ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-samuel-go-zookeeper ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-shiena-ansicolor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shogo82148-go-shuffle ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shurcooL-sanitized_anchor_name ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-skarademir-naturalsort ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-skynetservices-skydns ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-smartystreets-go-aws-auth ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-spacejam-loghisto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-spacemonkeygo-openssl ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} ppc64le s390x} - golang-github-spaolacci-murmur3 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-fsync ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-nitro ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-sstarcher-go-okta ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stathat-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-stevvooe-resumable ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-streadway-amqp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stretchr-objx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-syndtr-gocapability ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-tent-http-link-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-tonnerre-golang-pretty ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-vaughan0-go-ini ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-vishvananda-netlink ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}} - golang-github-vishvananda-netns ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vjeantet-asn1-ber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-wsxiaoys-terminal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonpointer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonreference ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonschema ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xiang90-probing ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-xrash-smetrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-ace ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-gohtml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yvasiyarov-go-metrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-gorelic ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-newrelic_platform_go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-googlecode-gcfg ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-go-decimal-inf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-go-exp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-googlecode-log4go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-sqlite ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-uuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-go-check-check ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-go-macaroon-macaroon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-retry-v1 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-torproject-pluggable-transports-goptlib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golint ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gomtree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gotags ExclusiveArch: %{go_arches} - gotun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: x86_64 - gprbuild ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch} - gprolog ExclusiveArch: x86_64 %{ix86} ppc alpha - grafana ExclusiveArch: %{grafana_arches} - gsf-sharp ExclusiveArch: %mono_arches - gtk-sharp-beans ExclusiveArch: %mono_arches - gtk-sharp2 ExclusiveArch: %mono_arches - gtk-sharp3 ExclusiveArch: %{mono_arches} - gtkd ExclusiveArch: %{ldc_arches} - gudev-sharp ExclusiveArch: %mono_arches - hcc ExclusiveArch: x86_64 aarch64 - hedgewars ExclusiveArch: %{fpc_arches} - heketi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - hsakmt ExclusiveArch: x86_64 aarch64 - hub ExclusiveArch: %{go_arches} - hyena ExclusiveArch: %{mono_arches} - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 - icaro ExclusiveArch: %{ix86} %{arm} x86_64 noarch - ignition ExclusiveArch: x86_64 ppc64le aarch64 s390x ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - ikarus ExclusiveArch: %{ix86} - imvirt ExclusiveArch: %{ix86} x86_64 ia64 - indistarter ExclusiveArch: %{fpc_arches} - infinipath-psm ExclusiveArch: x86_64 - insect ExclusiveArch: %{nodejs_arches} noarch - intel-cmt-cat ExclusiveArch: x86_64 i686 i586 ExclusiveArch: x86_64 i686 i586 - intel-gmmlib ExclusiveArch: x86_64 i686 - ioport ExclusiveArch: %{ix86} x86_64 - ipmctl ExclusiveArch: x86_64 - ipw2100-firmware ExclusiveArch: noarch i386 x86_64 - ipw2200-firmware ExclusiveArch: noarch i386 x86_64 - ispc ExclusiveArch: %{arm} %{ix86} x86_64 - iucode-tool ExclusiveArch: %{ix86} x86_64 - iwyu ExclusiveArch: %{ix86} x86_64 - jake ExclusiveArch: %{nodejs_arches} noarch - jasmine-node ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - java-1.8.0-openjdk-aarch32 ExclusiveArch: %{arm} - josm ExclusiveArch: %{ix86} x86_64 - keepass ExclusiveArch: %{mono_arches} - kernel ExclusiveArch: %{all_x86} x86_64 s390x %{arm} aarch64 ppc64le - kicad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - knot-resolver ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - kompose ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x - kosmtik ExclusiveArch: %{nodejs_arches} noarch - kubernetes ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm} - latrace ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - lazarus ExclusiveArch: %{fpc_arches} - ldc ExclusiveArch: %{ldc_arches} - libbsr ExclusiveArch: %{power64} - libclc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - libcxl ExclusiveArch: %{power64} - libdparse ExclusiveArch: %{ldc_arches} - libflatarray ExclusiveArch: %{ix86} x86_64 - libica ExclusiveArch: s390 s390x - libipt ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - libmfx ExclusiveArch: %{ix86} x86_64 - libocxl ExclusiveArch: ppc64le - libpmemobj-cpp ExclusiveArch: x86_64 - libpsm2 ExclusiveArch: x86_64 - libquentier ExclusiveArch: %{qt5_qtwebengine_arches} - librtas ExclusiveArch: %{power64} - libseccomp ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x - libservicelog ExclusiveArch: ppc %{power64} - libsmbios ExclusiveArch: x86_64 %{ix86} - libunwind ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64 - libva-intel-hybrid-driver ExclusiveArch: %{ix86} x86_64 ia64 - libvmi ExclusiveArch: x86_64 - libvpd ExclusiveArch: %{power64} - libxsmm ExclusiveArch: x86_64 - libzfcphbaapi ExclusiveArch: s390 s390x - lodash ExclusiveArch: %{nodejs_arches} noarch - log4net ExclusiveArch: %mono_arches - lrmi ExclusiveArch: %{ix86} - lsvpd ExclusiveArch: %{power64} - luajit ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 s390x - luxcorerender ExclusiveArch: x86_64 - mactel-boot ExclusiveArch: x86_64 - manifest-tool ExclusiveArch: x86_64 aarch64 ppc64le s390x - mantle ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - matreshka ExclusiveArch: %GPRbuild_arches - maven-eclipse-plugin ExclusiveArch: %{ix86} x86_64 - maxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - mcelog ExclusiveArch: i686 x86_64 - mediaconch ExclusiveArch: %{qt5_qtwebengine_arches} - mellowplayer ExclusiveArch: %{qt5_qtwebengine_arches} - memkind ExclusiveArch: x86_64 - memtest86+ ExclusiveArch: %{ix86} x86_64 - microcode_ctl ExclusiveArch: %{ix86} x86_64 - micropython ExclusiveArch: %{arm} %{ix86} x86_64 - mine_detector ExclusiveArch: %{GPRbuild_arches} - minetest ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mingw-wine-gecko ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - mkbootdisk ExclusiveArch: %{ix86} sparc sparc64 x86_64 - mnemosyne ExclusiveArch: noarch %{qt5_qtwebengine_arches} - mocha ExclusiveArch: %{nodejs_arches} noarch - mod_mono ExclusiveArch: %mono_arches - module-build-service ExclusiveArch: %{ix86} x86_64 noarch - mokutil ExclusiveArch: %{ix86} x86_64 aarch64 - mono ExclusiveArch: %mono_arches - mono-addins ExclusiveArch: %mono_arches - mono-basic ExclusiveArch: %{mono_arches} - mono-bouncycastle ExclusiveArch: %mono_arches - mono-cecil ExclusiveArch: %mono_arches - mono-cecil-flowanalysis ExclusiveArch: %mono_arches - mono-debugger ExclusiveArch: %ix86 x86_64 - mono-reflection ExclusiveArch: %mono_arches - mono-tools ExclusiveArch: %mono_arches - mono-zeroconf ExclusiveArch: %mono_arches - monobristol ExclusiveArch: %{mono_arches} - monodevelop ExclusiveArch: %mono_arches - monodevelop-debugger-gdb ExclusiveArch: %{mono_arches} - monosim ExclusiveArch: %mono_arches - mozilla-iot-gateway ExclusiveArch: %{nodejs_arches} noarch - mozilla-iot-gateway-addon-node ExclusiveArch: %{nodejs_arches} noarch - mrrescue ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - msgpack-d ExclusiveArch: %{ldc_arches} - msr-tools ExclusiveArch: %{ix86} x86_64 - mustache-d ExclusiveArch: %{ldc_arches} - mysql-connector-net ExclusiveArch: %{mono_arches} - nacl-arm-binutils ExclusiveArch: x86_64 - nacl-binutils ExclusiveArch: x86_64 - nacl-gcc ExclusiveArch: x86_64 - nacl-newlib ExclusiveArch: x86_64 - nant ExclusiveArch: %mono_arches - nbc ExclusiveArch: %{fpc_arches} - nbdkit ExclusiveArch: x86_64 - ndesk-dbus ExclusiveArch: %{mono_arches} - ndesk-dbus-glib ExclusiveArch: %{mono_arches} - newtonsoft-json ExclusiveArch: %{mono_arches} - nim ExclusiveArch: %{nim_arches} - node-gyp ExclusiveArch: %{nodejs_arches} noarch - nodejs ExclusiveArch: %{nodejs_arches} - nodejs-Base64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-abbrev ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-dynamic-import ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn-jsx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-object-spread ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-add-stream ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-after ExclusiveArch: %{nodejs_arches} noarch - nodejs-agentkeepalive ExclusiveArch: %{nodejs_arches} noarch - nodejs-ain2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-align-text ExclusiveArch: %{nodejs_arches} noarch - nodejs-alter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblack ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgcyan ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bggreen ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgmagenta ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgred ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgwhite ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgyellow ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-black ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-blue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bold ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-cyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-dim ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-escapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-font ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-gray ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-green ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-grey ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-hidden ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-inverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-italic ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-magenta ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-red ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-reset ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-strikethrough ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-styles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-underline ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-white ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-wrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-yellow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansicolors ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansidiff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansistyles ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ap ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-field ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-archiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-archiver-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-archy ExclusiveArch: %{nodejs_arches} noarch - nodejs-are-we-there-yet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-argparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-argsparser ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-exclude ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-union ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-buffer-from-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-differ ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-find ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-find-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-foreach ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-ify ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-union ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-uniq ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-unique ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arraybuffer-dot-slice ExclusiveArch: %{nodejs_arches} noarch - nodejs-arraybuffer-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-arrify ExclusiveArch: %{nodejs_arches} noarch - nodejs-asap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ascii-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-ascli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-asn1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-assert-plus ExclusiveArch: %{nodejs_arches} noarch - nodejs-assertion-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-assume ExclusiveArch: %{nodejs_arches} noarch - nodejs-ast-traverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ast-types ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-astral ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-angular-annotate ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-pass ExclusiveArch: %{nodejs_arches} noarch - nodejs-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-async-arrays ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-limiter ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-queue ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-some ExclusiveArch: %{nodejs_arches} noarch - nodejs-asynckit ExclusiveArch: %{nodejs_arches} noarch - nodejs-atob ExclusiveArch: %{nodejs_arches} noarch - nodejs-auto-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-autoresolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-ava-init ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-aws-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws-sign2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-code-frame ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-messages ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-plugin-syntax-async-functions ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-plugin-syntax-async-generators ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-runtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-babylon ExclusiveArch: %{nodejs_arches} noarch - nodejs-backbone ExclusiveArch: %{nodejs_arches} noarch - nodejs-backoff ExclusiveArch: %{nodejs_arches} noarch - nodejs-balanced-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-option ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-plugins ExclusiveArch: %{nodejs_arches} noarch - nodejs-base32-encode ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-arraybuffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64id ExclusiveArch: %{nodejs_arches} noarch - nodejs-bash-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-basic-auth-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-batch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bcrypt ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-bcryptjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-beeper ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-benchmark ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-than-before ExclusiveArch: %{nodejs_arches} noarch - nodejs-bignumber-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-bind-obj-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-bindings ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bit-mask ExclusiveArch: %{nodejs_arches} noarch - nodejs-bl ExclusiveArch: %{nodejs_arches} noarch - nodejs-blob ExclusiveArch: %{nodejs_arches} noarch - nodejs-block-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-bluebird ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-body-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-boolbase ExclusiveArch: %{nodejs_arches} noarch - nodejs-boom ExclusiveArch: %{nodejs_arches} noarch - nodejs-brace-expansion ExclusiveArch: %{nodejs_arches} noarch - nodejs-braces ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-breakable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-browser-stdout ExclusiveArch: %{nodejs_arches} noarch - nodejs-bson ExclusiveArch: %{nodejs_arches} noarch - nodejs-buble ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buf-compare ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-crc32 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-buffertools ExclusiveArch: %{nodejs_arches} - nodejs-bufferutil ExclusiveArch: %{nodejs_arches} - nodejs-builtin-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-builtins ExclusiveArch: %{nodejs_arches} noarch - nodejs-bundle-dependencies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-burrito ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-busboy ExclusiveArch: %{nodejs_arches} noarch - nodejs-byline ExclusiveArch: %{nodejs_arches} noarch - nodejs-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cache-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-caching-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-call-delayed ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-matcher ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-me-maybe ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-callback-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsites ExclusiveArch: %{nodejs_arches} noarch - nodejs-camel-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-caniuse-db ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-carrier ExclusiveArch: %{nodejs_arches} noarch - nodejs-caseless ExclusiveArch: %{nodejs_arches} noarch - nodejs-center-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-as-promised ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-cheerio ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-connect-middleware ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-json-schema ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-oauth2orize-grant ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-spies-next ExclusiveArch: %{nodejs_arches} noarch - nodejs-chainer ExclusiveArch: %{nodejs_arches} noarch - nodejs-chalk ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-change-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-char-spinner ExclusiveArch: %{nodejs_arches} noarch - nodejs-character-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-chardet ExclusiveArch: %{nodejs_arches} noarch - nodejs-charenc ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-charm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-check-env ExclusiveArch: %{nodejs_arches} noarch - nodejs-check-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-cheerio ExclusiveArch: %{nodejs_arches} noarch - nodejs-child-process-close ExclusiveArch: %{nodejs_arches} noarch - nodejs-chmodr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chownr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chroma-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-chrono ExclusiveArch: %{nodejs_arches} noarch - nodejs-ci-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-circular-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-cjson ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-class-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-clean-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clean-yaml-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clear-require ExclusiveArch: %{nodejs_arches} noarch - nodejs-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-spinner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-cliui ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-stats ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-closure-compiler ExclusiveArch: %{nodejs_arches} noarch - nodejs-cls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cmd-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-co ExclusiveArch: %{nodejs_arches} noarch - nodejs-co-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-co-with-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coa ExclusiveArch: %{nodejs_arches} noarch - nodejs-code-point-at ExclusiveArch: %{nodejs_arches} noarch - nodejs-codemirror ExclusiveArch: %{nodejs_arches} noarch - nodejs-coffee-coverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-collection-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-collections ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-color-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-colour ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-columnify ExclusiveArch: %{nodejs_arches} noarch - nodejs-combined-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-commander ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-common-path-prefix ExclusiveArch: %{nodejs_arches} noarch - nodejs-commondir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-commoner ExclusiveArch: %{nodejs_arches} noarch - nodejs-commonmark ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compare-func ExclusiveArch: %{nodejs_arches} noarch - nodejs-compare-versions ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-emitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-inherit ExclusiveArch: %{nodejs_arches} noarch - nodejs-compress-commons ExclusiveArch: %{nodejs_arches} noarch - nodejs-compressible ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compression ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-map ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-config-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-livereload ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-console-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-console-dot-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-console-group ExclusiveArch: %{nodejs_arches} noarch - nodejs-consolemd ExclusiveArch: %{nodejs_arches} noarch - nodejs-constant-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-constantinople ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-disposition ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-conventional-changelog-angular ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-atom ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-codemirror ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-core ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-conventional-changelog-ember ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-eslint ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-express ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-jquery ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-jscs ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-jshint ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-preset-loader ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-filter ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-recommended-bump ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-hex ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-jar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookiejar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-copy-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-core-assert ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-util-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-couch-login ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coveralls ExclusiveArch: %{nodejs_arches} noarch - nodejs-crc ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crc32-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-cross-spawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cross-spawn-async ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crypt ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cryptiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-csrf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-select ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-what ExclusiveArch: %{nodejs_arches} noarch - nodejs-csscomb-core ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cssom ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csurf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-generate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-spectrum ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ctype ExclusiveArch: %{nodejs_arches} noarch - nodejs-currently-unhandled ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cycle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cyclist ExclusiveArch: %{nodejs_arches} noarch - nodejs-d ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dargs ExclusiveArch: %{nodejs_arches} noarch - nodejs-dashdash ExclusiveArch: %{nodejs_arches} noarch - nodejs-data-uri-to-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-date-now ExclusiveArch: %{nodejs_arches} noarch - nodejs-dateformat ExclusiveArch: %{nodejs_arches} noarch - nodejs-death ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-debug-fabulous ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-debuglog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-decamelize ExclusiveArch: %{nodejs_arches} noarch - nodejs-decamelize-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-decimal-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-dedent ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-eql ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deep-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-default-require-extensions ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-default-resolution ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defaults ExclusiveArch: %{nodejs_arches} noarch - nodejs-defence ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defence-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-properties ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-defined ExclusiveArch: %{nodejs_arches} noarch - nodejs-defs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-degenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-del ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delayed-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-delegates ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delete ExclusiveArch: %{nodejs_arches} noarch - nodejs-dep-graph ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-depd ExclusiveArch: %{nodejs_arches} noarch - nodejs-deprecated ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-newline ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-detective ExclusiveArch: %{nodejs_arches} noarch - nodejs-dezalgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-dicer ExclusiveArch: %{nodejs_arches} noarch - nodejs-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dirty-chai ExclusiveArch: %{nodejs_arches} noarch - nodejs-discord-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-docopt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-doctrine ExclusiveArch: %{nodejs_arches} noarch - nodejs-dom-serializer ExclusiveArch: %{nodejs_arches} noarch - nodejs-domelementtype ExclusiveArch: %{nodejs_arches} noarch - nodejs-domhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-domutils ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-prop ExclusiveArch: %{nodejs_arches} noarch - nodejs-dotfile-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dreamopt ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-dryice ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-duplexer ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexer2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-duplexify ExclusiveArch: %{nodejs_arches} noarch - nodejs-duration ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-ebnf-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-echomd ExclusiveArch: %{nodejs_arches} noarch - nodejs-editor ExclusiveArch: %{nodejs_arches} noarch - nodejs-ee-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-ejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-emojione ExclusiveArch: %{nodejs_arches} noarch - nodejs-empty-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-encodeurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-end-of-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-client ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-entities ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-ex ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-errorhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-abstract ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-to-primitive ExclusiveArch: %{nodejs_arches} noarch - nodejs-es5-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es5-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-iterator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-promisify ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-set ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escallmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-html ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-regexp-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escape-string-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-escodegen ExclusiveArch: %{nodejs_arches} noarch - nodejs-escope ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower-location-detector ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-fb ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-harmony-jscs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espurify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esrecurse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse-fb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estree-walker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esutils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-etag ExclusiveArch: %{nodejs_arches} noarch - nodejs-event-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-eventemitter2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-events-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-everything-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-execa ExclusiveArch: %{nodejs_arches} noarch - nodejs-exit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-brackets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-tilde ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extended-emitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extsprintf ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-eyes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fake ExclusiveArch: %{nodejs_arches} noarch - nodejs-fancy-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-far ExclusiveArch: %{nodejs_arches} noarch - nodejs-fast-levenshtein ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fastfall ExclusiveArch: %{nodejs_arches} noarch - nodejs-faucet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-faye-websocket ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fd ExclusiveArch: %{nodejs_arches} noarch - nodejs-fg-lodash ExclusiveArch: %{nodejs_arches} noarch - nodejs-figures ExclusiveArch: %{nodejs_arches} noarch - nodejs-file-entry-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-sync-cmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-uri-to-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-filelist ExclusiveArch: %{nodejs_arches} noarch - nodejs-filename-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fileset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fill-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-fill-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-finalhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-find-cache-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-find-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-findup-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-first-chunk-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flagged-respawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flat-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flot ExclusiveArch: %{nodejs_arches} noarch - nodejs-flush-write-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fmix ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-dot-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-follow-redirects ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-in ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-for-own ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-foreach ExclusiveArch: %{nodejs_arches} noarch - nodejs-foreground-child ExclusiveArch: %{nodejs_arches} noarch - nodejs-forever-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-form-data ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-formatio ExclusiveArch: %{nodejs_arches} noarch - nodejs-formidable ExclusiveArch: %{nodejs_arches} noarch - nodejs-forwarded ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fragment-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-freetree ExclusiveArch: %{nodejs_arches} noarch - nodejs-fresh ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-dot-notify ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-cached ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fs-ext ExclusiveArch: %{nodejs_arches} - nodejs-fs-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-temp ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-vacuum ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-write-stream-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-ignore ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-npm ExclusiveArch: %{nodejs_arches} noarch - nodejs-ftp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-function-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-function-loop ExclusiveArch: %{nodejs_arches} noarch - nodejs-gauge ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gaze ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gdal ExclusiveArch: %{nodejs_arches} - nodejs-generate-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-generate-object-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-generic-pool ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-pkg-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-stdin ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-uri ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-getobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-git-dummy-commit ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-raw-commits ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-remote-origin-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-semver-tags ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-tails ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gitconfiglocal ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-username-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob-base ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-expand ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-parent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-to-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-global-modules ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-global-prefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globby ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globule ExclusiveArch: %{nodejs_arches} noarch - nodejs-glogg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gnode ExclusiveArch: %{nodejs_arches} noarch - nodejs-gonzales-pe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-graceful-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-graceful-readlink ExclusiveArch: %{nodejs_arches} noarch - nodejs-grip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-growl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-angular-templates ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-banner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-cli ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-compare-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-clean ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-concat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-cssmin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-htmlmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-internal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-less ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-requirejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-uglify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-watch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-git-authors ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-init ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-known-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-lib-contrib ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-sed ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-simple-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-process ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-gulp-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulp-ng-classify ExclusiveArch: %{nodejs_arches} noarch - nodejs-gulp-util ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gzip-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-handle-thing ExclusiveArch: %{nodejs_arches} noarch - nodejs-handlebars ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-har-validator ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-has ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-flag ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-symbols ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-unicode ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-yarn ExclusiveArch: %{nodejs_arches} noarch - nodejs-hash_file ExclusiveArch: %{nodejs_arches} noarch - nodejs-hawk ExclusiveArch: %{nodejs_arches} noarch - nodejs-heap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hex-to-array-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-highlight-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-historic-readline ExclusiveArch: %{nodejs_arches} noarch - nodejs-hock ExclusiveArch: %{nodejs_arches} noarch - nodejs-hoek ExclusiveArch: %{nodejs_arches} noarch - nodejs-homedir-polyfill ExclusiveArch: %{nodejs_arches} noarch - nodejs-hook-std ExclusiveArch: %{nodejs_arches} noarch - nodejs-hooker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hosted-git-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-hsluv ExclusiveArch: %{nodejs_arches} noarch - nodejs-html-minifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-htmlparser2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-deceiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-errors ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-http-signature ExclusiveArch: %{nodejs_arches} noarch - nodejs-http2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-https-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-humanize-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-i ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-i18n-transform ExclusiveArch: %{nodejs_arches} noarch - nodejs-i2c ExclusiveArch: %{nodejs_arches} - nodejs-iconv ExclusiveArch: %{nodejs_arches} - nodejs-iconv-lite ExclusiveArch: %{nodejs_arches} noarch - nodejs-iferr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ignore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-image-size ExclusiveArch: %{nodejs_arches} noarch - nodejs-immutable ExclusiveArch: %{nodejs_arches} noarch - nodejs-import-local ExclusiveArch: %{nodejs_arches} noarch - nodejs-imul ExclusiveArch: %{nodejs_arches} noarch - nodejs-imurmurhash ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-indent-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-inflight ExclusiveArch: %{nodejs_arches} noarch - nodejs-info-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-inherits ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherits1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-ini ExclusiveArch: %{nodejs_arches} noarch - nodejs-init-package-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-inline-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-install ExclusiveArch: %{nodejs_arches} noarch - nodejs-int64-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-intercept-require ExclusiveArch: %{nodejs_arches} noarch - nodejs-interpret ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-invert-kv ExclusiveArch: %{nodejs_arches} noarch - nodejs-ip ExclusiveArch: %{nodejs_arches} noarch - nodejs-ipaddr-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-irc-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-irc-formatting ExclusiveArch: %{nodejs_arches} noarch - nodejs-irc-upd ExclusiveArch: %{nodejs_arches} noarch - nodejs-irregular-plurals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-absolute ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-accessor-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrayish ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrow-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-boolean-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-builtin-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-callable ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-data-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-date-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-dotfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-equal-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-extendable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-finite ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-fullwidth-code-point ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-generator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-my-json-valid ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-negated-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-number ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-number-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-odd ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-path-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-in-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-inside ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-plain-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-plain-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-primitive ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-registered ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-relative ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-subset ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-text-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-typedarray ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-unc-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-valid-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-valid-instance ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-windows ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isarray ExclusiveArch: %{nodejs_arches} noarch - nodejs-isexe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-iso8601 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isodate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-coverage ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-hook ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-report ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-lib-source-maps ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul-reports ExclusiveArch: %{nodejs_arches} noarch - nodejs-jade ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-growl-reporter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-reporters ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jest-mock ExclusiveArch: %{nodejs_arches} noarch - nodejs-jison ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jison-lex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jju ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joose ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-namespace-depended ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-simplerequest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-base64 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-string-escape ExclusiveArch: %{nodejs_arches} noarch - nodejs-js-tokens ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-yaml ExclusiveArch: %{nodejs_arches} noarch - nodejs-jschardet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jscoverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jshint ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-localizer ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-parse-helpfulerror ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stable-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stringify-safe ExclusiveArch: %{nodejs_arches} noarch - nodejs-json3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonm ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonpointer ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonpointer-dot-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonselect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jwt-simple ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keep-alive-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-keygrip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keypress ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-kind-of ExclusiveArch: %{nodejs_arches} noarch - nodejs-klaw ExclusiveArch: %{nodejs_arches} noarch - nodejs-kuler2gpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-latest-version ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazy-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazystream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lcid ExclusiveArch: %{nodejs_arches} noarch - nodejs-lcov-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-leaflet ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-formbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-hash ExclusiveArch: %{nodejs_arches} noarch - nodejs-leche ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-left-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-less ExclusiveArch: %{nodejs_arches} noarch - nodejs-less-plugin-clean-css ExclusiveArch: %{nodejs_arches} noarch - nodejs-levn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lex-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-libpq ExclusiveArch: %{nodejs_arches} - nodejs-libxmljs ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-line-numbers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-line-reader ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linkify-it ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-grunt-tasks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-locate-character ExclusiveArch: %{nodejs_arches} noarch - nodejs-locate-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-lockfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-log-driver ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-ok ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-symbols ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-lolex ExclusiveArch: %{nodejs_arches} noarch - nodejs-long ExclusiveArch: %{nodejs_arches} noarch - nodejs-longest ExclusiveArch: %{nodejs_arches} noarch - nodejs-loophole ExclusiveArch: %{nodejs_arches} noarch - nodejs-loud-rejection ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-lower-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ltx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-magic-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-make-arrow-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-generator-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-makedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-makeerror ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik ExclusiveArch: %{nodejs_arches} - nodejs-mapnik-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik-vector-tile ExclusiveArch: %{nodejs_arches} noarch - nodejs-markdown ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-markdown-it-testgen ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-matched ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-max-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-maxmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mbtiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-md5 ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-hex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-o-matic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mdn-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-mdurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-media-typer ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoizee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-memwatch-next ExclusiveArch: %{nodejs_arches} - nodejs-meow ExclusiveArch: %{nodejs_arches} noarch - nodejs-merge-descriptors ExclusiveArch: %{nodejs_arches} noarch - nodejs-merge-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-metascript ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-method-override ExclusiveArch: %{nodejs_arches} noarch - nodejs-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-micromatch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-millstone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mime-db ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-mimeparse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minimalistic-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minimist-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-minipass ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkfiletree ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-bin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-modify-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-module-not-found-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-moment ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-moment-timezone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb-core ExclusiveArch: %{nodejs_arches} noarch - nodejs-monocle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-morgan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-muffin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiline ExclusiveArch: %{nodejs_arches} noarch - nodejs-multimatch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiparty ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multipipe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-murmur-32 ExclusiveArch: %{nodejs_arches} noarch - nodejs-mustache ExclusiveArch: %{nodejs_arches} noarch - nodejs-mutate-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-mute-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-mv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mysql ExclusiveArch: %{nodejs_arches} noarch - nodejs-mz ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-nan0 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-nanomatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-nanomsg ExclusiveArch: %{nodejs_arches} - nodejs-nanoseconds ExclusiveArch: %{nodejs_arches} noarch - nodejs-ncp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-needle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-negative-zero ExclusiveArch: %{nodejs_arches} noarch - nodejs-negotiator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-net-browserify-alt ExclusiveArch: %{nodejs_arches} noarch - nodejs-netmask ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-next ExclusiveArch: %{nodejs_arches} noarch - nodejs-next-tick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ng-classify ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-expat ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-node-int64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-static ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-stringprep ExclusiveArch: %{nodejs_arches} - nodejs-node-uuid ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nomnom ExclusiveArch: %{nodejs_arches} noarch - nodejs-noncharacters ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt-usage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-noptify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-normalize-git-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-package-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-cache-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-install-checks ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-package-arg ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-registry-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-run-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-user-validate ExclusiveArch: %{nodejs_arches} noarch - nodejs-npmlog ExclusiveArch: %{nodejs_arches} noarch - nodejs-nth-check ExclusiveArch: %{nodejs_arches} noarch - nodejs-number-is-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-numeral ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth2orize ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-assign ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-dot-assign ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-dot-entries ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-omit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-pick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-inspect ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-observable-to-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-obuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-okay ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-finished ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-headers ExclusiveArch: %{nodejs_arches} noarch - nodejs-once ExclusiveArch: %{nodejs_arches} noarch - nodejs-onetime ExclusiveArch: %{nodejs_arches} noarch - nodejs-only-shallow ExclusiveArch: %{nodejs_arches} noarch - nodejs-oop ExclusiveArch: %{nodejs_arches} noarch - nodejs-opal-runtime ExclusiveArch: %{nodejs_arches} noarch - nodejs-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opener ExclusiveArch: %{nodejs_arches} noarch - nodejs-opn ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-optionator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-optjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opts ExclusiveArch: %{nodejs_arches} noarch - nodejs-orchestrator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ordered-read-streams ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-os-homedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-locale ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-tmpdir ExclusiveArch: %{nodejs_arches} noarch - nodejs-osenv ExclusiveArch: %{nodejs_arches} noarch - nodejs-output-file-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-own-or ExclusiveArch: %{nodejs_arches} noarch - nodejs-own-or-env ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-finally ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-locate ExclusiveArch: %{nodejs_arches} noarch - nodejs-pac-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pac-resolver ExclusiveArch: %{nodejs_arches} noarch - nodejs-package ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-packaging ExclusiveArch: %{nodejs_arches} noarch - nodejs-packet-reader ExclusiveArch: %{nodejs_arches} noarch - nodejs-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pad-left ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-paperboy ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parallel-transform ExclusiveArch: %{nodejs_arches} noarch - nodejs-param-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-github-repo-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parse-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-passwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-parsejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseqs ExclusiveArch: %{nodejs_arches} noarch - nodejs-parserlib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parseuri ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pascal-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-pascalcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-http-bearer ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2-client-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-array ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-dirname ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-exists ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-absolute ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-inside ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-key ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-parse ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-to-regexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-path2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pathval ExclusiveArch: %{nodejs_arches} noarch - nodejs-pause ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pbkdf2-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-pedding ExclusiveArch: %{nodejs_arches} noarch - nodejs-pend ExclusiveArch: %{nodejs_arches} noarch - nodejs-pff ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-connection-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-cursor ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-escape ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-int8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-native ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-pgpass ExclusiveArch: %{nodejs_arches} noarch - nodejs-pify ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkg-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkginfo ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-platform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-plur ExclusiveArch: %{nodejs_arches} noarch - nodejs-portscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-posix-character-classes ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-bytea ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-date ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-interval ExclusiveArch: %{nodejs_arches} noarch - nodejs-precond ExclusiveArch: %{nodejs_arches} noarch - nodejs-prelude-ls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-preserve ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-hrtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-pretty-time ExclusiveArch: %{nodejs_arches} noarch - nodejs-prism-media ExclusiveArch: %{nodejs_arches} noarch - nodejs-private ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-process-nextick-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-proclaim ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promises-aplus-tests ExclusiveArch: %{nodejs_arches} noarch - nodejs-prompt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promzard ExclusiveArch: %{nodejs_arches} noarch - nodejs-propagate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-propget ExclusiveArch: %{nodejs_arches} noarch - nodejs-proto-list ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy-addr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proxyquire ExclusiveArch: %{nodejs_arches} noarch - nodejs-pruddy-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-pseudomap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pubcontrol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pump ExclusiveArch: %{nodejs_arches} noarch - nodejs-pumpify ExclusiveArch: %{nodejs_arches} noarch - nodejs-q ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-q-io ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qs ExclusiveArch: %{nodejs_arches} noarch - nodejs-qtdatastream ExclusiveArch: %{nodejs_arches} noarch - nodejs-queue-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-quick-lru ExclusiveArch: %{nodejs_arches} noarch - nodejs-qunit-extras ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qunitjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-rainbowsocks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-random-bytes ExclusiveArch: %{nodejs_arches} noarch - nodejs-random-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-randomatic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-range-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-raw-body ExclusiveArch: %{nodejs_arches} noarch - nodejs-re-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-all-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-cmd-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-dir-files ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-installed ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-json-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-readable-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-readdir-enhanced ExclusiveArch: %{nodejs_arches} noarch - nodejs-readdir-scoped-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-readdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-realize-package-specifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-recast ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rechoir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-redent ExclusiveArch: %{nodejs_arches} noarch - nodejs-reduce-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-regex-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regex-not ExclusiveArch: %{nodejs_arches} noarch - nodejs-relateurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-remove-trailing-separator ExclusiveArch: %{nodejs_arches} noarch - nodejs-repeat-element ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeat-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeating ExclusiveArch: %{nodejs_arches} noarch - nodejs-repl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace-require-self ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-request ExclusiveArch: %{nodejs_arches} noarch - nodejs-requestretry ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-cs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-require-directory ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-inject ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-main-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-relative ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-uncached ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-yaml ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-requirejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-cwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-pkg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-response-time ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resumer ExclusiveArch: %{nodejs_arches} noarch - nodejs-ret ExclusiveArch: %{nodejs_arches} noarch - nodejs-retry ExclusiveArch: %{nodejs_arches} noarch - nodejs-reusify ExclusiveArch: %{nodejs_arches} noarch - nodejs-revalidator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rewire ExclusiveArch: %{nodejs_arches} noarch - nodejs-rfile ExclusiveArch: %{nodejs_arches} noarch - nodejs-rhea ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-right-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-rimraf ExclusiveArch: %{nodejs_arches} noarch - nodejs-rndm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rollup ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rollup-plugin-buble ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-commonjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-node-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-plugin-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-rollup-pluginutils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ronn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-run-parallel-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-runforcover ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safe-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-safe-json-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safe-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-safecb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-samsam ExclusiveArch: %{nodejs_arches} noarch - nodejs-sauce-tunnel ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sax ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-scmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-secure-random ExclusiveArch: %{nodejs_arches} noarch - nodejs-seedrandom ExclusiveArch: %{nodejs_arches} noarch - nodejs-select-hose ExclusiveArch: %{nodejs_arches} noarch - nodejs-semver ExclusiveArch: %{nodejs_arches} noarch - nodejs-send ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sentence-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-sentiment ExclusiveArch: %{nodejs_arches} noarch - nodejs-sequencify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serialize-error ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-static ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-server-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-blocking ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-getter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-set-immediate ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-immediate-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-setimmediate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-setprototypeof ExclusiveArch: %{nodejs_arches} noarch - nodejs-sha ExclusiveArch: %{nodejs_arches} noarch - nodejs-shallow-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-command ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-shelljs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-shelljs-nodecli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-format ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-http ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-showdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-sift ExclusiveArch: %{nodejs_arches} noarch - nodejs-sigmund ExclusiveArch: %{nodejs_arches} noarch - nodejs-signal-exit ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-asyncify ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-fmt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-single-line-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon-chai ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sinon-restore ExclusiveArch: %{nodejs_arches} noarch - nodejs-slash ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sliced ExclusiveArch: %{nodejs_arches} noarch - nodejs-slide ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-smart-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-snake-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture-set ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-snekfetch ExclusiveArch: %{nodejs_arches} noarch - nodejs-snockets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sntp ExclusiveArch: %{nodejs_arches} noarch - nodejs-socket-dot-io-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-socks-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-socks-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sort-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-sorted-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-fixtures ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-sparkles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-spawn-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-spawn-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-correct ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-exceptions ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-license-ids ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-speedometer ExclusiveArch: %{nodejs_arches} noarch - nodejs-split ExclusiveArch: %{nodejs_arches} noarch - nodejs-split-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-split2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-sqlite3 ExclusiveArch: %{nodejs_arches} - nodejs-srs ExclusiveArch: %{nodejs_arches} noarch - nodejs-ssri ExclusiveArch: %{nodejs_arches} noarch - nodejs-st ExclusiveArch: %{nodejs_arches} noarch - nodejs-stable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-trace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-utils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-static-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-static-favicon ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-statuses ExclusiveArch: %{nodejs_arches} noarch - nodejs-std-mocks ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-combiner ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-consume ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-counter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-pair ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-replace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-shift ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-spigot ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-streamsearch ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamsink ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamtest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-repeat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-trim ExclusiveArch: %{nodejs_arches} noarch - nodejs-string-width ExclusiveArch: %{nodejs_arches} noarch - nodejs-string_decoder ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringmap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-ansi ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-bom-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-color ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-eof ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-json-comments ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strong-log-transformer ExclusiveArch: %{nodejs_arches} noarch - nodejs-stylus ExclusiveArch: %{nodejs_arches} noarch - nodejs-success-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-superagent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-supertest ExclusiveArch: %{nodejs_arches} noarch - nodejs-supervisor ExclusiveArch: %{nodejs_arches} noarch - nodejs-supports-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-suspend ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-swap-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-symbol-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-mocha-reporter ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-out ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-spec ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tape ExclusiveArch: %{nodejs_arches} noarch - nodejs-tapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-pack ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp-write ExclusiveArch: %{nodejs_arches} noarch - nodejs-tempfile ExclusiveArch: %{nodejs_arches} noarch - nodejs-temporary ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-cordovajs ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-liferay ExclusiveArch: %{nodejs_arches} noarch - nodejs-terst ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-test-exclude ExclusiveArch: %{nodejs_arches} noarch - nodejs-testdata-w3c-json-form ExclusiveArch: %{nodejs_arches} noarch - nodejs-testjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testswarm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testutil ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-extensions ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-thenify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thenify-all ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-through ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-through2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-through2-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thunkify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tildify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tilejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive-mapnik ExclusiveArch: %{nodejs_arches} noarch - nodejs-tiletype ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-diff ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-stamp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-timekeeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-timers-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tiny-lr-fork ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tippex ExclusiveArch: %{nodejs_arches} noarch - nodejs-title-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-tlds ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmp ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-absolute-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-object-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-regex-range ExclusiveArch: %{nodejs_arches} noarch - nodejs-touch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tough-cookie ExclusiveArch: %{nodejs_arches} noarch - nodejs-tracejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-transformers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-traverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-treeify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tressa ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-trim-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim-off-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trivial-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-try-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-try-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-tryor ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tsame ExclusiveArch: %{nodejs_arches} noarch - nodejs-tslib ExclusiveArch: %{nodejs_arches} noarch - nodejs-tsscmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tunnel-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-tv4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-tweetnacl ExclusiveArch: %{nodejs_arches} noarch - nodejs-tweetnacl-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-check ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-type-detect ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-name ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-typeahead.js ExclusiveArch: %{nodejs_arches} noarch - nodejs-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-uc-dot-micro ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uglify-to-browserify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid-number ExclusiveArch: %{nodejs_arches} noarch - nodejs-uid-safe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ultron ExclusiveArch: %{nodejs_arches} noarch - nodejs-umask ExclusiveArch: %{nodejs_arches} noarch - nodejs-unc-path-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore-dot-logger ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unicode-length ExclusiveArch: %{nodejs_arches} noarch - nodejs-union-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-unique-filename ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-slug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-unpipe ExclusiveArch: %{nodejs_arches} noarch - nodejs-unset-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-uri-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-urix ExclusiveArch: %{nodejs_arches} noarch - nodejs-url2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-use ExclusiveArch: %{nodejs_arches} noarch - nodejs-user-home ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-utfx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-deprecate ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-inspect ExclusiveArch: %{nodejs_arches} noarch - nodejs-utile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utilities ExclusiveArch: %{nodejs_arches} noarch - nodejs-utils-merge ExclusiveArch: %{nodejs_arches} noarch - nodejs-uuid ExclusiveArch: %{nodejs_arches} noarch - nodejs-vali-date ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-validate-npm-package-license ExclusiveArch: %{nodejs_arches} noarch - nodejs-validate-npm-package-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-vary ExclusiveArch: %{nodejs_arches} noarch - nodejs-vasync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-verror ExclusiveArch: %{nodejs_arches} noarch - nodejs-vhost ExclusiveArch: %{nodejs_arches} noarch - nodejs-vinyl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vlq ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-vow-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vows ExclusiveArch: %{nodejs_arches} noarch - nodejs-walkdir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-walker ExclusiveArch: %{nodejs_arches} noarch - nodejs-ware ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-warning-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-watchit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-watershed ExclusiveArch: %{nodejs_arches} noarch - nodejs-wbuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-wcwidth ExclusiveArch: %{nodejs_arches} noarch - nodejs-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-websocket-driver ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-when ExclusiveArch: %{nodejs_arches} noarch - nodejs-whet-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-which ExclusiveArch: %{nodejs_arches} noarch - nodejs-win-spawn ExclusiveArch: %{nodejs_arches} noarch - nodejs-window-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-winston ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-with ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wolfy87-eventemitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-woothee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wordwrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrap-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-wrap-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrappy ExclusiveArch: %{nodejs_arches} noarch - nodejs-write ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-write-file-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-ws ExclusiveArch: %{nodejs_arches} noarch - nodejs-xdg-basedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-xml2js ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlhttprequest ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlhttprequest-ssl ExclusiveArch: %{nodejs_arches} noarch - nodejs-xregexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-xtend ExclusiveArch: %{nodejs_arches} noarch - nodejs-y18n ExclusiveArch: %{nodejs_arches} noarch - nodejs-yallist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yapool ExclusiveArch: %{nodejs_arches} noarch - nodejs-yargs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yargs-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-yarn ExclusiveArch: %{nodejs_arches} noarch - nodejs-yeast ExclusiveArch: %{nodejs_arches} noarch - nodejs-yn ExclusiveArch: %{nodejs_arches} noarch - nodejs-zap ExclusiveArch: %{nodejs_arches} noarch - nodejs-zeropad ExclusiveArch: %{nodejs_arches} noarch - nodejs-zip-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-zipfile ExclusiveArch: %{nodejs_arches} - nodejs-zlib-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-zlibjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - notify-sharp ExclusiveArch: %{mono_arches} - notify-sharp3 ExclusiveArch: %{mono_arches} - nuget ExclusiveArch: %{mono_arches} - numatop ExclusiveArch: x86_64 ppc64le - nunit ExclusiveArch: %{mono_arches} - nunit2 ExclusiveArch: %{mono_arches} - nvml ExclusiveArch: x86_64 - nwchem ExclusiveArch: x86_64 %{ix86} - obfs4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-kvm-hook ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-register-machine ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - oci-umount ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - ocitools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - oidn ExclusiveArch: x86_64 - olpc-kbdshim ExclusiveArch: %{ix86} %{arm} - olpc-netutils ExclusiveArch: %{ix86} %{arm} - olpc-powerd ExclusiveArch: %{ix86} %{arm} - olpc-utils ExclusiveArch: %{ix86} %{arm} - onedrive ExclusiveArch: %{ldc_arches} - opal-prd ExclusiveArch: ppc64le - open-vm-tools ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 - openblas ExclusiveArch: %{openblas_arches} - openjfx ExclusiveArch: %{ix86} x86_64 - openlibm ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64} - openni ExclusiveArch: %{ix86} x86_64 %{arm} - openni-primesense ExclusiveArch: %{ix86} x86_64 %{arm} - openssl-ibmca ExclusiveArch: s390 s390x - origin ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - orion ExclusiveArch: %{qt5_qtwebengine_arches} - orthorobot ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - oshinko-cli ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - paflib ExclusiveArch: ppc %{power64} - pcc ExclusiveArch: %{ix86} x86_64 - pcmciautils ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} - pdfmod ExclusiveArch: %mono_arches - peripety ExclusiveArch: %{rust_arches} - perl-Dumbbench ExclusiveArch: %{ix86} x86_64 noarch - perl-Parse-DMIDecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - pesign ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm} - pesign-test-app ExclusiveArch: i686 x86_64 ia64 aarch64 - pinta ExclusiveArch: %mono_arches - pioneer ExclusiveArch: %{ix86} x86_64 - playonlinux ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - pmdk-convert ExclusiveArch: x86_64 - pocl ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - podman ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 - poppler-sharp ExclusiveArch: %mono_arches - popub ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - powerpc-utils ExclusiveArch: ppc %{power64} - ppc64-diag ExclusiveArch: ppc %{power64} - publican-jboss ExclusiveArch: i686 x86_64 - pvs-sbcl ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - pyqtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - python-etcd ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - python-healpy ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-openoffice ExclusiveArch: noarch x86_64 - python-pymoc ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-rpi-gpio ExclusiveArch: %{arm} aarch64 - q4wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - qcint ExclusiveArch: x86_64 - qclib ExclusiveArch: s390 s390x - qevercloud ExclusiveArch: %{qt5_qtwebengine_arches} - qmapshack ExclusiveArch: %{qt5_qtwebengine_arches} - qt4pas ExclusiveArch: %{fpc_arches} - qt5-qtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - quantum-espresso ExclusiveArch: x86_64 %{ix86} ExclusiveArch: %{openblas_arches} - quentier ExclusiveArch: %{qt5_qtwebengine_arches} - reactfx ExclusiveArch: %{ix86} x86_64 noarch - rear ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 - redhat-lsb ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - reg ExclusiveArch: x86_64 - renderdoc ExclusiveArch: %{ix86} x86_64 - reptyr ExclusiveArch: %{ix86} x86_64 %{arm} - rescene ExclusiveArch: %{mono_arches} - restsharp ExclusiveArch: %{mono_arches} - rhythmbox-alternative-toolbar ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le - rkt ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - rocm-runtime ExclusiveArch: x86_64 aarch64 - rocminfo ExclusiveArch: x86_64 aarch64 - rpm-ostree ExclusiveArch: %{rust_arches} - rssguard ExclusiveArch: %{qt5_qtwebengine_arches} - runc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x - rust ExclusiveArch: %{rust_arches} - rust-abomonation ExclusiveArch: %{rust_arches} - rust-addr2line ExclusiveArch: %{rust_arches} - rust-adler32 ExclusiveArch: %{rust_arches} - rust-aes-soft ExclusiveArch: %{rust_arches} - rust-afterburn ExclusiveArch: %{rust_arches} - rust-aho-corasick ExclusiveArch: %{rust_arches} - rust-alga ExclusiveArch: %{rust_arches} - rust-alga_derive ExclusiveArch: %{rust_arches} - rust-ammonia ExclusiveArch: %{rust_arches} - rust-ansi_colours ExclusiveArch: %{rust_arches} - rust-ansi_term ExclusiveArch: %{rust_arches} - rust-antidote ExclusiveArch: %{rust_arches} - rust-aom-sys ExclusiveArch: %{rust_arches} - rust-approx ExclusiveArch: %{rust_arches} - rust-arc-swap ExclusiveArch: %{rust_arches} - rust-arg_enum_proc_macro ExclusiveArch: %{rust_arches} - rust-arraydeque ExclusiveArch: %{rust_arches} - rust-arrayref ExclusiveArch: %{rust_arches} - rust-arrayvec ExclusiveArch: %{rust_arches} - rust-ascii ExclusiveArch: %{rust_arches} - rust-askalono ExclusiveArch: %{rust_arches} - rust-askalono-cli ExclusiveArch: %{rust_arches} - rust-atk ExclusiveArch: %{rust_arches} - rust-atk-sys ExclusiveArch: %{rust_arches} - rust-atom ExclusiveArch: %{rust_arches} - rust-atomicwrites ExclusiveArch: %{rust_arches} - rust-atty ExclusiveArch: %{rust_arches} - rust-autocfg ExclusiveArch: %{rust_arches} - rust-backtrace ExclusiveArch: %{rust_arches} - rust-backtrace-sys ExclusiveArch: %{rust_arches} - rust-base100 ExclusiveArch: %{rust_arches} - rust-base64 ExclusiveArch: %{rust_arches} - rust-bat ExclusiveArch: %{rust_arches} - rust-bencher ExclusiveArch: %{rust_arches} - rust-bincode ExclusiveArch: %{rust_arches} - rust-bindgen ExclusiveArch: %{rust_arches} - rust-bit-set ExclusiveArch: %{rust_arches} - rust-bit-vec ExclusiveArch: %{rust_arches} - rust-bitflags ExclusiveArch: %{rust_arches} - rust-bitstream-io ExclusiveArch: %{rust_arches} - rust-blake2 ExclusiveArch: %{rust_arches} - rust-blobby ExclusiveArch: %{rust_arches} - rust-block-buffer ExclusiveArch: %{rust_arches} - rust-block-cipher-trait ExclusiveArch: %{rust_arches} - rust-block-modes ExclusiveArch: %{rust_arches} - rust-block-padding ExclusiveArch: %{rust_arches} - rust-brev ExclusiveArch: %{rust_arches} - rust-bstr ExclusiveArch: %{rust_arches} - rust-bufstream ExclusiveArch: %{rust_arches} - rust-build_const ExclusiveArch: %{rust_arches} - rust-byte-tools ExclusiveArch: %{rust_arches} - rust-bytecount ExclusiveArch: %{rust_arches} - rust-byteorder ExclusiveArch: %{rust_arches} - rust-bytes ExclusiveArch: %{rust_arches} - rust-bytes0.3 ExclusiveArch: %{rust_arches} - rust-bytesize ExclusiveArch: %{rust_arches} - rust-c_vec ExclusiveArch: %{rust_arches} - rust-cairo-rs ExclusiveArch: %{rust_arches} - rust-cairo-sys-rs ExclusiveArch: %{rust_arches} - rust-cargo ExclusiveArch: %{rust_arches} - rust-cargo_metadata ExclusiveArch: %{rust_arches} - rust-cargo_metadata0.6 ExclusiveArch: %{rust_arches} - rust-cast ExclusiveArch: %{rust_arches} - rust-cbindgen ExclusiveArch: %{rust_arches} - rust-cc ExclusiveArch: %{rust_arches} - rust-cexpr ExclusiveArch: %{rust_arches} - rust-cfg-if ExclusiveArch: %{rust_arches} - rust-chainerror ExclusiveArch: %{rust_arches} - rust-chbs ExclusiveArch: %{rust_arches} - rust-checked_int_cast ExclusiveArch: %{rust_arches} - rust-chrono ExclusiveArch: %{rust_arches} - rust-chrono-humanize ExclusiveArch: %{rust_arches} - rust-clang-sys ExclusiveArch: %{rust_arches} - rust-clap ExclusiveArch: %{rust_arches} - rust-clicolors-control ExclusiveArch: %{rust_arches} - rust-cmake ExclusiveArch: %{rust_arches} - rust-color_quant ExclusiveArch: %{rust_arches} - rust-colored ExclusiveArch: %{rust_arches} - rust-colored_json ExclusiveArch: %{rust_arches} - rust-config ExclusiveArch: %{rust_arches} - rust-console ExclusiveArch: %{rust_arches} - rust-content_inspector ExclusiveArch: %{rust_arches} - rust-cpp_demangle ExclusiveArch: %{rust_arches} - rust-crates-io ExclusiveArch: %{rust_arches} - rust-crc ExclusiveArch: %{rust_arches} - rust-crc-core ExclusiveArch: %{rust_arches} - rust-crc32fast ExclusiveArch: %{rust_arches} - rust-criterion ExclusiveArch: %{rust_arches} - rust-criterion-plot ExclusiveArch: %{rust_arches} - rust-crossbeam ExclusiveArch: %{rust_arches} - rust-crossbeam-channel ExclusiveArch: %{rust_arches} - rust-crossbeam-deque ExclusiveArch: %{rust_arches} - rust-crossbeam-deque0.4 ExclusiveArch: %{rust_arches} - rust-crossbeam-epoch ExclusiveArch: %{rust_arches} - rust-crossbeam-queue ExclusiveArch: %{rust_arches} - rust-crossbeam-utils ExclusiveArch: %{rust_arches} - rust-crossterm ExclusiveArch: %{rust_arches} - rust-crossterm_cursor ExclusiveArch: %{rust_arches} - rust-crossterm_input ExclusiveArch: %{rust_arches} - rust-crossterm_screen ExclusiveArch: %{rust_arches} - rust-crossterm_style ExclusiveArch: %{rust_arches} - rust-crossterm_terminal ExclusiveArch: %{rust_arches} - rust-crossterm_utils ExclusiveArch: %{rust_arches} - rust-crypto-hash ExclusiveArch: %{rust_arches} - rust-crypto-mac ExclusiveArch: %{rust_arches} - rust-cryptovec ExclusiveArch: %{rust_arches} - rust-cssparser ExclusiveArch: %{rust_arches} - rust-cssparser-macros ExclusiveArch: %{rust_arches} - rust-csv ExclusiveArch: %{rust_arches} - rust-csv-core ExclusiveArch: %{rust_arches} - rust-ctrlc ExclusiveArch: %{rust_arches} - rust-curl ExclusiveArch: %{rust_arches} - rust-curl-sys ExclusiveArch: %{rust_arches} - rust-custom_derive ExclusiveArch: %{rust_arches} - rust-darling ExclusiveArch: %{rust_arches} - rust-darling_core ExclusiveArch: %{rust_arches} - rust-darling_macro ExclusiveArch: %{rust_arches} - rust-data-encoding ExclusiveArch: %{rust_arches} - rust-data-url ExclusiveArch: %{rust_arches} - rust-datetime ExclusiveArch: %{rust_arches} - rust-dav1d-sys ExclusiveArch: %{rust_arches} - rust-dbus ExclusiveArch: %{rust_arches} - rust-decimal ExclusiveArch: %{rust_arches} - rust-deflate ExclusiveArch: %{rust_arches} - rust-defmac ExclusiveArch: %{rust_arches} - rust-delta_e ExclusiveArch: %{rust_arches} - rust-derive_builder ExclusiveArch: %{rust_arches} - rust-derive_builder_core ExclusiveArch: %{rust_arches} - rust-devicemapper ExclusiveArch: %{rust_arches} - rust-diff ExclusiveArch: %{rust_arches} - rust-difference ExclusiveArch: %{rust_arches} - rust-digest ExclusiveArch: %{rust_arches} - rust-directories ExclusiveArch: %{rust_arches} - rust-dirs ExclusiveArch: %{rust_arches} - rust-dns-parser ExclusiveArch: %{rust_arches} - rust-doc-comment ExclusiveArch: %{rust_arches} - rust-docmatic ExclusiveArch: %{rust_arches} - rust-docopt ExclusiveArch: %{rust_arches} - rust-downcast-rs ExclusiveArch: %{rust_arches} - rust-dtoa ExclusiveArch: %{rust_arches} - rust-dtoa-short ExclusiveArch: %{rust_arches} - rust-edit-distance ExclusiveArch: %{rust_arches} - rust-either ExclusiveArch: %{rust_arches} - rust-encode_unicode ExclusiveArch: %{rust_arches} - rust-encoding ExclusiveArch: %{rust_arches} - rust-encoding-index-japanese ExclusiveArch: %{rust_arches} - rust-encoding-index-korean ExclusiveArch: %{rust_arches} - rust-encoding-index-simpchinese ExclusiveArch: %{rust_arches} - rust-encoding-index-singlebyte ExclusiveArch: %{rust_arches} - rust-encoding-index-tradchinese ExclusiveArch: %{rust_arches} - rust-encoding_index_tests ExclusiveArch: %{rust_arches} - rust-encoding_rs ExclusiveArch: %{rust_arches} - rust-encoding_rs_io ExclusiveArch: %{rust_arches} - rust-entities ExclusiveArch: %{rust_arches} - rust-enum_primitive ExclusiveArch: %{rust_arches} - rust-env_logger ExclusiveArch: %{rust_arches} - rust-env_logger0.4 ExclusiveArch: %{rust_arches} - rust-env_logger0.5 ExclusiveArch: %{rust_arches} - rust-erased-serde ExclusiveArch: %{rust_arches} - rust-errln ExclusiveArch: %{rust_arches} - rust-errno ExclusiveArch: %{rust_arches} - rust-error-chain ExclusiveArch: %{rust_arches} - rust-exa ExclusiveArch: %{rust_arches} - rust-extprim ExclusiveArch: %{rust_arches} - rust-extprim_literals_macros ExclusiveArch: %{rust_arches} - rust-failure ExclusiveArch: %{rust_arches} - rust-failure_derive ExclusiveArch: %{rust_arches} - rust-fake-simd ExclusiveArch: %{rust_arches} - rust-fake_clock ExclusiveArch: %{rust_arches} - rust-fallible-iterator ExclusiveArch: %{rust_arches} - rust-fd-find ExclusiveArch: %{rust_arches} - rust-ffsend ExclusiveArch: %{rust_arches} - rust-ffsend-api ExclusiveArch: %{rust_arches} - rust-filetime ExclusiveArch: %{rust_arches} - rust-fixedbitset ExclusiveArch: %{rust_arches} - rust-flame ExclusiveArch: %{rust_arches} - rust-flate2 ExclusiveArch: %{rust_arches} - rust-float-cmp ExclusiveArch: %{rust_arches} - rust-fnv ExclusiveArch: %{rust_arches} - rust-foreign-types ExclusiveArch: %{rust_arches} - rust-foreign-types-shared ExclusiveArch: %{rust_arches} - rust-fragile ExclusiveArch: %{rust_arches} - rust-fs2 ExclusiveArch: %{rust_arches} - rust-fuse ExclusiveArch: %{rust_arches} - rust-futf ExclusiveArch: %{rust_arches} - rust-futures-async-runtime-preview ExclusiveArch: %{rust_arches} - rust-futures-channel-preview ExclusiveArch: %{rust_arches} - rust-futures-core ExclusiveArch: %{rust_arches} - rust-futures-core-preview ExclusiveArch: %{rust_arches} - rust-futures-cpupool ExclusiveArch: %{rust_arches} - rust-futures-executor-preview ExclusiveArch: %{rust_arches} - rust-futures-io-preview ExclusiveArch: %{rust_arches} - rust-futures-preview ExclusiveArch: %{rust_arches} - rust-futures-sink-preview ExclusiveArch: %{rust_arches} - rust-futures-stable-preview ExclusiveArch: %{rust_arches} - rust-futures-util-preview ExclusiveArch: %{rust_arches} - rust-futures0.1 ExclusiveArch: %{rust_arches} - rust-fuzzy-matcher ExclusiveArch: %{rust_arches} - rust-gcsf ExclusiveArch: %{rust_arches} - rust-gdk ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf-sys ExclusiveArch: %{rust_arches} - rust-gdk-sys ExclusiveArch: %{rust_arches} - rust-generic-array ExclusiveArch: %{rust_arches} - rust-getopts ExclusiveArch: %{rust_arches} - rust-gettext-sys ExclusiveArch: %{rust_arches} - rust-gif ExclusiveArch: %{rust_arches} - rust-gimli ExclusiveArch: %{rust_arches} - rust-gio ExclusiveArch: %{rust_arches} - rust-gio-sys ExclusiveArch: %{rust_arches} - rust-gir-format-check ExclusiveArch: %{rust_arches} - rust-git2 ExclusiveArch: %{rust_arches} - rust-git2-curl ExclusiveArch: %{rust_arches} - rust-glib ExclusiveArch: %{rust_arches} - rust-glib-sys ExclusiveArch: %{rust_arches} - rust-glob ExclusiveArch: %{rust_arches} - rust-globset ExclusiveArch: %{rust_arches} - rust-gobject-sys ExclusiveArch: %{rust_arches} - rust-goblin ExclusiveArch: %{rust_arches} - rust-google-drive3-fork ExclusiveArch: %{rust_arches} - rust-grep ExclusiveArch: %{rust_arches} - rust-grep-cli ExclusiveArch: %{rust_arches} - rust-grep-matcher ExclusiveArch: %{rust_arches} - rust-grep-pcre2 ExclusiveArch: %{rust_arches} - rust-grep-printer ExclusiveArch: %{rust_arches} - rust-grep-regex ExclusiveArch: %{rust_arches} - rust-grep-searcher ExclusiveArch: %{rust_arches} - rust-gstreamer-sys ExclusiveArch: %{rust_arches} - rust-gtk ExclusiveArch: %{rust_arches} - rust-gtk-rs-lgpl-docs ExclusiveArch: %{rust_arches} - rust-gtk-source-sys ExclusiveArch: %{rust_arches} - rust-gtk-sys ExclusiveArch: %{rust_arches} - rust-gzip-header ExclusiveArch: %{rust_arches} - rust-h2 ExclusiveArch: %{rust_arches} - rust-half ExclusiveArch: %{rust_arches} - rust-hamcrest ExclusiveArch: %{rust_arches} - rust-handlebars ExclusiveArch: %{rust_arches} - rust-hashbrown ExclusiveArch: %{rust_arches} - rust-headers ExclusiveArch: %{rust_arches} - rust-headers-core ExclusiveArch: %{rust_arches} - rust-headers-derive ExclusiveArch: %{rust_arches} - rust-heapsize ExclusiveArch: %{rust_arches} - rust-heatseeker ExclusiveArch: %{rust_arches} - rust-heck ExclusiveArch: %{rust_arches} - rust-hex ExclusiveArch: %{rust_arches} - rust-hex-literal ExclusiveArch: %{rust_arches} - rust-hex-literal-impl ExclusiveArch: %{rust_arches} - rust-hexyl ExclusiveArch: %{rust_arches} - rust-hkdf ExclusiveArch: %{rust_arches} - rust-hmac ExclusiveArch: %{rust_arches} - rust-home ExclusiveArch: %{rust_arches} - rust-horrorshow ExclusiveArch: %{rust_arches} - rust-hostname ExclusiveArch: %{rust_arches} - rust-html2pango ExclusiveArch: %{rust_arches} - rust-html5ever ExclusiveArch: %{rust_arches} - rust-http ExclusiveArch: %{rust_arches} - rust-httparse ExclusiveArch: %{rust_arches} - rust-humantime ExclusiveArch: %{rust_arches} - rust-hyper ExclusiveArch: %{rust_arches} - rust-hyper-native-tls ExclusiveArch: %{rust_arches} - rust-hyper-tls ExclusiveArch: %{rust_arches} - rust-hyper0.10 ExclusiveArch: %{rust_arches} - rust-hyperfine ExclusiveArch: %{rust_arches} - rust-id_tree ExclusiveArch: %{rust_arches} - rust-ident_case ExclusiveArch: %{rust_arches} - rust-idna ExclusiveArch: %{rust_arches} - rust-ignore ExclusiveArch: %{rust_arches} - rust-image ExclusiveArch: %{rust_arches} - rust-imgref ExclusiveArch: %{rust_arches} - rust-indexmap ExclusiveArch: %{rust_arches} - rust-indicatif ExclusiveArch: %{rust_arches} - rust-inflate ExclusiveArch: %{rust_arches} - rust-inotify ExclusiveArch: %{rust_arches} - rust-inotify-sys ExclusiveArch: %{rust_arches} - rust-input_buffer ExclusiveArch: %{rust_arches} - rust-interpolate_name ExclusiveArch: %{rust_arches} - rust-intervaltree ExclusiveArch: %{rust_arches} - rust-iovec ExclusiveArch: %{rust_arches} - rust-ipnetwork ExclusiveArch: %{rust_arches} - rust-iso8601 ExclusiveArch: %{rust_arches} - rust-iter-read ExclusiveArch: %{rust_arches} - rust-itertools ExclusiveArch: %{rust_arches} - rust-itertools-num ExclusiveArch: %{rust_arches} - rust-itoa ExclusiveArch: %{rust_arches} - rust-jobserver ExclusiveArch: %{rust_arches} - rust-jpeg-decoder ExclusiveArch: %{rust_arches} - rust-lab ExclusiveArch: %{rust_arches} - rust-language-tags ExclusiveArch: %{rust_arches} - rust-lazy-init ExclusiveArch: %{rust_arches} - rust-lazy_static ExclusiveArch: %{rust_arches} - rust-lazycell ExclusiveArch: %{rust_arches} - rust-letter-avatar ExclusiveArch: %{rust_arches} - rust-libc ExclusiveArch: %{rust_arches} - rust-libdbus-sys ExclusiveArch: %{rust_arches} - rust-libflate ExclusiveArch: %{rust_arches} - rust-libgit2-sys ExclusiveArch: %{rust_arches} - rust-libloading ExclusiveArch: %{rust_arches} - rust-libm ExclusiveArch: %{rust_arches} - rust-libmount ExclusiveArch: %{rust_arches} - rust-libssh2-sys ExclusiveArch: %{rust_arches} - rust-libudev ExclusiveArch: %{rust_arches} - rust-libudev-sys ExclusiveArch: %{rust_arches} - rust-libz-sys ExclusiveArch: %{rust_arches} - rust-line-wrap ExclusiveArch: %{rust_arches} - rust-linked-hash-map ExclusiveArch: %{rust_arches} - rust-linkify ExclusiveArch: %{rust_arches} - rust-lipsum ExclusiveArch: %{rust_arches} - rust-lmdb ExclusiveArch: %{rust_arches} - rust-lmdb-sys ExclusiveArch: %{rust_arches} - rust-locale ExclusiveArch: %{rust_arches} - rust-locale_config ExclusiveArch: %{rust_arches} - rust-lock_api ExclusiveArch: %{rust_arches} - rust-log ExclusiveArch: %{rust_arches} - rust-log0.3 ExclusiveArch: %{rust_arches} - rust-loopdev ExclusiveArch: %{rust_arches} - rust-lru_time_cache ExclusiveArch: %{rust_arches} - rust-lscolors ExclusiveArch: %{rust_arches} - rust-lsd ExclusiveArch: %{rust_arches} - rust-lzma-sys ExclusiveArch: %{rust_arches} - rust-lzw ExclusiveArch: %{rust_arches} - rust-mac ExclusiveArch: %{rust_arches} - rust-macro-attr ExclusiveArch: %{rust_arches} - rust-maplit ExclusiveArch: %{rust_arches} - rust-markup5ever ExclusiveArch: %{rust_arches} - rust-matches ExclusiveArch: %{rust_arches} - rust-matrixmultiply ExclusiveArch: %{rust_arches} - rust-md-5 ExclusiveArch: %{rust_arches} - rust-md5 ExclusiveArch: %{rust_arches} - rust-mdl ExclusiveArch: %{rust_arches} - rust-memchr ExclusiveArch: %{rust_arches} - rust-memmap ExclusiveArch: %{rust_arches} - rust-memoffset ExclusiveArch: %{rust_arches} - rust-metadeps ExclusiveArch: %{rust_arches} - rust-mime ExclusiveArch: %{rust_arches} - rust-mime-sniffer ExclusiveArch: %{rust_arches} - rust-mime0.2 ExclusiveArch: %{rust_arches} - rust-mime_guess ExclusiveArch: %{rust_arches} - rust-mime_guess1 ExclusiveArch: %{rust_arches} - rust-miniz-sys ExclusiveArch: %{rust_arches} - rust-miniz_oxide ExclusiveArch: %{rust_arches} - rust-miniz_oxide_c_api ExclusiveArch: %{rust_arches} - rust-mint ExclusiveArch: %{rust_arches} - rust-mio ExclusiveArch: %{rust_arches} - rust-mio-extras ExclusiveArch: %{rust_arches} - rust-mio-uds ExclusiveArch: %{rust_arches} - rust-mktemp ExclusiveArch: %{rust_arches} - rust-mnt ExclusiveArch: %{rust_arches} - rust-mockito ExclusiveArch: %{rust_arches} - rust-modifier ExclusiveArch: %{rust_arches} - rust-muldiv ExclusiveArch: %{rust_arches} - rust-multimap ExclusiveArch: %{rust_arches} - rust-nalgebra ExclusiveArch: %{rust_arches} - rust-nasm-rs ExclusiveArch: %{rust_arches} - rust-native-tls ExclusiveArch: %{rust_arches} - rust-natord ExclusiveArch: %{rust_arches} - rust-net2 ExclusiveArch: %{rust_arches} - rust-netmap_sys ExclusiveArch: %{rust_arches} - rust-new_debug_unreachable ExclusiveArch: %{rust_arches} - rust-newtype_derive ExclusiveArch: %{rust_arches} - rust-nix ExclusiveArch: %{rust_arches} - rust-no-panic ExclusiveArch: %{rust_arches} - rust-nodrop ExclusiveArch: %{rust_arches} - rust-nom ExclusiveArch: %{rust_arches} - rust-notify ExclusiveArch: %{rust_arches} - rust-num ExclusiveArch: %{rust_arches} - rust-num-bigint ExclusiveArch: %{rust_arches} - rust-num-complex ExclusiveArch: %{rust_arches} - rust-num-derive ExclusiveArch: %{rust_arches} - rust-num-integer ExclusiveArch: %{rust_arches} - rust-num-iter ExclusiveArch: %{rust_arches} - rust-num-rational ExclusiveArch: %{rust_arches} - rust-num-traits ExclusiveArch: %{rust_arches} - rust-num-traits0.1 ExclusiveArch: %{rust_arches} - rust-num_cpus ExclusiveArch: %{rust_arches} - rust-number_prefix ExclusiveArch: %{rust_arches} - rust-object ExclusiveArch: %{rust_arches} - rust-odds ExclusiveArch: %{rust_arches} - rust-once_cell ExclusiveArch: %{rust_arches} - rust-onig ExclusiveArch: %{rust_arches} - rust-onig_sys ExclusiveArch: %{rust_arches} - rust-opaque-debug ExclusiveArch: %{rust_arches} - rust-open ExclusiveArch: %{rust_arches} - rust-opener ExclusiveArch: %{rust_arches} - rust-openssh-keys ExclusiveArch: %{rust_arches} - rust-openssl ExclusiveArch: %{rust_arches} - rust-openssl-probe ExclusiveArch: %{rust_arches} - rust-openssl-sys ExclusiveArch: %{rust_arches} - rust-ord_subset ExclusiveArch: %{rust_arches} - rust-owning_ref ExclusiveArch: %{rust_arches} - rust-packaging ExclusiveArch: %{rust_arches} - rust-pad ExclusiveArch: %{rust_arches} - rust-pager ExclusiveArch: %{rust_arches} - rust-pango ExclusiveArch: %{rust_arches} - rust-pango-sys ExclusiveArch: %{rust_arches} - rust-pangocairo ExclusiveArch: %{rust_arches} - rust-pangocairo-sys ExclusiveArch: %{rust_arches} - rust-parity-wasm ExclusiveArch: %{rust_arches} - rust-parking_lot ExclusiveArch: %{rust_arches} - rust-parking_lot_core ExclusiveArch: %{rust_arches} - rust-paste ExclusiveArch: %{rust_arches} - rust-paste-impl ExclusiveArch: %{rust_arches} - rust-pbr ExclusiveArch: %{rust_arches} - rust-pcap ExclusiveArch: %{rust_arches} - rust-pcre2 ExclusiveArch: %{rust_arches} - rust-pcre2-sys ExclusiveArch: %{rust_arches} - rust-peeking_take_while ExclusiveArch: %{rust_arches} - rust-peg ExclusiveArch: %{rust_arches} - rust-percent-encoding ExclusiveArch: %{rust_arches} - rust-permutate ExclusiveArch: %{rust_arches} - rust-permutohedron ExclusiveArch: %{rust_arches} - rust-pest ExclusiveArch: %{rust_arches} - rust-pest_derive ExclusiveArch: %{rust_arches} - rust-pest_generator ExclusiveArch: %{rust_arches} - rust-pest_meta ExclusiveArch: %{rust_arches} - rust-petgraph ExclusiveArch: %{rust_arches} - rust-phf ExclusiveArch: %{rust_arches} - rust-phf_codegen ExclusiveArch: %{rust_arches} - rust-phf_generator ExclusiveArch: %{rust_arches} - rust-phf_shared ExclusiveArch: %{rust_arches} - rust-pkg-config ExclusiveArch: %{rust_arches} - rust-plain ExclusiveArch: %{rust_arches} - rust-plist ExclusiveArch: %{rust_arches} - rust-plugin ExclusiveArch: %{rust_arches} - rust-pnet_base ExclusiveArch: %{rust_arches} - rust-pnet_datalink ExclusiveArch: %{rust_arches} - rust-pnet_sys ExclusiveArch: %{rust_arches} - rust-png ExclusiveArch: %{rust_arches} - rust-precomputed-hash ExclusiveArch: %{rust_arches} - rust-pretty-git-prompt ExclusiveArch: %{rust_arches} - rust-pretty_assertions ExclusiveArch: %{rust_arches} - rust-pretty_env_logger ExclusiveArch: %{rust_arches} - rust-prettytable-rs ExclusiveArch: %{rust_arches} - rust-proc-macro-hack ExclusiveArch: %{rust_arches} - rust-proc-macro2 ExclusiveArch: %{rust_arches} - rust-proc-macro2-0.3 ExclusiveArch: %{rust_arches} - rust-procedural-masquerade ExclusiveArch: %{rust_arches} - rust-proptest ExclusiveArch: %{rust_arches} - rust-pulldown-cmark ExclusiveArch: %{rust_arches} - rust-pulse ExclusiveArch: %{rust_arches} - rust-qr2term ExclusiveArch: %{rust_arches} - rust-qrcode ExclusiveArch: %{rust_arches} - rust-quick-error ExclusiveArch: %{rust_arches} - rust-quickcheck ExclusiveArch: %{rust_arches} - rust-quickcheck0.6 ExclusiveArch: %{rust_arches} - rust-quickersort ExclusiveArch: %{rust_arches} - rust-quote ExclusiveArch: %{rust_arches} - rust-quote0.3 ExclusiveArch: %{rust_arches} - rust-quote0.5 ExclusiveArch: %{rust_arches} - rust-rand ExclusiveArch: %{rust_arches} - rust-rand0.4 ExclusiveArch: %{rust_arches} - rust-rand0.5 ExclusiveArch: %{rust_arches} - rust-rand_chacha ExclusiveArch: %{rust_arches} - rust-rand_core ExclusiveArch: %{rust_arches} - rust-rand_core0.2 ExclusiveArch: %{rust_arches} - rust-rand_core0.3 ExclusiveArch: %{rust_arches} - rust-rand_hc ExclusiveArch: %{rust_arches} - rust-rand_isaac ExclusiveArch: %{rust_arches} - rust-rand_jitter ExclusiveArch: %{rust_arches} - rust-rand_os ExclusiveArch: %{rust_arches} - rust-rand_pcg ExclusiveArch: %{rust_arches} - rust-rand_xorshift ExclusiveArch: %{rust_arches} - rust-rand_xoshiro ExclusiveArch: %{rust_arches} - rust-rawpointer ExclusiveArch: %{rust_arches} - rust-rawslice ExclusiveArch: %{rust_arches} - rust-rayon ExclusiveArch: %{rust_arches} - rust-rayon-core ExclusiveArch: %{rust_arches} - rust-recycler ExclusiveArch: %{rust_arches} - rust-regex ExclusiveArch: %{rust_arches} - rust-regex-automata ExclusiveArch: %{rust_arches} - rust-regex-syntax ExclusiveArch: %{rust_arches} - rust-relay ExclusiveArch: %{rust_arches} - rust-remove_dir_all ExclusiveArch: %{rust_arches} - rust-reqwest ExclusiveArch: %{rust_arches} - rust-resize ExclusiveArch: %{rust_arches} - rust-rgb ExclusiveArch: %{rust_arches} - rust-ripgrep ExclusiveArch: %{rust_arches} - rust-rmp ExclusiveArch: %{rust_arches} - rust-rmp-serde ExclusiveArch: %{rust_arches} - rust-ron ExclusiveArch: %{rust_arches} - rust-rpassword ExclusiveArch: %{rust_arches} - rust-rpick ExclusiveArch: %{rust_arches} - rust-rust-ini ExclusiveArch: %{rust_arches} - rust-rustc-demangle ExclusiveArch: %{rust_arches} - rust-rustc-serialize ExclusiveArch: %{rust_arches} - rust-rustc-test ExclusiveArch: %{rust_arches} - rust-rustc_version ExclusiveArch: %{rust_arches} - rust-rustdoc-stripper ExclusiveArch: %{rust_arches} - rust-rustfilt ExclusiveArch: %{rust_arches} - rust-rustfix ExclusiveArch: %{rust_arches} - rust-rusty-fork ExclusiveArch: %{rust_arches} - rust-ryu ExclusiveArch: %{rust_arches} - rust-safe-transmute ExclusiveArch: %{rust_arches} - rust-safemem ExclusiveArch: %{rust_arches} - rust-same-file ExclusiveArch: %{rust_arches} - rust-scan_fmt ExclusiveArch: %{rust_arches} - rust-scoped-tls ExclusiveArch: %{rust_arches} - rust-scoped_threadpool ExclusiveArch: %{rust_arches} - rust-scopeguard ExclusiveArch: %{rust_arches} - rust-scroll ExclusiveArch: %{rust_arches} - rust-scroll_derive ExclusiveArch: %{rust_arches} - rust-sd ExclusiveArch: %{rust_arches} - rust-seahash ExclusiveArch: %{rust_arches} - rust-semver ExclusiveArch: %{rust_arches} - rust-semver-parser ExclusiveArch: %{rust_arches} - rust-semver-parser0.7 ExclusiveArch: %{rust_arches} - rust-serde ExclusiveArch: %{rust_arches} - rust-serde-pickle ExclusiveArch: %{rust_arches} - rust-serde-xml-rs ExclusiveArch: %{rust_arches} - rust-serde0.8 ExclusiveArch: %{rust_arches} - rust-serde_bytes ExclusiveArch: %{rust_arches} - rust-serde_cbor ExclusiveArch: %{rust_arches} - rust-serde_derive ExclusiveArch: %{rust_arches} - rust-serde_ignored ExclusiveArch: %{rust_arches} - rust-serde_json ExclusiveArch: %{rust_arches} - rust-serde_json0.8 ExclusiveArch: %{rust_arches} - rust-serde_stacker ExclusiveArch: %{rust_arches} - rust-serde_test ExclusiveArch: %{rust_arches} - rust-serde_urlencoded ExclusiveArch: %{rust_arches} - rust-serde_yaml ExclusiveArch: %{rust_arches} - rust-sha-1 ExclusiveArch: %{rust_arches} - rust-sha1 ExclusiveArch: %{rust_arches} - rust-sha2 ExclusiveArch: %{rust_arches} - rust-shell-escape ExclusiveArch: %{rust_arches} - rust-shell-words ExclusiveArch: %{rust_arches} - rust-shlex ExclusiveArch: %{rust_arches} - rust-signal-hook ExclusiveArch: %{rust_arches} - rust-signal-hook-registry ExclusiveArch: %{rust_arches} - rust-silver ExclusiveArch: %{rust_arches} - rust-simple_logger ExclusiveArch: %{rust_arches} - rust-simplelog ExclusiveArch: %{rust_arches} - rust-siphasher ExclusiveArch: %{rust_arches} - rust-skeptic ExclusiveArch: %{rust_arches} - rust-skim ExclusiveArch: %{rust_arches} - rust-slab ExclusiveArch: %{rust_arches} - rust-slog ExclusiveArch: %{rust_arches} - rust-slog-async ExclusiveArch: %{rust_arches} - rust-slog-scope ExclusiveArch: %{rust_arches} - rust-slog-term ExclusiveArch: %{rust_arches} - rust-smallvec ExclusiveArch: %{rust_arches} - rust-snowflake ExclusiveArch: %{rust_arches} - rust-socket2 ExclusiveArch: %{rust_arches} - rust-sourceview ExclusiveArch: %{rust_arches} - rust-spin ExclusiveArch: %{rust_arches} - rust-spmc ExclusiveArch: %{rust_arches} - rust-stable_deref_trait ExclusiveArch: %{rust_arches} - rust-stacker ExclusiveArch: %{rust_arches} - rust-static_assertions ExclusiveArch: %{rust_arches} - rust-statistical ExclusiveArch: %{rust_arches} - rust-stb_truetype ExclusiveArch: %{rust_arches} - rust-stream-cipher ExclusiveArch: %{rust_arches} - rust-streaming-stats ExclusiveArch: %{rust_arches} - rust-string ExclusiveArch: %{rust_arches} - rust-string_cache ExclusiveArch: %{rust_arches} - rust-string_cache_codegen ExclusiveArch: %{rust_arches} - rust-string_cache_shared ExclusiveArch: %{rust_arches} - rust-strings ExclusiveArch: %{rust_arches} - rust-strsim ExclusiveArch: %{rust_arches} - rust-structopt ExclusiveArch: %{rust_arches} - rust-structopt-derive ExclusiveArch: %{rust_arches} - rust-subtle ExclusiveArch: %{rust_arches} - rust-syn ExclusiveArch: %{rust_arches} - rust-syn0.11 ExclusiveArch: %{rust_arches} - rust-synom ExclusiveArch: %{rust_arches} - rust-synstructure ExclusiveArch: %{rust_arches} - rust-syntect ExclusiveArch: %{rust_arches} - rust-sys-info ExclusiveArch: %{rust_arches} - rust-tabwriter ExclusiveArch: %{rust_arches} - rust-take ExclusiveArch: %{rust_arches} - rust-take_mut ExclusiveArch: %{rust_arches} - rust-tar ExclusiveArch: %{rust_arches} - rust-tempdir ExclusiveArch: %{rust_arches} - rust-tempfile ExclusiveArch: %{rust_arches} - rust-tendril ExclusiveArch: %{rust_arches} - rust-term ExclusiveArch: %{rust_arches} - rust-term_grid ExclusiveArch: %{rust_arches} - rust-term_size ExclusiveArch: %{rust_arches} - rust-termcolor ExclusiveArch: %{rust_arches} - rust-terminal_size ExclusiveArch: %{rust_arches} - rust-terminfo ExclusiveArch: %{rust_arches} - rust-termion ExclusiveArch: %{rust_arches} - rust-termios ExclusiveArch: %{rust_arches} - rust-test-assembler ExclusiveArch: %{rust_arches} - rust-textwrap ExclusiveArch: %{rust_arches} - rust-thread-id ExclusiveArch: %{rust_arches} - rust-thread-scoped ExclusiveArch: %{rust_arches} - rust-thread_local ExclusiveArch: %{rust_arches} - rust-threadpool ExclusiveArch: %{rust_arches} - rust-tiff ExclusiveArch: %{rust_arches} - rust-time ExclusiveArch: %{rust_arches} - rust-timer ExclusiveArch: %{rust_arches} - rust-timerfd ExclusiveArch: %{rust_arches} - rust-tinytemplate ExclusiveArch: %{rust_arches} - rust-tokei ExclusiveArch: %{rust_arches} - rust-tokio ExclusiveArch: %{rust_arches} - rust-tokio-async-await ExclusiveArch: %{rust_arches} - rust-tokio-codec ExclusiveArch: %{rust_arches} - rust-tokio-core ExclusiveArch: %{rust_arches} - rust-tokio-current-thread ExclusiveArch: %{rust_arches} - rust-tokio-executor ExclusiveArch: %{rust_arches} - rust-tokio-fs ExclusiveArch: %{rust_arches} - rust-tokio-io ExclusiveArch: %{rust_arches} - rust-tokio-mock-task ExclusiveArch: %{rust_arches} - rust-tokio-mockstream ExclusiveArch: %{rust_arches} - rust-tokio-process ExclusiveArch: %{rust_arches} - rust-tokio-reactor ExclusiveArch: %{rust_arches} - rust-tokio-service ExclusiveArch: %{rust_arches} - rust-tokio-signal ExclusiveArch: %{rust_arches} - rust-tokio-sync ExclusiveArch: %{rust_arches} - rust-tokio-tcp ExclusiveArch: %{rust_arches} - rust-tokio-threadpool ExclusiveArch: %{rust_arches} - rust-tokio-timer ExclusiveArch: %{rust_arches} - rust-tokio-tls ExclusiveArch: %{rust_arches} - rust-tokio-trace-core ExclusiveArch: %{rust_arches} - rust-tokio-udp ExclusiveArch: %{rust_arches} - rust-tokio-uds ExclusiveArch: %{rust_arches} - rust-toml ExclusiveArch: %{rust_arches} - rust-toml0.4 ExclusiveArch: %{rust_arches} - rust-traitobject ExclusiveArch: %{rust_arches} - rust-try-lock ExclusiveArch: %{rust_arches} - rust-tuikit ExclusiveArch: %{rust_arches} - rust-tungstenite ExclusiveArch: %{rust_arches} - rust-typeable ExclusiveArch: %{rust_arches} - rust-typed-arena ExclusiveArch: %{rust_arches} - rust-typemap ExclusiveArch: %{rust_arches} - rust-typenum ExclusiveArch: %{rust_arches} - rust-ucd-parse ExclusiveArch: %{rust_arches} - rust-ucd-trie ExclusiveArch: %{rust_arches} - rust-ucd-util ExclusiveArch: %{rust_arches} - rust-unchecked-index ExclusiveArch: %{rust_arches} - rust-unescape ExclusiveArch: %{rust_arches} - rust-unicase ExclusiveArch: %{rust_arches} - rust-unicase1 ExclusiveArch: %{rust_arches} - rust-unicode-bidi ExclusiveArch: %{rust_arches} - rust-unicode-normalization ExclusiveArch: %{rust_arches} - rust-unicode-segmentation ExclusiveArch: %{rust_arches} - rust-unicode-width ExclusiveArch: %{rust_arches} - rust-unicode-xid ExclusiveArch: %{rust_arches} - rust-unicode_categories ExclusiveArch: %{rust_arches} - rust-unindent ExclusiveArch: %{rust_arches} - rust-unix_socket ExclusiveArch: %{rust_arches} - rust-unreachable ExclusiveArch: %{rust_arches} - rust-unsafe-any ExclusiveArch: %{rust_arches} - rust-untrusted ExclusiveArch: %{rust_arches} - rust-url ExclusiveArch: %{rust_arches} - rust-url_serde ExclusiveArch: %{rust_arches} - rust-urlencoding ExclusiveArch: %{rust_arches} - rust-urlshortener ExclusiveArch: %{rust_arches} - rust-users ExclusiveArch: %{rust_arches} - rust-utf-8 ExclusiveArch: %{rust_arches} - rust-utf8-ranges ExclusiveArch: %{rust_arches} - rust-utf8parse ExclusiveArch: %{rust_arches} - rust-uuid ExclusiveArch: %{rust_arches} - rust-varlink ExclusiveArch: %{rust_arches} - rust-varlink-cli ExclusiveArch: %{rust_arches} - rust-varlink_generator ExclusiveArch: %{rust_arches} - rust-varlink_parser ExclusiveArch: %{rust_arches} - rust-varlink_stdinterfaces ExclusiveArch: %{rust_arches} - rust-vec_map ExclusiveArch: %{rust_arches} - rust-version-compare ExclusiveArch: %{rust_arches} - rust-version-sync ExclusiveArch: %{rust_arches} - rust-version_check ExclusiveArch: %{rust_arches} - rust-void ExclusiveArch: %{rust_arches} - rust-vte ExclusiveArch: %{rust_arches} - rust-wait-timeout ExclusiveArch: %{rust_arches} - rust-walkdir ExclusiveArch: %{rust_arches} - rust-want ExclusiveArch: %{rust_arches} - rust-warp ExclusiveArch: %{rust_arches} - rust-websocket ExclusiveArch: %{rust_arches} - rust-which ExclusiveArch: %{rust_arches} - rust-which1 ExclusiveArch: %{rust_arches} - rust-wild ExclusiveArch: %{rust_arches} - rust-x11 ExclusiveArch: %{rust_arches} - rust-xattr ExclusiveArch: %{rust_arches} - rust-xdg ExclusiveArch: %{rust_arches} - rust-xml-rs ExclusiveArch: %{rust_arches} - rust-xz2 ExclusiveArch: %{rust_arches} - rust-y4m ExclusiveArch: %{rust_arches} - rust-yaml-rust ExclusiveArch: %{rust_arches} - rust-yaml-rust0.3 ExclusiveArch: %{rust_arches} - rust-ybaas ExclusiveArch: %{rust_arches} - rust-yubibomb ExclusiveArch: %{rust_arches} - rust-yup-oauth2 ExclusiveArch: %{rust_arches} - rust-zoneinfo_compiled ExclusiveArch: %{rust_arches} - rust-zram-generator ExclusiveArch: %{rust_arches} - s390utils ExclusiveArch: s390 s390x - safetyblanket ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - sagemath ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9 - sbcl ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - sbd ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le - sbsigntools ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - seabios ExclusiveArch: x86_64 - seamonkey ExclusiveArch: %{ix86} x86_64 - servicelog ExclusiveArch: ppc %{power64} - sgabios ExclusiveArch: %{ix86} x86_64 - sharpfont ExclusiveArch: %mono_arches - sharpziplib ExclusiveArch: %{mono_arches} - shim ExclusiveArch: %{efi} - shim-unsigned-aarch64 ExclusiveArch: aarch64 - shim-unsigned-x64 ExclusiveArch: x86_64 - sigul ExclusiveArch: x86_64 - skychart ExclusiveArch: %{fpc_arches} - snapd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - source-to-image ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - sparkleshare ExclusiveArch: %{mono_arches} - spicctrl ExclusiveArch: %{ix86} x86_64 - spice ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - spring ExclusiveArch: %{ix86} x86_64 - springlobby ExclusiveArch: %{ix86} x86_64 - startdde ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - statsd ExclusiveArch: %{nodejs_arches} noarch - stdx-allocator ExclusiveArch: %{ldc_arches} - stratisd ExclusiveArch: %{rust_arches} - stripesnoop ExclusiveArch: %{ix86} x86_64 - supermin ExclusiveArch: x86_64 - swift-lang ExclusiveArch: x86_64 aarch64 - sysbench ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - syslinux ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - taglib-sharp ExclusiveArch: %{mono_arches} - tarantool ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl - tboot ExclusiveArch: %{ix86} x86_64 - tdlib ExclusiveArch: x86_64 - templates_parser ExclusiveArch: %GPRbuild_arches - termy-qt ExclusiveArch: %{ix86} x86_64 - ternimal ExclusiveArch: %{rust_arches} - themonospot-base ExclusiveArch: %mono_arches - themonospot-console ExclusiveArch: %mono_arches - themonospot-gui-gtk ExclusiveArch: %mono_arches - themonospot-plugin-avi ExclusiveArch: %mono_arches - themonospot-plugin-mkv ExclusiveArch: %mono_arches - thermald ExclusiveArch: %{ix86} x86_64 - tilix ExclusiveArch: %{ldc_arches} - tmux-top ExclusiveArch: %{go_arches} - tomboy ExclusiveArch: %{mono_arches} - toolbox ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 - tuned-profiles-nfv-host-bin ExclusiveArch: %{ix86} x86_64 - uClibc ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} - ucx ExclusiveArch: aarch64 ppc64le x86_64 - ugene ExclusiveArch: %{ix86} x86_64 - uglify-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - uglify-js1 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - unetbootin ExclusiveArch: %{ix86} x86_64 - ursa-major ExclusiveArch: %{ix86} x86_64 noarch - v8-314 ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64 - valgrind ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 - vboot-utils ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - vdsm ExclusiveArch: x86_64 %{power64} aarch64 - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - virtio-forwarder ExclusiveArch: x86_64 aarch64 ppc64le %ix86 - virtualbox-guest-additions ExclusiveArch: i686 x86_64 - virtualplanet ExclusiveArch: %{fpc_arches} - vkd3d ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - vmaf ExclusiveArch: x86_64 - vrq ExclusiveArch: %{ix86} x86_64 - warsow ExclusiveArch: %{ix86} x86_64 %{arm} - warsow-data ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{ix86} x86_64 %{arm} - webkit2-sharp ExclusiveArch: %mono_arches - wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: %{ix86} %{arm} - winetricks ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - wraplinux ExclusiveArch: %{ix86} x86_64 - wxMaxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 - x2goclient ExclusiveArch: x86_64 - x86info ExclusiveArch: %{ix86} x86_64 - xen ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 - xmlada ExclusiveArch: %{GPRbuild_arches} - xorg-x11-drv-armsoc ExclusiveArch: %{arm} aarch64 - xorg-x11-drv-geode ExclusiveArch: %{ix86} - xorg-x11-drv-intel ExclusiveArch: %{ix86} x86_64 ia64 - xorg-x11-drv-omap ExclusiveArch: %{arm} - xorg-x11-drv-openchrome ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-opentegra ExclusiveArch: %{arm} - xorg-x11-drv-vesa ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vmware ExclusiveArch: %{ix86} x86_64 ia64 - xsp ExclusiveArch: %mono_arches - ycssmin ExclusiveArch: %{nodejs_arches} noarch - zeromq-ada ExclusiveArch: %{GPRbuild_arches} - zlib-ada ExclusiveArch: %{GPRbuild_arches}

1 0

Architecture specific change in rpms/bind.git
by githook-noreply＠fedoraproject.org 03 May '19

03 May '19

The package rpms/bind.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/bind.git/commit/?id=219b0e889f74ed2…. Change: -%ifnarch alpha ia64 Thanks. Full change: ============ commit fd11bcc212a10ae3ce6ec9eb0f10553c4454d63a Author: Petr Menk <pemensik(a)redhat.com> Date: Fri May 3 15:55:24 2019 +0200 Revert "Move dnssec related tools to bind-dnssec-utils" This reverts commit 2830e00b88ea8bb956e0cdeb6f205fc72741b167. diff --git a/bind.spec b/bind.spec index 34c6c31..9da1b90 100644 --- a/bind.spec +++ b/bind.spec @@ -169,7 +169,6 @@ Provides: dnssec-conf = 1.27-2 # in case it needs to be used Requires(post): ((policycoreutils-python-utils and libselinux-utils) if (selinux-policy-targeted or selinux-policy-mls)) Requires(post): ((selinux-policy and selinux-policy-base) if (selinux-policy-targeted or selinux-policy-mls)) -Recommends: bind-utils bind-dnssec-utils BuildRequires: gcc, make BuildRequires: openssl-devel, libtool, autoconf, pkgconfig, libcap-devel BuildRequires: libidn2-devel, libxml2-devel, GeoIP-devel @@ -307,14 +306,9 @@ Contains license of the BIND DNS suite. %package utils Summary: Utilities for querying DNS name servers -Requires: bind-libs-lite%{?_isa} = %{epoch}:%{version}-%{release} Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} -# TODO: this is just temporary workaround until all packages depending on -# bind-utils can be satisfied without dnssec-utils -# It will be removed after some time, or changed to Recommends -Suggests: bind-dnssec-utils -# For compatibility with Debian package -Provides: dnsutils = %{epoch}:%{version}-%{release} +Requires: bind-libs-lite%{?_isa} = %{epoch}:%{version}-%{release} +Requires: python3-bind = %{epoch}:%{version}-%{release} %description utils Bind-utils contains a collection of utilities for querying DNS (Domain @@ -326,20 +320,6 @@ network addresses. You should install bind-utils if you need to get information from DNS name servers. -%package dnssec-utils -Summary: Utilities for DNSSEC keys and DNS zone files management -Requires: bind-libs-lite%{?_isa} = %{epoch}:%{version}-%{release} -Recommends: bind-utils -Requires: python3-bind = %{epoch}:%{version}-%{release} - -%description dnssec-utils -Bind-dnssec-utils contains a collection of utilities for editing -DNSSEC keys and BIND zone files. These tools provide generation, -revocation and verification of keys and DNSSEC signatures in zone files. - -You should install bind-dnssec-utils if you need to sign a DNS zone -or maintain keys for it. - %if %{with DEVEL} %package devel Summary: Header files and libraries needed for BIND DNS development @@ -1280,19 +1260,6 @@ fi; %{_bindir}/nslookup %{_bindir}/nsupdate %{_bindir}/arpaname -%if %{with DNSTAP} -%{_bindir}/dnstap-read -%{_mandir}/man1/dnstap-read.1* -%endif -%{_mandir}/man1/host.1* -%{_mandir}/man1/nsupdate.1* -%{_mandir}/man1/dig.1* -%{_mandir}/man1/delv.1* -%{_mandir}/man1/nslookup.1* -%{_mandir}/man1/arpaname.1* -%{_sysconfdir}/trusted-key.key - -%files dnssec-utils %{_sbindir}/ddns-confgen %{_sbindir}/tsig-keygen %{_sbindir}/genrandom @@ -1307,6 +1274,16 @@ fi; %if %{with LMDB} %{_sbindir}/named-nzd2nzf %endif +%if %{with DNSTAP} +%{_bindir}/dnstap-read +%{_mandir}/man1/dnstap-read.1* +%endif +%{_mandir}/man1/host.1* +%{_mandir}/man1/nsupdate.1* +%{_mandir}/man1/dig.1* +%{_mandir}/man1/delv.1* +%{_mandir}/man1/nslookup.1* +%{_mandir}/man1/arpaname.1* %{_mandir}/man8/ddns-confgen.8* %{_mandir}/man8/tsig-keygen.8* %{_mandir}/man8/genrandom.8* @@ -1321,6 +1298,7 @@ fi; %if %{with LMDB} %{_mandir}/man8/named-nzd2nzf.8* %endif +%{_sysconfdir}/trusted-key.key %if %{with DEVEL} %files devel commit f6f181d9d55ccc62c08001c6d30f9c7a3a5412d1 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri May 3 15:53:27 2019 +0200 Update to 9.11.6-P1 Finish merge from more recent branches, cleanup changelog changes not relevant to this branch. diff --git a/bind.spec b/bind.spec index 5b40270..34c6c31 100644 --- a/bind.spec +++ b/bind.spec @@ -53,7 +53,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.6 -Release: 0%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -1519,6 +1519,9 @@ fi; %changelog +* Fri May 03 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-1.P1 +- Update to 9.11.6-P1 (#1702881) + * Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-4.P4 - Update to 9.11.5-P4 @@ -1532,45 +1535,10 @@ fi; - disable IDN output from scripts - Update project URL - Removed revoked KSK 19164 from trusted keys -* Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-11.P1 -- Disable often failing unit test random_test - -* Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-10.P1 -- Disable autodetected eddsa algorithm ED448 - -* Thu Jan 31 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-9.P1 -- dig prints ASCII name instead of failure (#1647829) -- disable IDN output from scripts -- Update project URL -- Removed revoked KSK 19164 from trusted keys - -* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 32:9.11.5-8.P1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Jan 27 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-7.P1 -- Update to 9.11.5-P1 - -* Wed Jan 23 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-6 -- Reenable crypto rand for DHCP, disable just entropy check (#1663318) - -* Thu Jan 17 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-5 -- Move dnssec related tools from bind-utils to bind-dnssec-utils (#1649398) - -* Wed Jan 16 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-4 -- Reject invalid binary file (#1666814) - -* Mon Jan 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-3 -- Disable crypto rand for DHCP (#1663318) - -* Thu Oct 25 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-2 -- Add optional support for JSON statistics -- Add optional DNSTAP support (#1564776), new dnstap-read tool * Wed Oct 24 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-1 - Update to 9.11.5 -* Mon Jan 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.4-13.P2 -- Disable crypto rand for DHCP (#1663318) * Tue Oct 02 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.4-12.P2 - Add Requires to devel packages referenced by bind-devel commit 3e06916fb7d69295eb19b2e7d0d3238c4dc8300b Author: Petr Menk <pemensik(a)redhat.com> Date: Fri May 3 15:39:13 2019 +0200 Revert "Enable LMDB support" This reverts commit ec6f94669ad65412d41dfefc0f43e8bec2da7994. diff --git a/bind.spec b/bind.spec index 7f77ba8..5b40270 100644 --- a/bind.spec +++ b/bind.spec @@ -15,8 +15,8 @@ # due to extensive changes to Makefiles %bcond_without PKCS11 %bcond_without DEVEL +%bcond_with LMDB %bcond_with JSON -%bcond_without LMDB %bcond_with DNSTAP %bcond_with DLZ %bcond_without EXPORT_LIBS commit 9b172b6d29ef6ab30497e12c9537cbfa698a8f77 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri May 3 15:37:44 2019 +0200 Revert "Enable json statistics format" This reverts commit d3fe8d6248ba08cb0c343f81f25d815bba173190. diff --git a/bind.spec b/bind.spec index 24c1bf6..7f77ba8 100644 --- a/bind.spec +++ b/bind.spec @@ -15,8 +15,8 @@ # due to extensive changes to Makefiles %bcond_without PKCS11 %bcond_without DEVEL +%bcond_with JSON %bcond_without LMDB -%bcond_without JSON %bcond_with DNSTAP %bcond_with DLZ %bcond_without EXPORT_LIBS @@ -1571,8 +1571,6 @@ fi; * Mon Jan 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.4-13.P2 - Disable crypto rand for DHCP (#1663318) -- Enable json format in statistics-channel - * Tue Oct 02 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.4-12.P2 - Add Requires to devel packages referenced by bind-devel commit 65cf5aa6e0ffd5fb7522162a0c0eef6604cbca60 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri May 3 15:35:58 2019 +0200 Revert "Enable DNSTAP (#1564776)" This reverts commit f0b6f15ced5af5f309ccbfe35c6ec38ddca7b619. diff --git a/bind.spec b/bind.spec index ff220d7..24c1bf6 100644 --- a/bind.spec +++ b/bind.spec @@ -17,7 +17,7 @@ %bcond_without DEVEL %bcond_without LMDB %bcond_without JSON -%bcond_without DNSTAP +%bcond_with DNSTAP %bcond_with DLZ %bcond_without EXPORT_LIBS %if 0%{?fedora} >= 28 @@ -1532,7 +1532,6 @@ fi; - disable IDN output from scripts - Update project URL - Removed revoked KSK 19164 from trusted keys - * Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-11.P1 - Disable often failing unit test random_test commit c1ece0be9b77d42f0876c21b02f9e3eb328e857f Merge: 3a9a611 36d3753 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri May 3 15:32:35 2019 +0200 Merge branch 'f30' into f29 diff --cc bind.spec index b5b836c,f5ba390..ff220d7 --- a/bind.spec +++ b/bind.spec @@@ -51,8 -52,8 +52,8 @@@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Name: bind License: MPLv2.0 - Version: 9.11.5 - Release: 4%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} + Version: 9.11.6 -Release: 3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} ++Release: 0%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@@ -1461,27 -1519,66 +1519,61 @@@ fi %changelog -* Thu May 02 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-3.P1 -- Fix inefective limit of TCP clients (CVE-2018-5743) - -* Thu Mar 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-2 -- Fix dnstap and timer issues in unit test - -* Tue Mar 05 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-1 -- Update to 9.11.6 - -* Fri Mar 01 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-15.P4 -- Support testing of named variants - -* Thu Feb 28 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-14.P4 -- Modify feature-test detection of dlz-filesystem - -* Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-13.P4 +* Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-4.P4 - Update to 9.11.5-P4 -* Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-12.P1 -- Enable DNSTAP support (#1564776) -- Enable LMDB support for rndc addzone -- Enable json format in statistics-channel +* Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-3.P1 +- Disable autodetected eddsa algorithm ED448 +- Disable often failing unit test random_test + +* Sun Jan 27 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-2.P1 +- Update to 9.11.5-P1 +- dig prints ASCII name instead of failure (#1647829) +- disable IDN output from scripts +- Update project URL +- Removed revoked KSK 19164 from trusted keys - * Sun Jan 27 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-1 - - Update to 9.11.5 + * Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-11.P1 + - Disable often failing unit test random_test + + * Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-10.P1 + - Disable autodetected eddsa algorithm ED448 + + * Thu Jan 31 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-9.P1 + - dig prints ASCII name instead of failure (#1647829) + - disable IDN output from scripts + - Update project URL + - Removed revoked KSK 19164 from trusted keys + + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 32:9.11.5-8.P1 + - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + + * Sun Jan 27 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-7.P1 + - Update to 9.11.5-P1 + + * Wed Jan 23 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-6 - Reenable crypto rand for DHCP, disable just entropy check (#1663318) + * Thu Jan 17 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-5 + - Move dnssec related tools from bind-utils to bind-dnssec-utils (#1649398) + + * Wed Jan 16 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-4 + - Reject invalid binary file (#1666814) + + * Mon Jan 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-3 + - Disable crypto rand for DHCP (#1663318) + + * Thu Oct 25 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-2 + - Add optional support for JSON statistics + - Add optional DNSTAP support (#1564776), new dnstap-read tool + + * Wed Oct 24 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-1 + - Update to 9.11.5 + +* Mon Jan 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.4-13.P2 +- Disable crypto rand for DHCP (#1663318) ++- Enable json format in statistics-channel + * Tue Oct 02 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.4-12.P2 - Add Requires to devel packages referenced by bind-devel commit 36d37531c94aae8f885e664b03aacd5a4d9ecb6d Author: Petr Menk <pemensik(a)redhat.com> Date: Fri May 3 12:51:18 2019 +0200 Revert "Enable optional features by default" This reverts commit ae423dfbebbd150c56df1c7c1954ac6ba3090bc8. diff --git a/bind.spec b/bind.spec index d80a7e0..f5ba390 100644 --- a/bind.spec +++ b/bind.spec @@ -18,7 +18,7 @@ %bcond_without LMDB %bcond_without JSON %bcond_without DNSTAP -%bcond_without DLZ +%bcond_with DLZ %bcond_without EXPORT_LIBS %if 0%{?fedora} >= 28 %bcond_without UNITTEST @@ -1524,7 +1524,6 @@ fi; * Thu Mar 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-2 - Fix dnstap and timer issues in unit test -- Enable DLZ modules * Tue Mar 05 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-1 - Update to 9.11.6 commit 4b42a5c16289817095b3ed990fca5a83153a8baf Author: Petr Menk <pemensik(a)redhat.com> Date: Thu May 2 14:49:56 2019 +0200 5200. [security] tcp-clients settings could be exceeded in some cases, which could lead to exhaustion of file descriptors. (CVE-2018-5743) [GL #615] diff --git a/.gitignore b/.gitignore index 4c7e54a..9775b64 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ bind-9.7.2b1.tar.gz /config-19.tar.bz2 /bind-9.11.5-P4.tar.gz /bind-9.11.6.tar.gz +/bind-9.11.6-P1.tar.gz diff --git a/bind-9.11-CVE-2018-5741-atomic.patch b/bind-9.11-CVE-2018-5741-atomic.patch new file mode 100644 index 0000000..cfbded6 --- /dev/null +++ b/bind-9.11-CVE-2018-5741-atomic.patch @@ -0,0 +1,132 @@ +From ef49780d30d3ddc5735cfc32561b678a634fa72f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej(a)sury.org> +Date: Wed, 17 Apr 2019 15:22:27 +0200 +Subject: [PATCH] Replace atomic operations in bin/named/client.c with + isc_refcount reference counting + +--- + bin/named/client.c | 18 +++++++----------- + bin/named/include/named/interfacemgr.h | 5 +++-- + bin/named/interfacemgr.c | 7 +++++-- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/bin/named/client.c b/bin/named/client.c +index 845326abc0..29fecadca8 100644 +--- a/bin/named/client.c ++++ b/bin/named/client.c +@@ -402,12 +402,10 @@ tcpconn_detach(ns_client_t *client) { + static void + mark_tcp_active(ns_client_t *client, bool active) { + if (active && !client->tcpactive) { +- isc_atomic_xadd(&client->interface->ntcpactive, 1); ++ isc_refcount_increment0(&client->interface->ntcpactive, NULL); + client->tcpactive = active; + } else if (!active && client->tcpactive) { +- uint32_t old = +- isc_atomic_xadd(&client->interface->ntcpactive, -1); +- INSIST(old > 0); ++ isc_refcount_decrement(&client->interface->ntcpactive, NULL); + client->tcpactive = active; + } + } +@@ -554,7 +552,7 @@ exit_check(ns_client_t *client) { + if (client->mortal && TCP_CLIENT(client) && + client->newstate != NS_CLIENTSTATE_FREED && + !ns_g_clienttest && +- isc_atomic_xadd(&client->interface->ntcpaccepting, 0) == 0) ++ isc_refcount_current(&client->interface->ntcpaccepting) == 0) + { + /* Nobody else is accepting */ + client->mortal = false; +@@ -3328,7 +3326,6 @@ client_newconn(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + ns_client_t *client = event->ev_arg; + isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event; +- uint32_t old; + + REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN); + REQUIRE(NS_CLIENT_VALID(client)); +@@ -3348,8 +3345,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) { + INSIST(client->naccepts == 1); + client->naccepts--; + +- old = isc_atomic_xadd(&client->interface->ntcpaccepting, -1); +- INSIST(old > 0); ++ isc_refcount_decrement(&client->interface->ntcpaccepting, NULL); + + /* + * We must take ownership of the new socket before the exit +@@ -3480,8 +3476,8 @@ client_accept(ns_client_t *client) { + * quota is tcp-clients plus the number of listening + * interfaces plus 1.) + */ +- exit = (isc_atomic_xadd(&client->interface->ntcpactive, 0) > +- (client->tcpactive ? 1 : 0)); ++ exit = (isc_refcount_current(&client->interface->ntcpactive) > ++ (client->tcpactive ? 1U : 0U)); + if (exit) { + client->newstate = NS_CLIENTSTATE_INACTIVE; + (void)exit_check(client); +@@ -3539,7 +3535,7 @@ client_accept(ns_client_t *client) { + * listening for connections itself to prevent the interface + * going dead. + */ +- isc_atomic_xadd(&client->interface->ntcpaccepting, 1); ++ isc_refcount_increment0(&client->interface->ntcpaccepting, NULL); + } + + static void +diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h +index 3535ef22a8..6e10f210fd 100644 +--- a/bin/named/include/named/interfacemgr.h ++++ b/bin/named/include/named/interfacemgr.h +@@ -45,6 +45,7 @@ + #include <isc/magic.h> + #include <isc/mem.h> + #include <isc/socket.h> ++#include <isc/refcount.h> + + #include <dns/result.h> + +@@ -75,11 +76,11 @@ struct ns_interface { + /*%< UDP dispatchers. */ + isc_socket_t * tcpsocket; /*%< TCP socket. */ + isc_dscp_t dscp; /*%< "listen-on" DSCP value */ +- int32_t ntcpaccepting; /*%< Number of clients ++ isc_refcount_t ntcpaccepting; /*%< Number of clients + ready to accept new + TCP connections on this + interface */ +- int32_t ntcpactive; /*%< Number of clients ++ isc_refcount_t ntcpactive; /*%< Number of clients + servicing TCP queries + (whether accepting or + connected) */ +diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c +index d9f6df5802..135533be6b 100644 +--- a/bin/named/interfacemgr.c ++++ b/bin/named/interfacemgr.c +@@ -386,8 +386,8 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, + * connections will be handled in parallel even though there is + * only one client initially. + */ +- ifp->ntcpaccepting = 0; +- ifp->ntcpactive = 0; ++ isc_refcount_init(&ifp->ntcpaccepting, 0); ++ isc_refcount_init(&ifp->ntcpactive, 0); + + ifp->nudpdispatch = 0; + +@@ -618,6 +618,9 @@ ns_interface_destroy(ns_interface_t *ifp) { + + ns_interfacemgr_detach(&ifp->mgr); + ++ isc_refcount_destroy(&ifp->ntcpactive); ++ isc_refcount_destroy(&ifp->ntcpaccepting); ++ + ifp->magic = 0; + isc_mem_put(mctx, ifp, sizeof(*ifp)); + } +-- +2.18.1 + diff --git a/bind-9.11-rt46047.patch b/bind-9.11-rt46047.patch index 1f40a16..c5725f7 100644 --- a/bind-9.11-rt46047.patch +++ b/bind-9.11-rt46047.patch @@ -1,4 +1,4 @@ -From 2b7a633f29c2ae8fe801f2a98541013837ebaeaa Mon Sep 17 00:00:00 2001 +From 55e649d82a1adc5209738fb8402624f03287ca87 Mon Sep 17 00:00:00 2001 From: Evan Hunt <each(a)isc.org> Date: Thu, 28 Sep 2017 10:09:22 -0700 Subject: [PATCH] completed and corrected the crypto-random change @@ -39,14 +39,14 @@ Subject: [PATCH] completed and corrected the crypto-random change bin/tests/system/tkey/keycreate.c | 4 +- bin/tests/system/tkey/keydelete.c | 4 +- doc/arm/Bv9ARM-book.xml | 55 +++++++++++++++++------- - doc/arm/notes.xml | 26 +++++++++++ + doc/arm/notes.xml | 31 +++++++++++++ lib/dns/dst_api.c | 4 +- lib/dns/include/dst/dst.h | 14 +++++- lib/dns/openssl_link.c | 3 +- lib/isc/include/isc/entropy.h | 50 +++++++++++++++------ lib/isc/include/isc/random.h | 28 +++++++----- lib/isccfg/namedconf.c | 2 +- - 22 files changed, 220 insertions(+), 107 deletions(-) + 22 files changed, 225 insertions(+), 107 deletions(-) diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c index 295e16f..0f79aa8 100644 @@ -140,10 +140,10 @@ index 31a99e7..38c83ed 100644 usekeyboard); diff --git a/bin/named/client.c b/bin/named/client.c -index d425df2..7ab3dec 100644 +index ce24670..0ce02a9 100644 --- a/bin/named/client.c +++ b/bin/named/client.c -@@ -1609,7 +1609,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, +@@ -1754,7 +1754,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, isc_buffer_init(&buf, cookie, sizeof(cookie)); isc_stdtime_get(&now); @@ -241,7 +241,7 @@ index f5ed2b7..b2c1d05 100644 struct ns_altsecret { diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c -index 419927b..d721f47 100644 +index d9f6df5..662eb6c 100644 --- a/bin/named/interfacemgr.c +++ b/bin/named/interfacemgr.c @@ -17,6 +17,7 @@ @@ -436,7 +436,7 @@ index 2146f9b..ac2c311 100644 } #endif diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml -index dd5365c..1a463b0 100644 +index bb79723..888959c 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -5071,22 +5071,45 @@ badresp:1,adberr:0,findfail:0,valfail:0] @@ -502,13 +502,15 @@ index dd5365c..1a463b0 100644 </listitem> </varlistentry> diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml -index ad4b34c..2685b8e 100644 +index ba9a7cf..c0256f1 100644 --- a/doc/arm/notes.xml +++ b/doc/arm/notes.xml -@@ -229,6 +229,32 @@ - is used from the shell scripts. - </para> - </listitem> +@@ -117,6 +117,37 @@ + </itemizedlist> + </section> + ++ <section xml:id="relnotes_rh_changes"><info><title>Red Hat Specific Changes</title></info> ++ <itemizedlist> + <listitem> + <para> + By default, BIND now uses the random number generation functions @@ -535,9 +537,12 @@ index ad4b34c..2685b8e 100644 + entropy source. [RT #31459] [RT #46047] + </para> + </listitem> - </itemizedlist> - </section> - ++ </itemizedlist> ++ </section> ++ + <section xml:id="end_of_life"><info><title>End of Life</title></info> + <para> + BIND 9.11 (Extended Support Version) will be supported until at diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index b55ebe0..d2b43d3 100644 --- a/lib/dns/dst_api.c diff --git a/bind-9.11.6-P1.tar.gz.asc b/bind-9.11.6-P1.tar.gz.asc new file mode 100644 index 0000000..53b9403 --- /dev/null +++ b/bind-9.11.6-P1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABAgAdFiEEFWiQaF6g32oTce8gF8xdsfAIhAcFAlysrg0ACgkQF8xdsfAI +hAc4qQ/6A2odUTpjuaPQK/ziTD8UpJXyqFr5rZ+Qx3+wAA7XcFF6rviRwQ1dULu/ +AmQVhAWeXHa15ruFVFJZoovnRoKYUZLOtvTrcfJkHG0MwBivEpJ/rcOLlOWhAHeG +N6q5teyOrG1kCXNcS8uGHqzm+QfMA3xCUqCpYHWOtZ60I9T3O+8Y6Xyzb+oc6+CY +w1pXeq0doJa9tFnZpVvhCPTol4LPL8KkTLoMmpRA5dRMrVYH3f45fdixABn3HSFx +Ea/CiMeGvIfZI0X119Txufw2Yi8/NMicf/iZBEmvvHUG49/tFX2Vmj4sxUkL4gY/ +qqXEkD7oQsVEUj3X12ITyOqj6CtfiJcOgJIzTVas3vD4QR51nRSY+IGYuH7zQUSf +qVSCFKdLY2NlRwK6VSBVOxN5Ye31qwPEok6WgGgBy2+mWY+FvAm4Z4sIBeyX2QT/ +A0+42GuFErMne7Ppd9Pb+cCKhaIDC4i3vM/lA8kvMvhz+peqKux6MbD9Ab79hSuV +HCZzAzFPsuaHxP1m6wRWYgeGUZWA89uTbwGa5iiAmiXXqhHswzxBCgfKXyUjuObn +pH+XTeZ59qTgQZT3bdyj0QrmCM0JfvFEt2OkuBIDvAnoVcb0smyLrizYaZLo+0of +6OLW76WW2GSjzvfT4RlDP5B3ns3PdjrCKaKji3aIUD7G/oYr7zA= +=TsjB +-----END PGP SIGNATURE----- diff --git a/bind-9.11.6.tar.gz.asc b/bind-9.11.6.tar.gz.asc deleted file mode 100644 index 02ebf56..0000000 --- a/bind-9.11.6.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Comment: GPGTools - http://gpgtools.org - -iQIzBAABAgAdFiEEFWiQaF6g32oTce8gF8xdsfAIhAcFAlx4dTcACgkQF8xdsfAI -hAc9QA/9FaZaH6OxWxjxdU2VdTzZzrxIn5VcTnrSLzeKapBgfH22dmmJZBPHqkCE -uch+d4eWH3CwcVjDs5auW7o69q0KnUDObpg1aGXVjRnBHKyH88Ziny4sd1kMXcZz -lk3HW3Cl+WQBxrA3l+QUQrW+IYIUM36ZpkMxbvgZOwGj8H8rzUjeszDqY86JH/QF -7RekyZwQ/Mb21sJTNntYufOn1KnKm4WZ52jihLVEaNLzQQLRxPIajSOVo+77LPpI -SJWo+iH4vz+5jEQUhDQ1eivDaKxRj/LcrVHQLB9JgCM+ZiRvxZRwqs6mANfDnpke -Ohzwf9Lh255bfq3xNQLYwwDbUpQ8JoEQ91Qw6F1MQ/32uhiBlUnWd2Yua22oSlOg -IcjXYW9i23Zyuuf1GLIENNaXNnVgxM44mmxQh0/Okf7Npake4kxKGEGtPkAdbWUk -NSghxHu8/0h5rwth7Rox4mWvp1vjRMjOGAjqMr5eVjXvFnFSazkY47fmliZCTDFm -O3Otqib4Z35hvXOZJvTIP/IOfjo4g3zNVcfxQHNCpyRSKqBs1smWPc3VbwlOr/nI -g/BxY595ylLIW7Ln46/3mkqZJPQO5F8AqQ+YPr+6ts908qQbA+P8nXRrZ/tcxFaM -N+LbjmvgzCtbReoKhS17PdTDqu8p61LIDdrtxZP02Fr4fcIRRQk= -=uY61 ------END PGP SIGNATURE----- diff --git a/bind.spec b/bind.spec index 870da24..d80a7e0 100644 --- a/bind.spec +++ b/bind.spec @@ -2,7 +2,7 @@ # Red Hat BIND package .spec file # -#%%global PATCHVER P4 +%global PATCHVER P1 #%%global PREVER rc1 %global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}} @@ -53,7 +53,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.6 -Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -141,6 +141,7 @@ Patch171:bind-9.11-tests-variants.patch Patch172:bind-9.11-tests-pkcs11.patch Patch173: bind-9.11-unit-dnstap-pkcs11.patch Patch174: bind-9.11-unit-timer-nothread.patch +Patch175: bind-9.11-CVE-2018-5741-atomic.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -523,6 +524,7 @@ are used for building ISC DHCP. %patch172 -p1 -b .test-pkcs11 %patch173 -p1 -b .unit-dnstap %patch174 -p1 -b .unit-timer +%patch175 -p1 -b .CVE-2018-5741-atomic mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1517,6 +1519,9 @@ fi; %changelog +* Thu May 02 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-3.P1 +- Fix inefective limit of TCP clients (CVE-2018-5743) + * Thu Mar 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-2 - Fix dnstap and timer issues in unit test - Enable DLZ modules diff --git a/sources b/sources index cae8504..413be45 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bind-9.11.6.tar.gz) = 17a76ad4aafddeb86e330c4ca9b5fecb8df9e1109df4ff8d7a31d1da406f2597050d569460529b710f213360642842fcb9bdaa4eb79be10fcb093872fe75fdfd +SHA512 (bind-9.11.6-P1.tar.gz) = 419aeeddeab7aef818b9043db7b21a847993444f663dca04e58ee97a0ebee0610cbc5a9422d17a6f0ee5d44598a2cbb5651e3b4e8c56708eaf923dca0a5c4c03 SHA512 (config-19.tar.bz2) = 36aa38a0c7c33267ae594b31c81681290ac58dde7ca6749bd599da531380b5b1428330813dbe983e01071ccaed83e83f6a9cd92179a53b7d0ccbb6851a0b017c commit 7232bc0a99a7f55d9b5b41e2fb0b901dc0af7623 Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Apr 9 21:22:46 2019 +0200 Attempt to use rich dependencies Selinux boolean should be set only in case given selinux policy is installed. Do not require it inside containers. diff --git a/bind.spec b/bind.spec index 494c5e9..870da24 100644 --- a/bind.spec +++ b/bind.spec @@ -164,9 +164,10 @@ Obsoletes: caching-nameserver < 31:9.4.1-7.fc8 Provides: caching-nameserver = 31:9.4.1-7.fc8 Obsoletes: dnssec-conf < 1.27-2 Provides: dnssec-conf = 1.27-2 -Requires(post): policycoreutils-python-utils -Requires(post): libselinux-utils -Requires(post): selinux-policy +# This wild require should satisfy %selinux_set_boolean macro only +# in case it needs to be used +Requires(post): ((policycoreutils-python-utils and libselinux-utils) if (selinux-policy-targeted or selinux-policy-mls)) +Requires(post): ((selinux-policy and selinux-policy-base) if (selinux-policy-targeted or selinux-policy-mls)) Recommends: bind-utils bind-dnssec-utils BuildRequires: gcc, make BuildRequires: openssl-devel, libtool, autoconf, pkgconfig, libcap-devel @@ -1029,7 +1030,10 @@ fi; %post %?ldconfig -%selinux_set_booleans %{selinuxbooleans} +if -e %{_sysconfdir}/selinux/config; then + %selinux_set_booleans -s targeted %{selinuxbooleans} + %selinux_set_booleans -s mls %{selinuxbooleans} +fi if [ "$1" -eq 1 ]; then # Initial installation [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.* /etc/named.* >/dev/null 2>&1 ; @@ -1061,9 +1065,12 @@ fi %postun %?ldconfig -%selinux_unset_booleans %{selinuxbooleans} # Package upgrade, not uninstall %systemd_postun_with_restart named.service +if -e %{_sysconfdir}/selinux/config; then + %selinux_unset_booleans -s targeted %{selinuxbooleans} + %selinux_unset_booleans -s mls %{selinuxbooleans} +fi %if %{with SDB} %post sdb commit e2a32c8eca6d490dabddf043aa8c79fa64379cf8 Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Apr 9 20:27:00 2019 +0200 Revert shell change to /bin/false diff --git a/bind.spec b/bind.spec index 42e0345..494c5e9 100644 --- a/bind.spec +++ b/bind.spec @@ -1023,7 +1023,7 @@ install -m 644 %{SOURCE43} ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d/named %pre if [ "$1" -eq 1 ]; then /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :; - /usr/sbin/useradd -u %{bind_uid} -r -N -M -g named -s /bin/false -d /var/named -c Named named >/dev/null 2>&1 || :; + /usr/sbin/useradd -u %{bind_uid} -r -N -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; fi; :; @@ -1038,8 +1038,8 @@ if [ "$1" -eq 1 ]; then [ -e /etc/rndc.key ] && chmod 0640 /etc/rndc.key else # Upgrade, use invalid shell - if getent passwd named | grep ':/sbin/nologin$' >/dev/null; then - usermod -s /bin/false named + if getent passwd named | grep ':/bin/false$' >/dev/null; then + /sbin/usermod -s /sbin/nologin named fi # Checkconf will parse out comments if /usr/sbin/named-checkconf -p /etc/named.conf 2>/dev/null | grep -q named.iscdlv.key commit ae423dfbebbd150c56df1c7c1954ac6ba3090bc8 Author: Petr Menk <pemensik(a)redhat.com> Date: Mon Oct 15 17:25:58 2018 +0200 Enable optional features by default diff --git a/bind.spec b/bind.spec index 4adb395..42e0345 100644 --- a/bind.spec +++ b/bind.spec @@ -18,7 +18,7 @@ %bcond_without LMDB %bcond_without JSON %bcond_without DNSTAP -%bcond_with DLZ +%bcond_without DLZ %bcond_without EXPORT_LIBS %if 0%{?fedora} >= 28 %bcond_without UNITTEST @@ -1512,6 +1512,7 @@ fi; %changelog * Thu Mar 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-2 - Fix dnstap and timer issues in unit test +- Enable DLZ modules * Tue Mar 05 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-1 - Update to 9.11.6 commit 16bdca79ba1b743352dab537c8f5404f8ee7affb Author: Petr Menk <pemensik(a)redhat.com> Date: Thu Mar 14 21:23:31 2019 +0100 Workaround to broken kyua handling of empty test Also filter used subdirectories, run tests only for compiled libraries for export-libs. diff --git a/bind-9.11-unit-timer-nothread.patch b/bind-9.11-unit-timer-nothread.patch new file mode 100644 index 0000000..f913724 --- /dev/null +++ b/bind-9.11-unit-timer-nothread.patch @@ -0,0 +1,49 @@ +From c88ba11ced1311e91a73ffdf42114ed14a805725 Mon Sep 17 00:00:00 2001 +From: Petr Mensik <pemensik(a)redhat.com> +Date: Thu, 14 Mar 2019 21:05:34 +0100 +Subject: [PATCH] Workaround to kyua bug + +Kyua 0.13 is not able to correctly handle whole test skipping. +Make workaround to it, include skipping message. +--- + lib/isc/tests/timer_test.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/lib/isc/tests/timer_test.c b/lib/isc/tests/timer_test.c +index f69f2b3..050cf6d 100644 +--- a/lib/isc/tests/timer_test.c ++++ b/lib/isc/tests/timer_test.c +@@ -573,14 +573,13 @@ purge(void **state) { + + int + main(int argc, char **argv) { +- const struct CMUnitTest tests[] = { + #ifdef ISC_PLATFORM_USETHREADS ++ const struct CMUnitTest tests[] = { + cmocka_unit_test_setup_teardown(ticker, _setup, _teardown), + cmocka_unit_test_setup_teardown(once_life, _setup, _teardown), + cmocka_unit_test_setup_teardown(once_idle, _setup, _teardown), + cmocka_unit_test_setup_teardown(reset, _setup, _teardown), + cmocka_unit_test_setup_teardown(purge, _setup, _teardown), +-#endif + }; + int c; + +@@ -595,6 +594,14 @@ main(int argc, char **argv) { + } + + return (cmocka_run_group_tests(tests, NULL, NULL)); ++#else ++ UNUSED(argc); ++ UNUSED(argv); ++ UNUSED(verbose); ++ ++ printf("1..0 # Skipped: threads disabled\n"); ++ return (0); ++#endif + } + + #else /* HAVE_CMOCKA */ +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index 286613f..4adb395 100644 --- a/bind.spec +++ b/bind.spec @@ -140,6 +140,7 @@ Patch170:bind-9.11-feature-test-named.patch Patch171:bind-9.11-tests-variants.patch Patch172:bind-9.11-tests-pkcs11.patch Patch173: bind-9.11-unit-dnstap-pkcs11.patch +Patch174: bind-9.11-unit-timer-nothread.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -520,6 +521,7 @@ are used for building ISC DHCP. %patch171 -p1 -b .test-variant %patch172 -p1 -b .test-pkcs11 %patch173 -p1 -b .unit-dnstap +%patch174 -p1 -b .unit-timer mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -768,9 +770,15 @@ popd # export library unit tests %unit_prepare_build export-libs -# Do not try pkcs11 and lwres in export libs -sed -e '/^\s*include(.*-pkcs11/ d' -e '/^\s*include(.*lwres/ d' \ - -i export-libs/lib/Kyuafile +# Test just compiled libraries +for lib in %{bind_export_libs} +do + sed -e "s,^\s*include(.*${lib}/.*,-- use &," \ + -i export-libs/lib/Kyuafile +done + +sed -e "/^\s*include(/ d" -e 's/^-- use //' \ + -i export-libs/lib/Kyuafile ## End of export libs %endif @@ -1503,7 +1511,7 @@ fi; %changelog * Thu Mar 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-2 -- Fix dnstap issue in unit test once again +- Fix dnstap and timer issues in unit test * Tue Mar 05 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-1 - Update to 9.11.6 commit 812f6fb3361f58fcb29f14dc903d1994f4ab4afa Author: Petr Menk <pemensik(a)redhat.com> Date: Thu Mar 14 15:59:22 2019 +0100 Fix dnstap unit test issue with pkcs11 diff --git a/bind-9.11-unit-dnstap-pkcs11.patch b/bind-9.11-unit-dnstap-pkcs11.patch new file mode 100644 index 0000000..60cc1cd --- /dev/null +++ b/bind-9.11-unit-dnstap-pkcs11.patch @@ -0,0 +1,38 @@ +From dca9eea70cb33062905aefc389266da931e9d0d6 Mon Sep 17 00:00:00 2001 +From: Petr Mensik <pemensik(a)redhat.com> +Date: Thu, 14 Mar 2019 15:48:37 +0100 +Subject: [PATCH] Set TZ again before dns library is initialized + +PKCS11 uses it, initializes TZ offset from dst init. Setting environment +in test is too late since use of cmocka. +--- + lib/dns/tests/dnstap_test.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c +index 22d6dc3..5a60b12 100644 +--- a/lib/dns/tests/dnstap_test.c ++++ b/lib/dns/tests/dnstap_test.c +@@ -309,9 +309,6 @@ totext_test(void **state) { + + UNUSED(state); + +- /* make sure text conversion gets the right local time */ +- setenv("TZ", "PST8", 1); +- + result = dns_dt_open(TAPSAVED, dns_dtmode_file, mctx, &handle); + assert_int_equal(result, ISC_R_SUCCESS); + +@@ -378,6 +375,9 @@ main(void) { + cmocka_unit_test_setup_teardown(totext_test, _setup, _teardown), + }; + ++ /* make sure text conversion gets the right local time */ ++ setenv("TZ", "PST8", 1); ++ + return (cmocka_run_group_tests(tests, dns_test_init, dns_test_final)); + #else + print_message("1..0 # Skip dnstap not enabled\n"); +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index 09544bb..286613f 100644 --- a/bind.spec +++ b/bind.spec @@ -53,7 +53,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.6 -Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -139,6 +139,7 @@ Patch169:bind-9.11-feature-test-dlz.patch Patch170:bind-9.11-feature-test-named.patch Patch171:bind-9.11-tests-variants.patch Patch172:bind-9.11-tests-pkcs11.patch +Patch173: bind-9.11-unit-dnstap-pkcs11.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -518,6 +519,7 @@ are used for building ISC DHCP. %patch170 -p1 -b .featuretest-named %patch171 -p1 -b .test-variant %patch172 -p1 -b .test-pkcs11 +%patch173 -p1 -b .unit-dnstap mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1500,6 +1502,9 @@ fi; %changelog +* Thu Mar 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-2 +- Fix dnstap issue in unit test once again + * Tue Mar 05 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-1 - Update to 9.11.6 commit 395fbedb17a3c94004e4118e393fd3a2697c6101 Author: Petr Menk <pemensik(a)redhat.com> Date: Thu Mar 14 11:41:44 2019 +0100 Use libcmocka instead of libatf Upstream no longer ships bundled libatf library and no longer uses ATF in sources. kyua and cmocka are mandatory for unit tests now. Removes --with KYUA, use --with UNITTEST on different builds when cmocka and kyua are available. diff --git a/bind.spec b/bind.spec index bba50b9..09544bb 100644 --- a/bind.spec +++ b/bind.spec @@ -8,7 +8,6 @@ # bcond_without is built by default, unless --without X is passed # bcond_with is built only when --with X is passed to build -%bcond_without UNITTEST %bcond_with SYSTEMTEST %bcond_without SDB %bcond_without GSSTSIG @@ -21,10 +20,10 @@ %bcond_without DNSTAP %bcond_with DLZ %bcond_without EXPORT_LIBS -%if 0%{?fedora} >= 17 -%bcond_without KYUA +%if 0%{?fedora} >= 28 +%bcond_without UNITTEST %else -%bcond_with KYUA +%bcond_with UNITTEST %endif %{?!bind_uid: %global bind_uid 25} @@ -180,12 +179,9 @@ BuildRequires: findutils sed BuildRequires: openldap-devel, libpq-devel, sqlite-devel, mariadb-connector-c-devel BuildRequires: libdb-devel %endif -%if %{with KYUA} +%if %{with UNITTEST} # make unit dependencies -BuildRequires: libatf-c-devel kyua -%else -# shipped atf library requires c++ -BuildRequires: gcc-c++ +BuildRequires: libcmocka-devel kyua %endif %if %{with PKCS11} BuildRequires: softhsm @@ -591,14 +587,6 @@ done cp -Tuav bin/tests "%{1}/bin/tests/" \ cp -uv version "%{1}" \ -%if %{with KYUA} -# Use system installed libatf-c library with kyua tool -ATF_PATH=/usr -%else -# Disable tests, no longer shipped inside -ATF_PATH=no -%endif - export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" export CPPFLAGS="$CPPFLAGS -DDIG_SIGCHASE" export STD_CDEFINES="$CPPFLAGS" @@ -665,7 +653,7 @@ export LIBDIR_SUFFIX --enable-dnstap \ %endif %if %{with UNITTEST} - --with-atf=${ATF_PATH} \ + --with-cmocka \ %endif --enable-fixed-rrset \ --with-docbook-xsl=%{_datadir}/sgml/docbook/xsl-stylesheets \ @@ -737,7 +725,7 @@ export LIBDIR_SUFFIX --disable-isc-spnego \ %endif %if %{with UNITTEST} - --with-atf=${ATF_PATH} \ + --with-cmocka \ %endif --enable-fixed-rrset \ --disable-rpz-nsip \ commit bcfdb893b9385e8f5747992db5e95531b46f8778 Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Mar 5 21:50:48 2019 +0100 So versions change Requires rebuild of all dependent packages. diff --git a/bind.spec b/bind.spec index 510791e..bba50b9 100644 --- a/bind.spec +++ b/bind.spec @@ -45,7 +45,7 @@ # # lib*.so.X versions of selected libraries -%global sover_dns 1104 +%global sover_dns 1105 %global sover_isc 1100 %global sover_irs 161 %global sover_isccfg 163 commit 7bc8b1b992546e15ef00e4254405316059d83203 Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Mar 5 21:50:22 2019 +0100 Atf support was removed cmocka is used instead. Unfortunately it is not packaged in Fedora yet. diff --git a/bind.spec b/bind.spec index ef1be71..510791e 100644 --- a/bind.spec +++ b/bind.spec @@ -581,10 +581,9 @@ done # normal and pkcs11 unit tests %define unit_prepare_build() \ - cp -uv Kyuafile Atffile "%{1}/" \ + cp -uv Kyuafile "%{1}/" \ find lib -name 'K*.key' -exec cp -uv '{}' "%{1}/{}" ';' \ find lib -name 'Kyuafile' -exec cp -uv '{}' "%{1}/{}" ';' \ - find lib -name 'Atffile' -exec cp -uv '{}' "%{1}/{}" ';' \ find lib -name 'testdata' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \ find lib -name 'testkeys' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \ @@ -596,8 +595,8 @@ done # Use system installed libatf-c library with kyua tool ATF_PATH=/usr %else -# Use bundled atf library with atf-run -ATF_PATH=yes +# Disable tests, no longer shipped inside +ATF_PATH=no %endif export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" @@ -698,16 +697,6 @@ pushd bin/python make man popd -%if ! %{with KYUA} -# Do not build atf again for export libs -ATF_PATH="`pwd`/unit/atf" - -# Atf libs are built. Prevent their installation -sed -i -e \ -'/^SUBDIRS =/s/atf-src//i' \ -unit/Makefile -%endif - %if %{with DLZ} pushd contrib/dlz pushd bin/dlzbdb @@ -776,10 +765,6 @@ sed -i -e \ "/^SUBDIRS =/s/.*/SUBDIRS = %{bind_export_libs}/i" \ lib/Makefile -sed -i -e \ -'/^SUBDIRS =/s/atf-src//i' \ -unit/Makefile - for lib in %{bind_export_libs} do find . -name Makefile -exec sed "s/lib${lib}\./lib${lib}-export\./g" -i {} \; @@ -796,8 +781,6 @@ popd # Do not try pkcs11 and lwres in export libs sed -e '/^\s*include(.*-pkcs11/ d' -e '/^\s*include(.*lwres/ d' \ -i export-libs/lib/Kyuafile -sed -e '/^tp:.*-pkcs11/ d' -e '/^tp:\s*lwres/ d' \ - -i export-libs/lib/Atffile ## End of export libs %endif commit 1e4169114ff7a8fee368f3e5d51104705aaff60f Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Mar 5 21:49:26 2019 +0100 Adapted patches for new version Removed merged upstream. diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch index f5a6d78..bd8e74d 100644 --- a/bind-9.10-dist-native-pkcs11.patch +++ b/bind-9.10-dist-native-pkcs11.patch @@ -1,22 +1,3 @@ -From c6c0dc7addd8b27718247aa9c67e3cf3f80a8be3 Mon Sep 17 00:00:00 2001 -From: Petr Mensik <pemensik(a)redhat.com> -Date: Fri, 1 Mar 2019 11:10:03 +0100 -Subject: [PATCH] bind-9.10-dist-native-pkcs11.patch - ---- - bin/Makefile.in | 4 +-- - bin/dnssec-pkcs11/Makefile.in | 44 ++++++++++++++--------------- - bin/dnssec/Makefile.in | 2 +- - bin/named-pkcs11/Makefile.in | 45 +++++++++++++---------------- - bin/named/Makefile.in | 2 +- - bin/pkcs11/Makefile.in | 6 ++-- - configure.in | 53 +++++++++++++++++++++++++++-------- - lib/Makefile.in | 2 +- - lib/dns-pkcs11/Makefile.in | 30 ++++++++++---------- - lib/isc-pkcs11/Makefile.in | 28 +++++++++--------- - make/includes.in | 10 +++++++ - 11 files changed, 129 insertions(+), 97 deletions(-) - diff --git a/bin/Makefile.in b/bin/Makefile.in index f0c504a..ce7a2da 100644 --- a/bin/Makefile.in @@ -318,11 +299,11 @@ index a058c91..d4b689a 100644 DEPLIBS = ${ISCDEPLIBS} -diff --git a/configure.in b/configure.in -index b2bb268..d9e0797 100644 ---- a/configure.in -+++ b/configure.in -@@ -1109,12 +1109,14 @@ AC_SUBST(USE_GSSAPI) +diff --git a/configure.ac b/configure.ac +index 5e1ba8c..7aff0e6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1070,12 +1070,14 @@ AC_SUBST(USE_GSSAPI) AC_SUBST(DST_GSSAPI_INC) AC_SUBST(DNS_GSSAPI_LIBS) DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS" @@ -337,7 +318,7 @@ index b2bb268..d9e0797 100644 # # was --with-randomdev specified? -@@ -1499,11 +1501,11 @@ fi +@@ -1460,11 +1462,11 @@ fi AC_MSG_CHECKING(for OpenSSL library) OPENSSL_WARNING= openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw" @@ -354,7 +335,7 @@ index b2bb268..d9e0797 100644 if test "auto" = "$use_openssl" then -@@ -1516,6 +1518,7 @@ then +@@ -1477,6 +1479,7 @@ then fi done fi @@ -362,7 +343,7 @@ index b2bb268..d9e0797 100644 OPENSSL_ECDSA="" OPENSSL_GOST="" OPENSSL_ED25519="" -@@ -1537,11 +1540,10 @@ case "$with_gost" in +@@ -1498,11 +1501,10 @@ case "$with_gost" in ;; esac @@ -377,7 +358,7 @@ index b2bb268..d9e0797 100644 CRYPTOLIB="pkcs11" OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" -@@ -1551,7 +1553,9 @@ case "$use_openssl" in +@@ -1512,7 +1514,9 @@ case "$use_openssl" in OPENSSLGOSTLINKSRCS="" OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" @@ -388,7 +369,7 @@ index b2bb268..d9e0797 100644 no) AC_MSG_RESULT(no) DST_OPENSSL_INC="" -@@ -1583,7 +1587,7 @@ case "$use_openssl" in +@@ -1544,7 +1548,7 @@ case "$use_openssl" in If you do not want OpenSSL, use --without-openssl]) ;; *) @@ -397,7 +378,7 @@ index b2bb268..d9e0797 100644 then AC_MSG_RESULT() AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.]) -@@ -2016,6 +2020,7 @@ AC_SUBST(OPENSSL_ED25519) +@@ -1972,6 +1976,7 @@ AC_SUBST(OPENSSL_ED25519) AC_SUBST(OPENSSL_GOST) DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" @@ -405,7 +386,7 @@ index b2bb268..d9e0797 100644 ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" if test "yes" = "$with_aes" -@@ -2334,6 +2339,7 @@ esac +@@ -2295,6 +2300,7 @@ esac AC_SUBST(PKCS11LINKOBJS) AC_SUBST(PKCS11LINKSRCS) AC_SUBST(CRYPTO) @@ -413,7 +394,7 @@ index b2bb268..d9e0797 100644 AC_SUBST(PKCS11_ECDSA) AC_SUBST(PKCS11_GOST) AC_SUBST(PKCS11_ED25519) -@@ -5406,8 +5412,11 @@ AC_CONFIG_FILES([ +@@ -5425,8 +5431,11 @@ AC_CONFIG_FILES([ bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile @@ -425,7 +406,7 @@ index b2bb268..d9e0797 100644 bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile -@@ -5480,6 +5489,10 @@ AC_CONFIG_FILES([ +@@ -5499,6 +5508,10 @@ AC_CONFIG_FILES([ lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile @@ -436,7 +417,7 @@ index b2bb268..d9e0797 100644 lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile -@@ -5504,6 +5517,24 @@ AC_CONFIG_FILES([ +@@ -5523,6 +5536,24 @@ AC_CONFIG_FILES([ lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile @@ -475,7 +456,7 @@ index 81270a0..bcb5312 100644 @BIND9_MAKE_RULES@ diff --git a/lib/dns-pkcs11/Makefile.in b/lib/dns-pkcs11/Makefile.in -index 4a8549e..6a19906 100644 +index 068bbac..d7f3d95 100644 --- a/lib/dns-pkcs11/Makefile.in +++ b/lib/dns-pkcs11/Makefile.in @@ -26,16 +26,16 @@ VERSION=@BIND9_VERSION@ @@ -638,6 +619,3 @@ index fa86ad1..3cfbe9f 100644 + +DNS_PKCS11_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \ + -I${top_srcdir}/lib/dns-pkcs11/include --- -2.20.1 - diff --git a/bind-9.10-sdb.patch b/bind-9.10-sdb.patch index e087ad7..485e241 100644 --- a/bind-9.10-sdb.patch +++ b/bind-9.10-sdb.patch @@ -1,17 +1,3 @@ -From 09b71a1994d7ea3b299746167b6bcf24021edd76 Mon Sep 17 00:00:00 2001 -From: Petr Mensik <pemensik(a)redhat.com> -Date: Thu, 28 Feb 2019 18:37:01 +0100 -Subject: [PATCH] bind-9.10-sdb.patch - ---- - bin/Makefile.in | 4 +- - bin/named-sdb/Makefile.in | 25 +++++------- - bin/named-sdb/main.c | 83 +++++++++++++++++++++++++++++++++++++++ - bin/named/Makefile.in | 16 +++----- - bin/sdb_tools/Makefile.in | 10 +++-- - configure.in | 3 ++ - 6 files changed, 110 insertions(+), 31 deletions(-) - diff --git a/bin/Makefile.in b/bin/Makefile.in index ce7a2da..4e6a824 100644 --- a/bin/Makefile.in @@ -102,7 +88,7 @@ index 04dea99..4ff053e 100644 @DLZ_DRIVER_RULES@ diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c -index 8cec1ad..de5e5bb 100644 +index 17f2daa..1bb9d79 100644 --- a/bin/named-sdb/main.c +++ b/bin/named-sdb/main.c @@ -93,6 +93,10 @@ @@ -309,11 +295,11 @@ index c7e0868..95ab742 100644 ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb@EXEEXT@ ${DESTDIR}${sbindir} + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir} ${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1 -diff --git a/configure.in b/configure.in -index c09c21a..e48bd2e 100644 ---- a/configure.in -+++ b/configure.in -@@ -5417,6 +5417,8 @@ AC_CONFIG_FILES([ +diff --git a/configure.ac b/configure.ac +index 8374385..0af9b71 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5436,6 +5436,8 @@ AC_CONFIG_FILES([ bin/named/unix/Makefile bin/named-pkcs11/Makefile bin/named-pkcs11/unix/Makefile @@ -322,7 +308,7 @@ index c09c21a..e48bd2e 100644 bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile -@@ -5441,6 +5443,7 @@ AC_CONFIG_FILES([ +@@ -5460,6 +5462,7 @@ AC_CONFIG_FILES([ bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile @@ -330,6 +316,3 @@ index c09c21a..e48bd2e 100644 bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile --- -2.20.1 - diff --git a/bind-9.11-ed448-disable.patch b/bind-9.11-ed448-disable.patch deleted file mode 100644 index 179f32f..0000000 --- a/bind-9.11-ed448-disable.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e6bad0789c731f06de781997e33e864c71510ff2 Mon Sep 17 00:00:00 2001 -From: Petr Mensik <pemensik(a)redhat.com> -Date: Thu, 21 Feb 2019 12:36:17 +0100 -Subject: [PATCH] Disable autodetected ED448 algorithm support - -Implementation is broken in bind, disabled also in more recent versions. -Makes bin/tests/system/dnssec fail. ---- - configure.in | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index ca84ff3239..da4dd5f249 100644 ---- a/configure.in -+++ b/configure.in -@@ -1917,6 +1917,9 @@ int main() { - } - ], - [AC_MSG_RESULT(yes) -+ # ED448 support is broken in BIND -+ # https://gitlab.isc.org/isc-projects/bind9/issues/225 -+ # disable if autodetected, can be enabled by --with-eddsa=all - have_ed448="yes"], - [AC_MSG_RESULT(no) - have_ed448="no"], -@@ -1929,8 +1932,10 @@ int main() { - esac - case $have_ed448 in - yes) -- AC_DEFINE(HAVE_OPENSSL_ED448, 1, -- [Define if your OpenSSL version supports Ed448.]) -+ # ED448 support is broken in BIND -+ # https://gitlab.isc.org/isc-projects/bind9/issues/225 -+ # AC_DEFINE(HAVE_OPENSSL_ED448, 1, -+ # [Define if your OpenSSL version supports Ed448.]) - ;; - *) - ;; --- -2.20.1 - diff --git a/bind-9.11-export-suffix.patch b/bind-9.11-export-suffix.patch index e3ba29c..8703747 100644 --- a/bind-9.11-export-suffix.patch +++ b/bind-9.11-export-suffix.patch @@ -1,8 +1,8 @@ -diff --git a/configure.in b/configure.in -index e6cd6a4..988b0a7 100644 ---- a/configure.in -+++ b/configure.in -@@ -5116,6 +5116,8 @@ AC_SUBST(BUILD_CPPFLAGS) +diff --git a/configure.ac b/configure.ac +index c1bfd62..7c5ad51 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5333,6 +5333,8 @@ AC_SUBST(BUILD_CPPFLAGS) AC_SUBST(BUILD_LDFLAGS) AC_SUBST(BUILD_LIBS) @@ -12,10 +12,10 @@ index e6cd6a4..988b0a7 100644 # Commands to run at the end of config.status. # Don't just put these into configure, it won't work right if somebody diff --git a/isc-config.sh.in b/isc-config.sh.in -index 110191a..5a64004 100644 +index b5e94ed..d2857e0 100644 --- a/isc-config.sh.in +++ b/isc-config.sh.in -@@ -12,16 +12,17 @@ prefix=@prefix@ +@@ -13,16 +13,17 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set= includedir=@includedir@ diff --git a/bind-9.11-feature-test-dlz.patch b/bind-9.11-feature-test-dlz.patch index 2c06d9f..39e46c8 100644 --- a/bind-9.11-feature-test-dlz.patch +++ b/bind-9.11-feature-test-dlz.patch @@ -1,4 +1,4 @@ -From fe4074d27f642dd93afb5988a2edc7c173b22520 Mon Sep 17 00:00:00 2001 +From 71627db6c8852d7805ec559506f5f3cb8d89a131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Wed, 30 Jan 2019 15:12:54 +0100 Subject: [PATCH] Support DLZ filesystem detection in feature-test @@ -8,7 +8,7 @@ Do not use variable from configure to detect the feature. bin/tests/system/Makefile.in | 2 +- bin/tests/system/dlz/{prereq.sh.in => prereq.sh} | 2 +- bin/tests/system/feature-test.c | 9 +++++++++ - configure.in | 1 - + configure.ac | 1 - 4 files changed, 11 insertions(+), 3 deletions(-) rename bin/tests/system/dlz/{prereq.sh.in => prereq.sh} (91%) @@ -42,7 +42,7 @@ index afec653..fb3328e 100644 exit 255 fi diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c -index 5eee6aa..78bd3b9 100644 +index 11863a3..428d107 100644 --- a/bin/tests/system/feature-test.c +++ b/bin/tests/system/feature-test.c @@ -51,6 +51,7 @@ usage() { @@ -68,11 +68,11 @@ index 5eee6aa..78bd3b9 100644 if (strcmp(argv[1], "--ipv6only=no") == 0) { #ifdef WIN32 return (0); -diff --git a/configure.in b/configure.in -index fc1ad41..b2bb268 100644 ---- a/configure.in -+++ b/configure.in -@@ -5439,7 +5439,6 @@ AC_CONFIG_FILES([ +diff --git a/configure.ac b/configure.ac +index fddc63a..5e1ba8c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5458,7 +5458,6 @@ AC_CONFIG_FILES([ bin/tests/pkcs11/benchmarks/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh diff --git a/bind-9.11-fips-code.patch b/bind-9.11-fips-code.patch index f4973a6..1640b3e 100644 --- a/bind-9.11-fips-code.patch +++ b/bind-9.11-fips-code.patch @@ -1,4 +1,4 @@ -From 9fa0831af989818eb6f908815967590e56a19ab1 Mon Sep 17 00:00:00 2001 +From 9ff202072b286ef57e0ffcd7c55777f2994d3985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Thu, 2 Aug 2018 23:34:45 +0200 Subject: [PATCH] FIPS code changes @@ -96,36 +96,36 @@ Date: Mon Jan 22 07:21:04 2018 +0100 Add runtime detection whether MD5 is useable. --- - bin/confgen/keygen.c | 10 ++++- - bin/confgen/rndc-confgen.c | 32 ++++------------ - bin/dig/dig.c | 7 ++-- - bin/dig/dighost.c | 14 +++++-- - bin/dnssec/dnssec-keygen.c | 14 +++++++ - bin/named/config.c | 25 ++++++++++++- - bin/nsupdate/nsupdate.c | 24 +++++++----- + bin/confgen/keygen.c | 10 +++- + bin/confgen/rndc-confgen.c | 32 ++++--------- + bin/dig/dig.c | 7 +-- + bin/dig/dighost.c | 14 ++++-- + bin/dnssec/dnssec-keygen.c | 14 ++++++ + bin/named/config.c | 25 +++++++++- + bin/nsupdate/nsupdate.c | 24 ++++++---- bin/rndc/rndc.c | 3 +- - bin/tests/optional/hash_test.c | 78 ++++++++++++++++++++------------------- + bin/tests/optional/hash_test.c | 78 ++++++++++++++++--------------- bin/tests/system/tkey/keycreate.c | 3 ++ - bin/tests/system/tkey/keydelete.c | 17 ++++++--- - lib/bind9/check.c | 10 +++++ - lib/dns/dst_api.c | 23 ++++++++---- + bin/tests/system/tkey/keydelete.c | 17 ++++--- + lib/bind9/check.c | 10 ++++ + lib/dns/dst_api.c | 23 ++++++--- lib/dns/dst_internal.h | 3 +- - lib/dns/dst_parse.c | 18 +++++++-- - lib/dns/hmac_link.c | 18 ++------- + lib/dns/dst_parse.c | 18 +++++-- + lib/dns/hmac_link.c | 18 ++----- lib/dns/opensslrsa_link.c | 6 +++ - lib/dns/pkcs11rsa_link.c | 33 +++++++++++++++-- - lib/dns/rcode.c | 21 ++++++++++- - lib/dns/tests/rsa_test.c | 29 ++++++++------- + lib/dns/pkcs11rsa_link.c | 33 +++++++++++-- + lib/dns/rcode.c | 21 ++++++++- + lib/dns/tests/rsa_test.c | 4 ++ lib/dns/tests/tsig_test.c | 1 + - lib/dns/tkey.c | 9 +++++ + lib/dns/tkey.c | 9 ++++ lib/dns/tsec.c | 8 +++- - lib/dns/tsig.c | 17 +++++---- + lib/dns/tsig.c | 17 ++++--- lib/isc/include/isc/md5.h | 3 ++ - lib/isc/md5.c | 59 +++++++++++++++++++++++++++++ - lib/isc/pk11.c | 44 +++++++++++++++------- - lib/isc/tests/hash_test.c | 9 +++-- - lib/isccc/cc.c | 42 +++++++++++++-------- - 29 files changed, 409 insertions(+), 171 deletions(-) + lib/isc/md5.c | 59 +++++++++++++++++++++++ + lib/isc/pk11.c | 44 +++++++++++------ + lib/isc/tests/hash_test.c | 9 ++++ + lib/isccc/cc.c | 42 +++++++++++------ + 29 files changed, 400 insertions(+), 155 deletions(-) diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c index 8931ad5..5015abb 100644 @@ -241,7 +241,7 @@ index 5ca3d76..6b7790a 100644 port = DEFAULT_PORT; diff --git a/bin/dig/dig.c b/bin/dig/dig.c -index 39f74be..597e830 100644 +index 2063a3b..8e856c5 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -20,6 +20,7 @@ @@ -252,7 +252,7 @@ index 39f74be..597e830 100644 #include <isc/netaddr.h> #include <isc/parseint.h> #include <isc/platform.h> -@@ -1760,10 +1761,10 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, +@@ -1767,10 +1768,10 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, ptr = ptr2; ptr2 = ptr3; } else { @@ -267,7 +267,7 @@ index 39f74be..597e830 100644 digestbits = 0; } diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c -index 1fa711a..341ed80 100644 +index 011b118..5eabc1f 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -80,6 +80,7 @@ @@ -339,7 +339,7 @@ index 1476d0d..f5c9316 100644 alg = DST_ALG_HMACMD5; #else diff --git a/bin/named/config.c b/bin/named/config.c -index 2732a8f..2c4c93c 100644 +index 7584efb..a153172 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -18,6 +18,7 @@ @@ -350,7 +350,7 @@ index 2732a8f..2c4c93c 100644 #include <isc/mem.h> #include <isc/parseint.h> #include <isc/region.h> -@@ -967,6 +968,21 @@ ns_config_getkeyalgorithm(const char *str, dns_name_t **name, +@@ -969,6 +970,21 @@ ns_config_getkeyalgorithm(const char *str, dns_name_t **name, return (ns_config_getkeyalgorithm2(str, name, NULL, digestbits)); } @@ -372,7 +372,7 @@ index 2732a8f..2c4c93c 100644 isc_result_t ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, unsigned int *typep, uint16_t *digestbits) -@@ -976,7 +992,7 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, +@@ -978,7 +994,7 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, uint16_t bits; isc_result_t result; @@ -381,7 +381,7 @@ index 2732a8f..2c4c93c 100644 len = strlen(algorithms[i].str); if (strncasecmp(algorithms[i].str, str, len) == 0 && (str[len] == '\0' || -@@ -999,7 +1015,12 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, +@@ -1001,7 +1017,12 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, if (name != NULL) { switch (algorithms[i].hmac) { #ifndef PK11_MD5_DISABLE @@ -396,7 +396,7 @@ index 2732a8f..2c4c93c 100644 case hmacsha1: *name = dns_tsig_hmacsha1_name; break; case hmacsha224: *name = dns_tsig_hmacsha224_name; break; diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c -index 8d1da3b..5eefc57 100644 +index 548e0ce..509784c 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -31,6 +31,7 @@ @@ -622,7 +622,7 @@ index bde66a4..70a40c3 100644 dst_key_free(&dstkey); CHECK("MD5 was disabled", ISC_R_NOTIMPLEMENTED); diff --git a/lib/bind9/check.c b/lib/bind9/check.c -index d32a5a1..c749c27 100644 +index d6fba22..ac60ba8 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -23,6 +23,7 @@ @@ -633,7 +633,7 @@ index d32a5a1..c749c27 100644 #include <isc/mem.h> #include <isc/netaddr.h> #include <isc/parseint.h> -@@ -2592,6 +2593,15 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) { +@@ -2589,6 +2590,15 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) { } algorithm = cfg_obj_asstring(algobj); @@ -650,7 +650,7 @@ index d32a5a1..c749c27 100644 len = strlen(algorithms[i].name); if (strncasecmp(algorithms[i].name, algorithm, len) == 0 && diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c -index 97fee68..5703f9c 100644 +index e3c47a9..320c0f8 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -192,6 +192,12 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, @@ -766,7 +766,7 @@ index f31c33d..87023a6 100644 ret = DST_R_INVALIDPRIVATEKEY; goto fail; diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c -index 94e73b1..d904075 100644 +index 3b6579b..4bdce2f 100644 --- a/lib/dns/hmac_link.c +++ b/lib/dns/hmac_link.c @@ -340,20 +340,10 @@ static dst_func_t hmacmd5_functions = { @@ -792,13 +792,13 @@ index 94e73b1..d904075 100644 + if (!isc_md5_available()) + return (ISC_R_SUCCESS); + #if PK11_FLAVOR != PK11_UTIMACO_FLAVOR /* - * Prevent use of incorrect crypto diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c -index c03fd72..49b66fc 100644 +index ec35f50..c80fabe 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c -@@ -1802,6 +1802,12 @@ dst__opensslrsa_init(dst_func_t **funcp, unsigned char algorithm) { +@@ -1812,6 +1812,12 @@ dst__opensslrsa_init(dst_func_t **funcp, unsigned char algorithm) { if (*funcp == NULL) { switch (algorithm) { @@ -812,7 +812,7 @@ index c03fd72..49b66fc 100644 #if defined(HAVE_EVP_SHA256) || !USE_EVP *funcp = &opensslrsa_functions; diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c -index eb782c8..46fd844 100644 +index 096c1a8..6c280bf 100644 --- a/lib/dns/pkcs11rsa_link.c +++ b/lib/dns/pkcs11rsa_link.c @@ -96,10 +96,15 @@ pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) { @@ -832,7 +832,7 @@ index eb782c8..46fd844 100644 case DST_ALG_RSASHA1: case DST_ALG_NSEC3RSASHA1: /* From RFC 3110 */ -@@ -636,6 +641,9 @@ pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) { +@@ -641,6 +646,9 @@ pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) { switch (key->key_alg) { #ifndef PK11_MD5_DISABLE case DST_ALG_RSAMD5: @@ -842,7 +842,7 @@ index eb782c8..46fd844 100644 mech.mechanism = CKM_MD5; break; #endif -@@ -792,6 +800,9 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { +@@ -799,6 +807,9 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { switch (key->key_alg) { #ifndef PK11_MD5_DISABLE case DST_ALG_RSAMD5: @@ -852,7 +852,7 @@ index eb782c8..46fd844 100644 der = md5_der; derlen = sizeof(md5_der); hashlen = ISC_MD5_DIGESTLENGTH; -@@ -1016,6 +1027,9 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) { +@@ -1024,6 +1035,9 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) { switch (key->key_alg) { #ifndef PK11_MD5_DISABLE case DST_ALG_RSAMD5: @@ -862,7 +862,7 @@ index eb782c8..46fd844 100644 der = md5_der; derlen = sizeof(md5_der); hashlen = ISC_MD5_DIGESTLENGTH; -@@ -2219,11 +2233,22 @@ static dst_func_t pkcs11rsa_functions = { +@@ -2231,11 +2245,22 @@ static dst_func_t pkcs11rsa_functions = { }; isc_result_t @@ -889,7 +889,7 @@ index eb782c8..46fd844 100644 } diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c -index 6a5948e..010dd1b 100644 +index 9c42c50..f51d548 100644 --- a/lib/dns/rcode.c +++ b/lib/dns/rcode.c @@ -16,6 +16,7 @@ @@ -900,7 +900,7 @@ index 6a5948e..010dd1b 100644 #include <isc/parseint.h> #include <isc/print.h> #include <isc/region.h> -@@ -349,17 +350,33 @@ dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) { +@@ -357,17 +358,33 @@ dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) { return (dns_mnemonic_totext(cert, target, certs)); } @@ -937,70 +937,48 @@ index 6a5948e..010dd1b 100644 void diff --git a/lib/dns/tests/rsa_test.c b/lib/dns/tests/rsa_test.c -index fb207ef..3ef0a4e 100644 +index 16214c6..9b235ba 100644 --- a/lib/dns/tests/rsa_test.c +++ b/lib/dns/tests/rsa_test.c -@@ -19,6 +19,7 @@ - #include <stdio.h> - #include <string.h> +@@ -26,6 +26,7 @@ + #define UNIT_TESTING + #include <cmocka.h> +#include <isc/md5.h> #include <isc/util.h> #include <isc/print.h> -@@ -225,23 +226,25 @@ ATF_TC_BODY(isc_rsa_verify, tc) { +@@ -247,6 +248,8 @@ isc_rsa_verify_test(void **state) { /* RSAMD5 */ #ifndef PK11_MD5_DISABLE -- key->key_alg = DST_ALG_RSAMD5; + if (isc_md5_available()) { -+ key->key_alg = DST_ALG_RSAMD5; - -- ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC, -- false, &ctx); -- ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); -+ ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC, -+ false, &ctx); -+ ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); - -- r.base = d; -- r.length = 10; -- ret = dst_context_adddata(ctx, &r); -- ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); -+ r.base = d; -+ r.length = 10; -+ ret = dst_context_adddata(ctx, &r); -+ ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); - -- r.base = sigmd5; -- r.length = 256; -- ret = dst_context_verify(ctx, &r); -- ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); -+ r.base = sigmd5; -+ r.length = 256; -+ ret = dst_context_verify(ctx, &r); -+ ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); - -- dst_context_destroy(&ctx); -+ dst_context_destroy(&ctx); ++ /* wrong indentation is kept for diff minimization */ + key->key_alg = DST_ALG_RSAMD5; + + ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC, +@@ -264,6 +267,7 @@ isc_rsa_verify_test(void **state) { + assert_int_equal(ret, ISC_R_SUCCESS); + + dst_context_destroy(&ctx); + } #endif /* RSASHA256 */ diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c -index 443fb36..f003ff3 100644 +index 4d6847e..1a208b5 100644 --- a/lib/dns/tests/tsig_test.c +++ b/lib/dns/tests/tsig_test.c -@@ -14,6 +14,7 @@ - #include <config.h> - #include <atf-c.h> +@@ -24,6 +24,7 @@ + #define UNIT_TESTING + #include <cmocka.h> +#include <isc/md5.h> #include <isc/mem.h> #include <isc/print.h> - + #include <isc/util.h> diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c -index 5b4ffd9..cc3469d 100644 +index 89cfc79..d07364a 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -245,6 +245,9 @@ compute_secret(isc_buffer_t *shared, isc_region_t *queryrandomness, @@ -1027,7 +1005,7 @@ index 5b4ffd9..cc3469d 100644 tkey_log("process_dhtkey: algorithms other than " "hmac-md5 are not supported"); diff --git a/lib/dns/tsec.c b/lib/dns/tsec.c -index c5eca0e..19b9002 100644 +index 9d8ead4..0c82f65 100644 --- a/lib/dns/tsec.c +++ b/lib/dns/tsec.c @@ -11,6 +11,7 @@ @@ -1053,7 +1031,7 @@ index c5eca0e..19b9002 100644 #endif case DST_ALG_HMACSHA1: diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c -index a94ec69..f74c831 100644 +index 58c1104..00ee1e1 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -273,7 +273,8 @@ dns_tsigkey_createfromkey(dns_name_t *name, dns_name_t *algorithm, @@ -1086,7 +1064,7 @@ index a94ec69..f74c831 100644 if (secret != NULL) { isc_buffer_t b; -@@ -1283,7 +1286,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, +@@ -1291,7 +1294,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, return (ret); if ( #ifndef PK11_MD5_DISABLE @@ -1095,7 +1073,7 @@ index a94ec69..f74c831 100644 #endif alg == DST_ALG_HMACSHA1 || alg == DST_ALG_HMACSHA224 || alg == DST_ALG_HMACSHA256 || -@@ -1452,7 +1455,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, +@@ -1460,7 +1463,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, if ( #ifndef PK11_MD5_DISABLE @@ -1104,7 +1082,7 @@ index a94ec69..f74c831 100644 #endif alg == DST_ALG_HMACSHA1 || alg == DST_ALG_HMACSHA224 || alg == DST_ALG_HMACSHA256 || -@@ -1593,7 +1596,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { +@@ -1601,7 +1604,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { goto cleanup_querystruct; if ( #ifndef PK11_MD5_DISABLE @@ -1113,7 +1091,7 @@ index a94ec69..f74c831 100644 #endif alg == DST_ALG_HMACSHA1 || alg == DST_ALG_HMACSHA224 || -@@ -1772,7 +1775,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { +@@ -1780,7 +1783,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { goto cleanup_context; if ( #ifndef PK11_MD5_DISABLE @@ -1137,7 +1115,7 @@ index 4d29398..e3f5cec 100644 #endif /* !PK11_MD5_DISABLE */ diff --git a/lib/isc/md5.c b/lib/isc/md5.c -index 25c71a2..934a70c 100644 +index 920aed5..a086a57 100644 --- a/lib/isc/md5.c +++ b/lib/isc/md5.c @@ -37,6 +37,7 @@ @@ -1237,7 +1215,7 @@ index 25c71a2..934a70c 100644 /* diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c -index c5d2310..a01e698 100644 +index 0d5b009..bb9912b 100644 --- a/lib/isc/pk11.c +++ b/lib/isc/pk11.c @@ -197,8 +197,6 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) { @@ -1356,39 +1334,39 @@ index c5d2310..a01e698 100644 /* ECDSA requires digest */ diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c -index 8f12342..7eb1552 100644 +index 8ddfe70..9c4d299 100644 --- a/lib/isc/tests/hash_test.c +++ b/lib/isc/tests/hash_test.c -@@ -2009,7 +2009,8 @@ ATF_TP_ADD_TCS(tp) { - * various cryptographic hashes. - */ - #ifndef PK11_MD5_DISABLE -- ATF_TP_ADD_TC(tp, md5_check); -+ if (isc_md5_available()) -+ ATF_TP_ADD_TC(tp, md5_check); - #endif - ATF_TP_ADD_TC(tp, sha1_check); +@@ -776,6 +776,9 @@ isc_md5_test(void **state) { + + UNUSED(state); + ++ if (!isc_md5_available()) ++ return; ++ + /* + * These are the various test vectors. All of these are passed + * through the hash function and the results are compared to the +@@ -1631,6 +1634,9 @@ isc_hmacmd5_test(void **state) { + + UNUSED(state); + ++ if (!isc_md5_available()) ++ return; ++ + /* + * These are the various test vectors. All of these are passed + * through the hash function and the results are compared to the +@@ -1941,6 +1947,9 @@ static void + md5_check_test(void **state) { + UNUSED(state); + ++ if (!isc_md5_available()) ++ return; ++ + assert_true(isc_md5_check(false)); + assert_false(isc_md5_check(true)); -@@ -2017,7 +2018,8 @@ ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, isc_hash_function_reverse); - ATF_TP_ADD_TC(tp, isc_hash_initializer); - #ifndef PK11_MD5_DISABLE -- ATF_TP_ADD_TC(tp, isc_hmacmd5); -+ if (isc_md5_available()) -+ ATF_TP_ADD_TC(tp, isc_hmacmd5); - #endif - ATF_TP_ADD_TC(tp, isc_hmacsha1); - ATF_TP_ADD_TC(tp, isc_hmacsha224); -@@ -2025,7 +2027,8 @@ ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, isc_hmacsha384); - ATF_TP_ADD_TC(tp, isc_hmacsha512); - #ifndef PK11_MD5_DISABLE -- ATF_TP_ADD_TC(tp, isc_md5); -+ if (isc_md5_available()) -+ ATF_TP_ADD_TC(tp, isc_md5); - #endif - ATF_TP_ADD_TC(tp, isc_sha1); - ATF_TP_ADD_TC(tp, isc_sha224); diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c index c2740cb..c314d76 100644 --- a/lib/isccc/cc.c @@ -1477,5 +1455,5 @@ index c2740cb..c314d76 100644 case ISCCC_ALG_HMACSHA1: -- -2.14.4 +2.20.1 diff --git a/bind-9.11-fips-tests.patch b/bind-9.11-fips-tests.patch index 16d3b33..b86b783 100644 --- a/bind-9.11-fips-tests.patch +++ b/bind-9.11-fips-tests.patch @@ -1,4 +1,4 @@ -From 07876a60a9c2537f536901b214349d67f6b25666 Mon Sep 17 00:00:00 2001 +From 4e6888c1d32071ead4b7faeeb0f1774a6d8a1120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Thu, 2 Aug 2018 23:46:45 +0200 Subject: [PATCH] FIPS tests changes @@ -58,56 +58,54 @@ Date: Wed Mar 7 10:44:23 2018 +0100 Use hmac-sha256 instead of default hmac-md5 for allow-query --- - bin/tests/system/acl/ns2/named1.conf.in | 4 +- - bin/tests/system/acl/ns2/named2.conf.in | 4 +- - bin/tests/system/acl/ns2/named3.conf.in | 6 +-- - bin/tests/system/acl/ns2/named4.conf.in | 4 +- - bin/tests/system/acl/ns2/named5.conf.in | 4 +- - bin/tests/system/acl/tests.sh | 32 +++++------ - bin/tests/system/allow-query/ns2/named10.conf.in | 2 +- - bin/tests/system/allow-query/ns2/named11.conf.in | 4 +- - bin/tests/system/allow-query/ns2/named12.conf.in | 2 +- - bin/tests/system/allow-query/ns2/named30.conf.in | 2 +- - bin/tests/system/allow-query/ns2/named31.conf.in | 4 +- - bin/tests/system/allow-query/ns2/named32.conf.in | 2 +- - bin/tests/system/allow-query/ns2/named40.conf.in | 4 +- - bin/tests/system/allow-query/tests.sh | 18 +++---- - bin/tests/system/catz/ns1/named.conf.in | 2 +- - bin/tests/system/catz/ns2/named.conf.in | 2 +- - bin/tests/system/checkconf/bad-tsig.conf | 2 +- - bin/tests/system/checkconf/good.conf | 2 +- - bin/tests/system/digdelv/ns2/example.db | 15 +++--- - bin/tests/system/digdelv/tests.sh | 28 +++++----- - bin/tests/system/dlv/ns1/sign.sh | 4 +- - bin/tests/system/dlv/ns2/sign.sh | 4 +- - bin/tests/system/dlv/ns3/sign.sh | 69 ++++++++++++------------ - bin/tests/system/dlv/ns6/sign.sh | 66 ++++++++++++----------- - bin/tests/system/dnssec/ns1/sign.sh | 4 +- - bin/tests/system/dnssec/ns2/sign.sh | 12 ++--- - bin/tests/system/dnssec/ns3/sign.sh | 20 +++---- - bin/tests/system/dnssec/ns5/trusted.conf.bad | 2 +- - bin/tests/system/dnssec/tests.sh | 8 +-- - bin/tests/system/feature-test.c | 14 +++++ - bin/tests/system/filter-aaaa/ns1/sign.sh | 4 +- - bin/tests/system/filter-aaaa/ns4/sign.sh | 4 +- - bin/tests/system/notify/ns5/named.conf.in | 6 +-- - bin/tests/system/notify/tests.sh | 6 +-- - bin/tests/system/nsupdate/ns1/named.conf.in | 2 +- - bin/tests/system/nsupdate/ns2/named.conf.in | 2 +- - bin/tests/system/nsupdate/setup.sh | 7 ++- - bin/tests/system/nsupdate/tests.sh | 11 +++- - bin/tests/system/rndc/setup.sh | 2 +- - bin/tests/system/rndc/tests.sh | 23 ++++---- - bin/tests/system/tsig/clean.sh | 1 + - bin/tests/system/tsig/ns1/named.conf.in | 10 +--- - bin/tests/system/tsig/ns1/rndc5.conf.in | 11 ++++ - bin/tests/system/tsig/setup.sh | 4 ++ - bin/tests/system/tsig/tests.sh | 67 ++++++++++++++--------- - bin/tests/system/tsiggss/setup.sh | 2 +- - bin/tests/system/upforwd/ns1/named.conf.in | 2 +- - bin/tests/system/upforwd/tests.sh | 2 +- - 48 files changed, 287 insertions(+), 225 deletions(-) - create mode 100644 bin/tests/system/tsig/ns1/rndc5.conf.in + bin/tests/system/acl/ns2/named1.conf.in | 4 +- + bin/tests/system/acl/ns2/named2.conf.in | 4 +- + bin/tests/system/acl/ns2/named3.conf.in | 6 +- + bin/tests/system/acl/ns2/named4.conf.in | 4 +- + bin/tests/system/acl/ns2/named5.conf.in | 4 +- + bin/tests/system/acl/tests.sh | 32 ++++----- + .../system/allow-query/ns2/named10.conf.in | 2 +- + .../system/allow-query/ns2/named11.conf.in | 4 +- + .../system/allow-query/ns2/named12.conf.in | 2 +- + .../system/allow-query/ns2/named30.conf.in | 2 +- + .../system/allow-query/ns2/named31.conf.in | 4 +- + .../system/allow-query/ns2/named32.conf.in | 2 +- + .../system/allow-query/ns2/named40.conf.in | 4 +- + bin/tests/system/allow-query/tests.sh | 18 ++--- + bin/tests/system/catz/ns1/named.conf.in | 2 +- + bin/tests/system/catz/ns2/named.conf.in | 2 +- + bin/tests/system/checkconf/bad-tsig.conf | 2 +- + bin/tests/system/checkconf/good.conf | 2 +- + bin/tests/system/digdelv/ns2/example.db | 15 ++-- + bin/tests/system/digdelv/tests.sh | 28 ++++---- + bin/tests/system/dlv/ns1/sign.sh | 4 +- + bin/tests/system/dlv/ns2/sign.sh | 4 +- + bin/tests/system/dlv/ns3/sign.sh | 69 ++++++++++--------- + bin/tests/system/dlv/ns6/sign.sh | 66 +++++++++--------- + bin/tests/system/dnssec/ns1/sign.sh | 4 +- + bin/tests/system/dnssec/ns2/sign.sh | 12 ++-- + bin/tests/system/dnssec/ns3/sign.sh | 20 +++--- + bin/tests/system/dnssec/ns5/trusted.conf.bad | 2 +- + bin/tests/system/dnssec/tests.sh | 8 +-- + bin/tests/system/feature-test.c | 14 ++++ + bin/tests/system/filter-aaaa/ns1/sign.sh | 4 +- + bin/tests/system/filter-aaaa/ns4/sign.sh | 4 +- + bin/tests/system/notify/ns5/named.conf.in | 6 +- + bin/tests/system/notify/tests.sh | 6 +- + bin/tests/system/nsupdate/ns1/named.conf.in | 2 +- + bin/tests/system/nsupdate/ns2/named.conf.in | 2 +- + bin/tests/system/nsupdate/setup.sh | 7 +- + bin/tests/system/nsupdate/tests.sh | 11 ++- + bin/tests/system/rndc/setup.sh | 2 +- + bin/tests/system/rndc/tests.sh | 23 ++++--- + bin/tests/system/tsig/clean.sh | 1 + + bin/tests/system/tsig/ns1/named.conf.in | 10 +-- + bin/tests/system/tsig/setup.sh | 5 ++ + bin/tests/system/tsig/tests.sh | 67 +++++++++++------- + bin/tests/system/tsiggss/setup.sh | 2 +- + bin/tests/system/upforwd/ns1/named.conf.in | 2 +- + bin/tests/system/upforwd/tests.sh | 2 +- + 47 files changed, 277 insertions(+), 225 deletions(-) diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in index 0ea6502..026db3f 100644 @@ -604,7 +602,7 @@ index f4e30f5..9f53e31 100644 ; TTL of 3 weeks weeks 1814400 A 10.53.0.2 diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh -index 95bd074..b566ecb 100644 +index 24aa7b3..54a3e2a 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -61,7 +61,7 @@ if [ -x ${DIG} ] ; then @@ -670,7 +668,7 @@ index 95bd074..b566ecb 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -555,7 +555,7 @@ if [ -x ${DELV} ] ; then +@@ -564,7 +564,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +multi +norrcomments works for dnskey (when default is rrcomments)($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +multi +norrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -679,7 +677,7 @@ index 95bd074..b566ecb 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -563,7 +563,7 @@ if [ -x ${DELV} ] ; then +@@ -572,7 +572,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +multi +norrcomments works for soa (when default is rrcomments)($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +multi +norrcomments SOA example > delv.out.test$n || ret=1 @@ -688,7 +686,7 @@ index 95bd074..b566ecb 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -571,7 +571,7 @@ if [ -x ${DELV} ] ; then +@@ -580,7 +580,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +rrcomments works for DNSKEY($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -697,7 +695,7 @@ index 95bd074..b566ecb 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -579,7 +579,7 @@ if [ -x ${DELV} ] ; then +@@ -588,7 +588,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +short +rrcomments works for DNSKEY ($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -706,7 +704,7 @@ index 95bd074..b566ecb 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -587,7 +587,7 @@ if [ -x ${DELV} ] ; then +@@ -596,7 +596,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +short +rrcomments works ($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -715,7 +713,7 @@ index 95bd074..b566ecb 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -595,7 +595,7 @@ if [ -x ${DELV} ] ; then +@@ -604,7 +604,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +short +nosplit works ($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +short +nosplit DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -724,7 +722,7 @@ index 95bd074..b566ecb 100644 if test `wc -l < delv.out.test$n` != 1 ; then ret=1 ; fi f=`awk '{print NF}' < delv.out.test$n` test "${f:-0}" -eq 14 || ret=1 -@@ -606,7 +606,7 @@ if [ -x ${DELV} ] ; then +@@ -615,7 +615,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +short +nosplit +norrcomments works ($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +short +nosplit +norrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -1171,10 +1169,10 @@ index 198d60a..d89a539 100644 keyid=`expr $keyid + 0` echo "$keyid" > managed.key.id diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh -index 9078459..9dcd028 100644 +index ca18608..25b6cab 100644 --- a/bin/tests/system/dnssec/ns2/sign.sh +++ b/bin/tests/system/dnssec/ns2/sign.sh -@@ -29,8 +29,8 @@ do +@@ -30,8 +30,8 @@ do cp ../ns3/dsset-$subdomain.example$TP . done @@ -1185,7 +1183,7 @@ index 9078459..9dcd028 100644 cat $infile $keyname1.key $keyname2.key >$zonefile -@@ -89,8 +89,8 @@ zone=in-addr.arpa. +@@ -91,8 +91,8 @@ zone=in-addr.arpa. infile=in-addr.arpa.db.in zonefile=in-addr.arpa.db @@ -1196,7 +1194,7 @@ index 9078459..9dcd028 100644 cat $infile $keyname1.key $keyname2.key >$zonefile $SIGNER -P -g -r $RANDFILE -o $zone -k $keyname1 $zonefile $keyname2 > /dev/null -@@ -101,7 +101,7 @@ privzone=private.secure.example. +@@ -103,7 +103,7 @@ privzone=private.secure.example. privinfile=private.secure.example.db.in privzonefile=private.secure.example.db @@ -1205,7 +1203,7 @@ index 9078459..9dcd028 100644 cat $privinfile $privkeyname.key >$privzonefile -@@ -115,7 +115,7 @@ dlvinfile=dlv.db.in +@@ -117,7 +117,7 @@ dlvinfile=dlv.db.in dlvzonefile=dlv.db dlvsetfile=dlvset-`echo $privzone |sed -e "s/\.$//g"`$TP @@ -1215,7 +1213,7 @@ index 9078459..9dcd028 100644 cat $dlvinfile $dlvkeyname.key $dlvsetfile > $dlvzonefile diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh -index 330abf7..f95a6b7 100644 +index ff55d84..4f6a251 100644 --- a/bin/tests/system/dnssec/ns3/sign.sh +++ b/bin/tests/system/dnssec/ns3/sign.sh @@ -28,7 +28,7 @@ zone=bogus.example. @@ -1292,7 +1290,7 @@ index 330abf7..f95a6b7 100644 cat $infile $keyname.key >$zonefile -@@ -498,7 +498,7 @@ zone=badds.example. +@@ -533,7 +533,7 @@ zone=badds.example. infile=bogus.example.db.in zonefile=badds.example.db @@ -1313,10 +1311,10 @@ index ed30460..e6b1126 100644 + "." 256 3 8 "AwEAAarwAdjV4gIhpBCjXVAScRFEx3co7k8smJdxrnqoGsl5NB7EZ9jRdgvCXbJn6v8y9jlNWVHvaC8ilhfhLh0A1vLWiWv4ijd/12xcnrY7xpG7Cu3YkxUxaXJ7Jdg/Iw1+9mGgXF1v4UbCIcw/3U3cxyk7OxYg+VSb5KBAQSR0upxV"; }; diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh -index bb2315f..3156668 100644 +index 646434f..9a10f9f 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh -@@ -1690,7 +1690,7 @@ ret=0 +@@ -1688,7 +1688,7 @@ ret=0 $RNDCCMD 10.53.0.4 secroots 2>&1 | sed 's/^/ns4 /' | cat_i keyid=`cat ns1/managed.key.id` cp ns4/named.secroots named.secroots.test$n @@ -1325,7 +1323,7 @@ index bb2315f..3156668 100644 [ "$linecount" -eq 1 ] || ret=1 linecount=`cat named.secroots.test$n | wc -l` [ "$linecount" -eq 10 ] || ret=1 -@@ -3018,7 +3018,7 @@ echo_i "check dig's +nocrypto flag ($n)" +@@ -3016,7 +3016,7 @@ echo_i "check dig's +nocrypto flag ($n)" ret=0 $DIG $DIGOPTS +norec +nocrypto DNSKEY . \ @10.53.0.1 > dig.out.dnskey.ns1.test$n || ret=1 @@ -1334,7 +1332,7 @@ index bb2315f..3156668 100644 grep 'RRSIG.* \[omitted]' dig.out.dnskey.ns1.test$n > /dev/null || ret=1 $DIG $DIGOPTS +norec +nocrypto DS example \ @10.53.0.1 > dig.out.ds.ns1.test$n || ret=1 -@@ -3130,8 +3130,8 @@ do +@@ -3128,8 +3128,8 @@ do alg=`expr $alg + 1` continue;; 3) size="-b 512";; @@ -1346,7 +1344,7 @@ index bb2315f..3156668 100644 8) size="-b 512";; 10) size="-b 1024";; diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c -index 9612450..5eee6aa 100644 +index f934b63..11863a3 100644 --- a/bin/tests/system/feature-test.c +++ b/bin/tests/system/feature-test.c @@ -19,6 +19,7 @@ @@ -1440,10 +1438,10 @@ index cfcfe8f..0a1614d 100644 }; diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh -index ad20e3e..5a9ce46 100644 +index 1f6e6d0..c08bd25 100644 --- a/bin/tests/system/notify/tests.sh +++ b/bin/tests/system/notify/tests.sh -@@ -186,16 +186,16 @@ ret=0 +@@ -212,16 +212,16 @@ ret=0 $NSUPDATE << EOF server 10.53.0.5 ${PORT} zone x21 @@ -1477,10 +1475,10 @@ index 1d999ad..26b6b7c 100644 }; diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in -index b4ecf96..1adb33e 100644 +index 4549184..cb7dccd 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf.in +++ b/bin/tests/system/nsupdate/ns2/named.conf.in -@@ -24,7 +24,7 @@ options { +@@ -33,7 +33,7 @@ controls { }; key altkey { @@ -1490,7 +1488,7 @@ index b4ecf96..1adb33e 100644 }; diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh -index d6647fa..715314b 100644 +index 45dfeeb..594db77 100644 --- a/bin/tests/system/nsupdate/setup.sh +++ b/bin/tests/system/nsupdate/setup.sh @@ -63,7 +63,12 @@ EOF @@ -1508,7 +1506,7 @@ index d6647fa..715314b 100644 $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha224 -k sha224-key -z keytests.nil > ns1/sha224.key $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha256 -k sha256-key -z keytests.nil > ns1/sha256.key diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh -index 9f26572..fd0383f 100755 +index 901cd22..b72b59c 100755 --- a/bin/tests/system/nsupdate/tests.sh +++ b/bin/tests/system/nsupdate/tests.sh @@ -700,7 +700,14 @@ fi @@ -1537,7 +1535,7 @@ index 9f26572..fd0383f 100755 done if [ $ret -ne 0 ]; then diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh -index 850c4d2..09a3e0f 100644 +index 343869e..c30efb0 100644 --- a/bin/tests/system/rndc/setup.sh +++ b/bin/tests/system/rndc/setup.sh @@ -37,7 +37,7 @@ make_key () { @@ -1550,7 +1548,7 @@ index 850c4d2..09a3e0f 100644 make_key 3 ${EXTRAPORT3} hmac-sha224 make_key 4 ${EXTRAPORT4} hmac-sha256 diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh -index 647730e..7df752d 100644 +index b00056c..f7fad91 100644 --- a/bin/tests/system/rndc/tests.sh +++ b/bin/tests/system/rndc/tests.sh @@ -356,15 +356,20 @@ if [ $ret != 0 ]; then echo_i "failed"; fi @@ -1620,31 +1618,15 @@ index fbf30c6..f61657d 100644 key "sha1-trunc" { secret "FrSt77yPTFx6hTs4i2tKLB9LmE0="; -diff --git a/bin/tests/system/tsig/ns1/rndc5.conf.in b/bin/tests/system/tsig/ns1/rndc5.conf.in -new file mode 100644 -index 0000000..4117830 ---- /dev/null -+++ b/bin/tests/system/tsig/ns1/rndc5.conf.in -@@ -0,0 +1,11 @@ -+ -+key "md5" { -+ secret "97rnFx24Tfna4mHPfgnerA=="; -+ algorithm hmac-md5; -+}; -+ -+key "md5-trunc" { -+ secret "97rnFx24Tfna4mHPfgnerA=="; -+ algorithm hmac-md5-80; -+}; -+ diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh -index 656e9bb..628c5bb 100644 +index 4dd4a25..aa0f966 100644 --- a/bin/tests/system/tsig/setup.sh +++ b/bin/tests/system/tsig/setup.sh -@@ -17,3 +17,7 @@ $SHELL clean.sh +@@ -17,3 +17,8 @@ $SHELL clean.sh copy_setports ns1/named.conf.in ns1/named.conf - test -r $RANDFILE || $GENRANDOM 400 $RANDFILE + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE ++ +if $FEATURETEST --md5 +then + cat ns1/rndc5.conf.in >> ns1/named.conf @@ -1742,10 +1724,10 @@ index f731fa6..cade35b 100644 echo_i "fetching using hmac-sha1-80 (BADTRUNC)" diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh -index 5da33cf..fb108b0 100644 +index 0d21c7b..dbcb7b4 100644 --- a/bin/tests/system/tsiggss/setup.sh +++ b/bin/tests/system/tsiggss/setup.sh -@@ -18,5 +18,5 @@ test -r $RANDFILE || $GENRANDOM 400 $RANDFILE +@@ -18,5 +18,5 @@ test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE copy_setports ns1/named.conf.in ns1/named.conf @@ -1779,5 +1761,5 @@ index b0694bb..9adae82 100644 update add updated.example. 600 A 10.10.10.1 update add updated.example. 600 TXT Foo -- -2.14.4 +2.20.1 diff --git a/bind-9.11-host-idn-disable.patch b/bind-9.11-host-idn-disable.patch index 7d52964..7f02b4c 100644 --- a/bind-9.11-host-idn-disable.patch +++ b/bind-9.11-host-idn-disable.patch @@ -1,4 +1,4 @@ -From ed26f0f0eb4242706d2012e4abe0152071bb305b Mon Sep 17 00:00:00 2001 +From ec50eff97c259b5bfbfa4e050d69fe7b39b0f15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Tue, 25 Sep 2018 18:08:46 +0200 Subject: [PATCH] Disable IDN from environment as documented @@ -12,16 +12,16 @@ Support variable CHARSET=ASCII to disable IDN, supported in downstream RH patch since RHEL 5. --- bin/dig/dig.docbook | 4 +++- - bin/dig/dighost.c | 9 +++++++-- + bin/dig/dighost.c | 5 +++++ bin/dig/host.docbook | 2 +- bin/dig/nslookup.docbook | 15 +++++++++++++++ - 4 files changed, 26 insertions(+), 4 deletions(-) + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook -index bd7510e..5cc696f 100644 +index 5d19301..933af79 100644 --- a/bin/dig/dig.docbook +++ b/bin/dig/dig.docbook -@@ -1288,7 +1288,9 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr +@@ -1312,7 +1312,9 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr reply from the server. If you'd like to turn off the IDN support for some reason, use parameters <parameter>+noidnin</parameter> and @@ -33,15 +33,13 @@ index bd7510e..5cc696f 100644 </refsection> diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c -index 341ed80..bb8702c 100644 +index 5eabc1f..73aaab8 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c -@@ -825,12 +825,17 @@ make_empty_lookup(void) { - looknew->seenbadcookie = false; +@@ -826,6 +826,11 @@ make_empty_lookup(void) { looknew->badcookie = true; #ifdef WITH_IDN_SUPPORT -- looknew->idnin = true; -+ looknew->idnin = (getenv("IDN_DISABLE") == NULL); + looknew->idnin = isatty(1)?(getenv("IDN_DISABLE") == NULL):false; + if (looknew->idnin) { + const char *charset = getenv("CHARSET"); + if (charset && !strcmp(charset, "ASCII")) @@ -50,17 +48,11 @@ index 341ed80..bb8702c 100644 #else looknew->idnin = false; #endif - #ifdef WITH_IDN_OUT_SUPPORT -- looknew->idnout = true; -+ looknew->idnout = looknew->idnin; - #else - looknew->idnout = false; - #endif diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook -index 9c3aeaa..42cbbf9 100644 +index da0f8fb..9689b5a 100644 --- a/bin/dig/host.docbook +++ b/bin/dig/host.docbook -@@ -378,7 +378,7 @@ +@@ -379,7 +379,7 @@ <command>host</command> appropriately converts character encoding of domain name before sending a request to DNS server or displaying a reply from the server. @@ -70,10 +62,10 @@ index 9c3aeaa..42cbbf9 100644 The IDN support is disabled if the variable is set when <command>host</command> runs. diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook -index 3aff4e9..86a09c6 100644 +index d46fc2d..6d7d181 100644 --- a/bin/dig/nslookup.docbook +++ b/bin/dig/nslookup.docbook -@@ -478,6 +478,21 @@ nslookup -query=hinfo -timeout=10 +@@ -495,6 +495,21 @@ nslookup -query=hinfo -timeout=10 </para> </refsection> @@ -96,5 +88,5 @@ index 3aff4e9..86a09c6 100644 <para><filename>/etc/resolv.conf</filename> -- -2.14.4 +2.20.1 diff --git a/bind-9.11-kyua-pkcs11.patch b/bind-9.11-kyua-pkcs11.patch index 1b83800..caf57bb 100644 --- a/bind-9.11-kyua-pkcs11.patch +++ b/bind-9.11-kyua-pkcs11.patch @@ -1,4 +1,4 @@ -From 3474d13bbf08c441783bd72afbc8cec8857baf46 Mon Sep 17 00:00:00 2001 +From 17998f4feb9590522a0b50943075d9e8c97ec69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Tue, 2 Jan 2018 18:13:07 +0100 Subject: [PATCH] Fix pkcs11 variants atf tests @@ -7,20 +7,19 @@ Add dns-pkcs11 tests Makefile to configure Add pkcs11 Kyuafile, fix dh_test to pass in pkcs11 mode --- - configure.in | 1 + - lib/Atffile | 2 ++ + configure.ac | 1 + lib/Kyuafile | 2 ++ lib/dns-pkcs11/tests/Makefile.in | 10 +++++----- lib/dns-pkcs11/tests/dh_test.c | 3 ++- lib/isc-pkcs11/tests/Makefile.in | 6 +++--- lib/isc-pkcs11/tests/hash_test.c | 32 +++++++++++++++++++++++++------- - 7 files changed, 40 insertions(+), 16 deletions(-) + 6 files changed, 38 insertions(+), 16 deletions(-) -diff --git a/configure.in b/configure.in -index 1edafd1..5466de1 100644 ---- a/configure.in -+++ b/configure.in -@@ -5489,6 +5489,7 @@ AC_CONFIG_FILES([ +diff --git a/configure.ac b/configure.ac +index 7aff0e6..8374385 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5512,6 +5512,7 @@ AC_CONFIG_FILES([ lib/dns-pkcs11/include/Makefile lib/dns-pkcs11/include/dns/Makefile lib/dns-pkcs11/include/dst/Makefile @@ -28,25 +27,11 @@ index 1edafd1..5466de1 100644 lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile -diff --git a/lib/Atffile b/lib/Atffile -index 93bbb01..4db3dce 100644 ---- a/lib/Atffile -+++ b/lib/Atffile -@@ -3,7 +3,9 @@ Content-Type: application/X-atf-atffile; version="1" - prop: test-suite = bind9 - - tp: dns -+tp: dns-pkcs11 - tp: irs - tp: isc -+tp: isc-pkcs11 - tp: isccfg - tp: lwres diff --git a/lib/Kyuafile b/lib/Kyuafile -index ff9fc56..eaaf0dc 100644 +index 7c8bab0..eec9564 100644 --- a/lib/Kyuafile +++ b/lib/Kyuafile -@@ -2,7 +2,9 @@ syntax(2) +@@ -2,8 +2,10 @@ syntax(2) test_suite('bind9') include('dns/Kyuafile') @@ -54,18 +39,19 @@ index ff9fc56..eaaf0dc 100644 include('irs/Kyuafile') include('isc/Kyuafile') +include('isc-pkcs11/Kyuafile') + include('isccc/Kyuafile') include('isccfg/Kyuafile') include('lwres/Kyuafile') diff --git a/lib/dns-pkcs11/tests/Makefile.in b/lib/dns-pkcs11/tests/Makefile.in -index 625e809..6fd4e36 100644 +index 9f1781a..e50463d 100644 --- a/lib/dns-pkcs11/tests/Makefile.in +++ b/lib/dns-pkcs11/tests/Makefile.in -@@ -21,12 +21,12 @@ VERSION=@BIND9_VERSION@ +@@ -17,12 +17,12 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \ @DST_OPENSSL_INC@ -CDEFINES = @CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns/tests/\"" -+CDEFINES = @CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns-pkcs11/tests/\"" ++CDEFINES = @CRYPTO_PK11@ -DTESTS="\"${top_builddir}/lib/dns-pkcs11/tests/\"" -ISCLIBS = ../../isc/libisc.@A@ -ISCDEPLIBS = ../../isc/libisc.@A@ @@ -76,45 +62,45 @@ index 625e809..6fd4e36 100644 +DNSLIBS = ../libdns-pkcs11.@A@ @DNS_CRYPTO_LIBS@ +DNSDEPLIBS = ../libdns-pkcs11.@A@ - LIBS = @LIBS@ @ATFLIBS@ - + LIBS = @LIBS@ @CMOCKA_LIBS@ + CFLAGS = @CFLAGS@ @CMOCKA_CFLAGS@ diff --git a/lib/dns-pkcs11/tests/dh_test.c b/lib/dns-pkcs11/tests/dh_test.c -index 6216b4e..dd74e58 100644 +index 4dbfd82..a383b8e 100644 --- a/lib/dns-pkcs11/tests/dh_test.c +++ b/lib/dns-pkcs11/tests/dh_test.c -@@ -64,7 +64,8 @@ ATF_TC_BODY(isc_dh_computesecret, tc) { - ret = dst_key_computesecret(key, key, &buf); - ATF_REQUIRE_EQ(ret, DST_R_NOTPRIVATEKEY); - ret = key->func->computesecret(key, key, &buf); -- ATF_REQUIRE_EQ(ret, DST_R_COMPUTESECRETFAILURE); +@@ -86,7 +86,8 @@ dh_computesecret(void **state) { + result = dst_key_computesecret(key, key, &buf); + assert_int_equal(result, DST_R_NOTPRIVATEKEY); + result = key->func->computesecret(key, key, &buf); +- assert_int_equal(result, DST_R_COMPUTESECRETFAILURE); + /* PKCS11 variant gives different result, accept both */ -+ ATF_REQUIRE(ret == DST_R_COMPUTESECRETFAILURE || ret == DST_R_INVALIDPRIVATEKEY); ++ assert_true(result == DST_R_COMPUTESECRETFAILURE || result == DST_R_INVALIDPRIVATEKEY); dst_key_free(&key); - dns_test_end(); + } diff --git a/lib/isc-pkcs11/tests/Makefile.in b/lib/isc-pkcs11/tests/Makefile.in -index add8068..a928dcf 100644 +index 2fdee0b..a263b35 100644 --- a/lib/isc-pkcs11/tests/Makefile.in +++ b/lib/isc-pkcs11/tests/Makefile.in -@@ -20,10 +20,10 @@ VERSION=@BIND9_VERSION@ +@@ -16,10 +16,10 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @ISC_OPENSSL_INC@ -CDEFINES = @CRYPTO@ -DTESTS="\"${top_builddir}/lib/isc/tests/\"" -+CDEFINES = @CRYPTO@ -DTESTS="\"${top_builddir}/lib/isc-pkcs11/tests/\"" ++CDEFINES = @CRYPTO_PK11@ -DTESTS="\"${top_builddir}/lib/isc-pkcs11/tests/\"" -ISCLIBS = ../libisc.@A@ @ISC_OPENSSL_LIBS@ -ISCDEPLIBS = ../libisc.@A@ +ISCLIBS = ../libisc-pkcs11.@A@ @ISC_OPENSSL_LIBS@ +ISCDEPLIBS = ../libisc-pkcs11.@A@ - LIBS = @LIBS@ @ATFLIBS@ - + LIBS = @LIBS@ @CMOCKA_LIBS@ + CFLAGS = @CFLAGS@ @CMOCKA_CFLAGS@ diff --git a/lib/isc-pkcs11/tests/hash_test.c b/lib/isc-pkcs11/tests/hash_test.c -index 7eb1552..048ae9d 100644 +index 9c4d299..d9deba2 100644 --- a/lib/isc-pkcs11/tests/hash_test.c +++ b/lib/isc-pkcs11/tests/hash_test.c -@@ -78,7 +78,7 @@ typedef struct hash_testcase { +@@ -85,7 +85,7 @@ typedef struct hash_testcase { typedef struct hash_test_key { const char *key; @@ -123,7 +109,7 @@ index 7eb1552..048ae9d 100644 } hash_test_key_t; /* non-hmac tests */ -@@ -961,8 +961,11 @@ ATF_TC_BODY(isc_hmacsha1, tc) { +@@ -956,8 +956,11 @@ isc_hmacsha1_test(void **state) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -136,7 +122,7 @@ index 7eb1552..048ae9d 100644 isc_hmacsha1_update(&hmacsha1, (const uint8_t *) testcase->input, testcase->input_len); -@@ -1124,8 +1127,11 @@ ATF_TC_BODY(isc_hmacsha224, tc) { +@@ -1116,8 +1119,11 @@ isc_hmacsha224_test(void **state) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -149,7 +135,7 @@ index 7eb1552..048ae9d 100644 isc_hmacsha224_update(&hmacsha224, (const uint8_t *) testcase->input, testcase->input_len); -@@ -1287,8 +1293,11 @@ ATF_TC_BODY(isc_hmacsha256, tc) { +@@ -1277,8 +1283,11 @@ isc_hmacsha256_test(void **state) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -162,7 +148,7 @@ index 7eb1552..048ae9d 100644 isc_hmacsha256_update(&hmacsha256, (const uint8_t *) testcase->input, testcase->input_len); -@@ -1456,8 +1465,11 @@ ATF_TC_BODY(isc_hmacsha384, tc) { +@@ -1444,8 +1453,11 @@ isc_hmacsha384_test(void **state) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -175,7 +161,7 @@ index 7eb1552..048ae9d 100644 isc_hmacsha384_update(&hmacsha384, (const uint8_t *) testcase->input, testcase->input_len); -@@ -1625,8 +1637,11 @@ ATF_TC_BODY(isc_hmacsha512, tc) { +@@ -1611,8 +1623,11 @@ isc_hmacsha512_test(void **state) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -188,7 +174,7 @@ index 7eb1552..048ae9d 100644 isc_hmacsha512_update(&hmacsha512, (const uint8_t *) testcase->input, testcase->input_len); -@@ -1769,8 +1784,11 @@ ATF_TC_BODY(isc_hmacmd5, tc) { +@@ -1755,8 +1770,11 @@ isc_hmacmd5_test(void **state) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -202,5 +188,5 @@ index 7eb1552..048ae9d 100644 (const uint8_t *) testcase->input, testcase->input_len); -- -2.14.4 +2.20.1 diff --git a/bind-9.11-kyua.patch b/bind-9.11-kyua.patch deleted file mode 100644 index af37219..0000000 --- a/bind-9.11-kyua.patch +++ /dev/null @@ -1,209 +0,0 @@ -From b93950dff6b3bf02225ad64d7c3e02e6b04917fd Mon Sep 17 00:00:00 2001 -From: Tinderbox User <tbox(a)isc.org> -Date: Fri, 29 Dec 2017 02:23:11 +0000 -Subject: [PATCH] regen v9_11 - ---- - Kyuafile | 4 ++++ - lib/Kyuafile | 8 ++++++++ - lib/dns/Kyuafile | 4 ++++ - lib/dns/tests/Kyuafile | 30 ++++++++++++++++++++++++++++++ - lib/irs/Kyuafile | 4 ++++ - lib/irs/tests/Kyuafile | 4 ++++ - lib/isc/Kyuafile | 4 ++++ - lib/isc/tests/Kyuafile | 28 ++++++++++++++++++++++++++++ - lib/isccfg/Kyuafile | 4 ++++ - lib/isccfg/tests/Kyuafile | 4 ++++ - lib/lwres/Kyuafile | 4 ++++ - lib/lwres/tests/Kyuafile | 4 ++++ - 12 files changed, 102 insertions(+) - create mode 100644 Kyuafile - create mode 100644 lib/Kyuafile - create mode 100644 lib/dns/Kyuafile - create mode 100644 lib/dns/tests/Kyuafile - create mode 100644 lib/irs/Kyuafile - create mode 100644 lib/irs/tests/Kyuafile - create mode 100644 lib/isc/Kyuafile - create mode 100644 lib/isc/tests/Kyuafile - create mode 100644 lib/isccfg/Kyuafile - create mode 100644 lib/isccfg/tests/Kyuafile - create mode 100644 lib/lwres/Kyuafile - create mode 100644 lib/lwres/tests/Kyuafile - -diff --git a/Kyuafile b/Kyuafile -new file mode 100644 -index 0000000..70b2cff ---- /dev/null -+++ b/Kyuafile -@@ -0,0 +1,4 @@ -+syntax(2) -+test_suite('bind9') -+ -+include('lib/Kyuafile') -diff --git a/lib/Kyuafile b/lib/Kyuafile -new file mode 100644 -index 0000000..ff9fc56 ---- /dev/null -+++ b/lib/Kyuafile -@@ -0,0 +1,8 @@ -+syntax(2) -+test_suite('bind9') -+ -+include('dns/Kyuafile') -+include('irs/Kyuafile') -+include('isc/Kyuafile') -+include('isccfg/Kyuafile') -+include('lwres/Kyuafile') -diff --git a/lib/dns/Kyuafile b/lib/dns/Kyuafile -new file mode 100644 -index 0000000..0739e3a ---- /dev/null -+++ b/lib/dns/Kyuafile -@@ -0,0 +1,4 @@ -+syntax(2) -+test_suite('bind9') -+ -+include('tests/Kyuafile') -diff --git a/lib/dns/tests/Kyuafile b/lib/dns/tests/Kyuafile -new file mode 100644 -index 0000000..72a581b ---- /dev/null -+++ b/lib/dns/tests/Kyuafile -@@ -0,0 +1,30 @@ -+syntax(2) -+test_suite('bind9') -+ -+atf_test_program{name='acl_test'} -+atf_test_program{name='db_test'} -+atf_test_program{name='dbdiff_test'} -+atf_test_program{name='dbiterator_test'} -+atf_test_program{name='dbversion_test'} -+atf_test_program{name='dh_test'} -+atf_test_program{name='dispatch_test'} -+atf_test_program{name='dnstap_test'} -+atf_test_program{name='geoip_test'} -+atf_test_program{name='gost_test'} -+atf_test_program{name='keytable_test'} -+atf_test_program{name='master_test'} -+atf_test_program{name='name_test'} -+atf_test_program{name='nsec3_test'} -+atf_test_program{name='peer_test'} -+atf_test_program{name='private_test'} -+atf_test_program{name='rbt_serialize_test'} -+atf_test_program{name='rbt_test'} -+atf_test_program{name='rdata_test'} -+atf_test_program{name='rdataset_test'} -+atf_test_program{name='rdatasetstats_test'} -+atf_test_program{name='rsa_test'} -+atf_test_program{name='time_test'} -+atf_test_program{name='tsig_test'} -+atf_test_program{name='update_test'} -+atf_test_program{name='zonemgr_test'} -+atf_test_program{name='zt_test'} -diff --git a/lib/irs/Kyuafile b/lib/irs/Kyuafile -new file mode 100644 -index 0000000..0739e3a ---- /dev/null -+++ b/lib/irs/Kyuafile -@@ -0,0 +1,4 @@ -+syntax(2) -+test_suite('bind9') -+ -+include('tests/Kyuafile') -diff --git a/lib/irs/tests/Kyuafile b/lib/irs/tests/Kyuafile -new file mode 100644 -index 0000000..4ef7136 ---- /dev/null -+++ b/lib/irs/tests/Kyuafile -@@ -0,0 +1,4 @@ -+syntax(2) -+test_suite('bind9') -+ -+atf_test_program{name='resconf_test'} -diff --git a/lib/isc/Kyuafile b/lib/isc/Kyuafile -new file mode 100644 -index 0000000..0739e3a ---- /dev/null -+++ b/lib/isc/Kyuafile -@@ -0,0 +1,4 @@ -+syntax(2) -+test_suite('bind9') -+ -+include('tests/Kyuafile') -diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile -new file mode 100644 -index 0000000..c558cbc ---- /dev/null -+++ b/lib/isc/tests/Kyuafile -@@ -0,0 +1,28 @@ -+syntax(2) -+test_suite('bind9') -+ -+atf_test_program{name='aes_test'} -+atf_test_program{name='buffer_test'} -+atf_test_program{name='counter_test'} -+atf_test_program{name='errno_test'} -+atf_test_program{name='file_test'} -+atf_test_program{name='hash_test'} -+atf_test_program{name='ht_test'} -+atf_test_program{name='lex_test'} -+atf_test_program{name='mem_test'} -+atf_test_program{name='netaddr_test'} -+atf_test_program{name='parse_test'} -+atf_test_program{name='pool_test'} -+atf_test_program{name='print_test'} -+atf_test_program{name='queue_test'} -+atf_test_program{name='radix_test'} -+atf_test_program{name='random_test'} -+atf_test_program{name='regex_test'} -+atf_test_program{name='result_test'} -+atf_test_program{name='safe_test'} -+atf_test_program{name='sockaddr_test'} -+atf_test_program{name='socket_test'} -+atf_test_program{name='symtab_test'} -+atf_test_program{name='task_test'} -+atf_test_program{name='taskpool_test'} -+atf_test_program{name='time_test'} -diff --git a/lib/isccfg/Kyuafile b/lib/isccfg/Kyuafile -new file mode 100644 -index 0000000..0739e3a ---- /dev/null -+++ b/lib/isccfg/Kyuafile -@@ -0,0 +1,4 @@ -+syntax(2) -+test_suite('bind9') -+ -+include('tests/Kyuafile') -diff --git a/lib/isccfg/tests/Kyuafile b/lib/isccfg/tests/Kyuafile -new file mode 100644 -index 0000000..342d25f ---- /dev/null -+++ b/lib/isccfg/tests/Kyuafile -@@ -0,0 +1,4 @@ -+syntax(2) -+test_suite('bind9') -+ -+atf_test_program{name='parser_test'} -diff --git a/lib/lwres/Kyuafile b/lib/lwres/Kyuafile -new file mode 100644 -index 0000000..0739e3a ---- /dev/null -+++ b/lib/lwres/Kyuafile -@@ -0,0 +1,4 @@ -+syntax(2) -+test_suite('bind9') -+ -+include('tests/Kyuafile') -diff --git a/lib/lwres/tests/Kyuafile b/lib/lwres/tests/Kyuafile -new file mode 100644 -index 0000000..6d373e8 ---- /dev/null -+++ b/lib/lwres/tests/Kyuafile -@@ -0,0 +1,4 @@ -+syntax(2) -+test_suite('bind9') -+ -+atf_test_program{name='config_test'} --- -2.9.5 - diff --git a/bind-9.11-rh1410433.patch b/bind-9.11-rh1410433.patch index b7fdc48..d307620 100644 --- a/bind-9.11-rh1410433.patch +++ b/bind-9.11-rh1410433.patch @@ -1,14 +1,16 @@ diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c -index 0ce5e42..556d920 100644 +index 15561ce..e4449b0 100644 --- a/lib/dns/dyndb.c +++ b/lib/dns/dyndb.c -@@ -130,9 +130,6 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname, +@@ -133,8 +133,11 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname, instname, filename); flags = RTLD_NOW|RTLD_LOCAL; --#ifdef RTLD_DEEPBIND -- flags |= RTLD_DEEPBIND; --#endif ++#if 0 ++ /* Shared global namespace is required for dns-pkcs11 library */ + #if defined(RTLD_DEEPBIND) && !__SANITIZE_ADDRESS__ + flags |= RTLD_DEEPBIND; ++#endif + #endif handle = dlopen(filename, flags); - if (handle == NULL) diff --git a/bind-9.11-rh1624100.patch b/bind-9.11-rh1624100.patch index b17a6ca..00030cc 100644 --- a/bind-9.11-rh1624100.patch +++ b/bind-9.11-rh1624100.patch @@ -1,4 +1,4 @@ -From 4fc49ad102fd00343665273caf4349d4edb5e5ac Mon Sep 17 00:00:00 2001 +From 292a0ca28f2e8a49f8c7e62c39ad7160234ce23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej(a)sury.org> Date: Wed, 25 Apr 2018 14:04:31 +0200 Subject: [PATCH] Replace isc_safe routines with their OpenSSL counter parts @@ -14,13 +14,13 @@ Fix the isc_safe_memwipe() usage with (NULL, >0) (cherry picked from commit 083461d3329ff6f2410745848a926090586a9846) --- bin/dnssec/dnssec-signzone.c | 2 +- - lib/dns/nsec3.c | 4 +-- - lib/dns/spnego.c | 4 +-- - lib/isc/Makefile.in | 8 ++--- - lib/isc/include/isc/safe.h | 18 +++------- - lib/isc/safe.c | 83 -------------------------------------------- - lib/isc/tests/safe_test.c | 20 ----------- - 7 files changed, 11 insertions(+), 128 deletions(-) + lib/dns/nsec3.c | 4 +- + lib/dns/spnego.c | 4 +- + lib/isc/Makefile.in | 8 +--- + lib/isc/include/isc/safe.h | 18 ++------ + lib/isc/safe.c | 83 ------------------------------------ + lib/isc/tests/safe_test.c | 18 -------- + 7 files changed, 11 insertions(+), 126 deletions(-) delete mode 100644 lib/isc/safe.c diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c @@ -37,10 +37,10 @@ index 6ddaebe..d921870 100644 static void diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c -index e127893..895519e 100644 +index 6ae7ca8..01426d6 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c -@@ -1953,7 +1953,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, +@@ -1963,7 +1963,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, * Work out what this NSEC3 covers. * Inside (<0) or outside (>=0). */ @@ -49,7 +49,7 @@ index e127893..895519e 100644 /* * Prepare to compute all the hashes. -@@ -1977,7 +1977,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, +@@ -1987,7 +1987,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, return (ISC_R_IGNORE); } @@ -241,35 +241,33 @@ index 7a464b6..0000000 -#endif -} diff --git a/lib/isc/tests/safe_test.c b/lib/isc/tests/safe_test.c -index f721cd1..ea3e61f 100644 +index 5775b6e..3451b5d 100644 --- a/lib/isc/tests/safe_test.c +++ b/lib/isc/tests/safe_test.c -@@ -39,24 +39,6 @@ ATF_TC_BODY(isc_safe_memequal, tc) { - "\x00\x00\x00\x00", 4)); +@@ -44,22 +44,6 @@ isc_safe_memequal_test(void **state) { + "\x00\x00\x00\x00", 4)); } --ATF_TC(isc_safe_memcompare); --ATF_TC_HEAD(isc_safe_memcompare, tc) { -- atf_tc_set_md_var(tc, "descr", "safe memcompare()"); --} --ATF_TC_BODY(isc_safe_memcompare, tc) { -- UNUSED(tc); +-/* test isc_safe_memcompare() */ +-static void +-isc_safe_memcompare_test(void **state) { +- UNUSED(state); - -- ATF_CHECK(isc_safe_memcompare("test", "test", 4) == 0); -- ATF_CHECK(isc_safe_memcompare("test", "tesc", 4) > 0); -- ATF_CHECK(isc_safe_memcompare("test", "tesy", 4) < 0); -- ATF_CHECK(isc_safe_memcompare("\x00\x00\x00\x00", -- "\x00\x00\x00\x00", 4) == 0); -- ATF_CHECK(isc_safe_memcompare("\x00\x00\x00\x00", -- "\x00\x00\x00\x01", 4) < 0); -- ATF_CHECK(isc_safe_memcompare("\x00\x00\x00\x02", -- "\x00\x00\x00\x00", 4) > 0); +- assert_int_equal(isc_safe_memcompare("test", "test", 4), 0); +- assert_true(isc_safe_memcompare("test", "tesc", 4) > 0); +- assert_true(isc_safe_memcompare("test", "tesy", 4) < 0); +- assert_int_equal(isc_safe_memcompare("\x00\x00\x00\x00", +- "\x00\x00\x00\x00", 4), 0); +- assert_true(isc_safe_memcompare("\x00\x00\x00\x00", +- "\x00\x00\x00\x01", 4) < 0); +- assert_true(isc_safe_memcompare("\x00\x00\x00\x02", +- "\x00\x00\x00\x00", 4) > 0); -} - - ATF_TC(isc_safe_memwipe); - ATF_TC_HEAD(isc_safe_memwipe, tc) { - atf_tc_set_md_var(tc, "descr", "isc_safe_memwipe()"); -@@ -67,7 +49,6 @@ ATF_TC_BODY(isc_safe_memwipe, tc) { + /* test isc_safe_memwipe() */ + static void + isc_safe_memwipe_test(void **state) { +@@ -68,7 +52,6 @@ isc_safe_memwipe_test(void **state) { /* These should pass. */ isc_safe_memwipe(NULL, 0); isc_safe_memwipe((void *) -1, 0); @@ -277,14 +275,14 @@ index f721cd1..ea3e61f 100644 /* * isc_safe_memwipe(ptr, size) should function same as -@@ -106,7 +87,6 @@ ATF_TC_BODY(isc_safe_memwipe, tc) { - */ - ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, isc_safe_memequal); -- ATF_TP_ADD_TC(tp, isc_safe_memcompare); - ATF_TP_ADD_TC(tp, isc_safe_memwipe); - return (atf_no_error()); - } +@@ -107,7 +90,6 @@ main(void) { + const struct CMUnitTest tests[] = { + cmocka_unit_test(isc_safe_memequal_test), + cmocka_unit_test(isc_safe_memwipe_test), +- cmocka_unit_test(isc_safe_memcompare_test), + }; + + return (cmocka_run_group_tests(tests, NULL, NULL)); -- -2.14.4 +2.20.1 diff --git a/bind-9.11-rh1647829-2.patch b/bind-9.11-rh1647829-2.patch index bb8b3e9..98612bf 100644 --- a/bind-9.11-rh1647829-2.patch +++ b/bind-9.11-rh1647829-2.patch @@ -1,28 +1,86 @@ -From 58e1af6ca75d035b6391708be2c2272bb8d04620 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej(a)sury.org> -Date: Sun, 4 Nov 2018 02:20:41 +0700 -Subject: [PATCH] Enable IDN processing (both idnin and idnout) only on tty, - disable it when the stdout is not a tty - -(cherry picked from commit 0e1bf7d017e4f6d787cbeb72cc2aa74e7f30122e) -(cherry picked from commit 8e1cc95c943b7dfaaaaf2d9a4971861735cc3fb2) +From fdfc8ad6a1069eea6b012972c972798003d58312 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> +Date: Tue, 29 Jan 2019 18:07:44 +0100 +Subject: [PATCH] Fallback to ASCII on output IDN conversion error + +It is possible dig used ACE encoded name in locale, which does not +support converting it to unicode. Instead of fatal error, fallback to +ACE name on output. + +(cherry picked from commit 7f4cb8f9584597fea16de6557124ac8b1bd47440) + +Modify idna test to fallback to ACE + +Test valid A-label on input would be displayed as A-label on output if +locale does not allow U-label. + +(cherry picked from commit 4ce232f8605bdbe0594ebe5a71383c9d4e6f263b) + +Emit warning on IDN output failure + +Warning is emitted before any dig headers. + +(cherry picked from commit 4b410038c531fbb902cd5fb83174eed1f06cb7d7) --- - bin/dig/dighost.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + bin/dig/dighost.c | 15 +++++++++++++-- + bin/tests/system/idna/tests.sh | 17 +++++++++++++++++ + 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c -index 74791d671e..3b722ba0ff 100644 +index 73aaab8..375f99f 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c -@@ -825,7 +825,7 @@ make_empty_lookup(void) { - looknew->seenbadcookie = false; - looknew->badcookie = true; - #ifdef WITH_IDN_SUPPORT -- looknew->idnin = (getenv("IDN_DISABLE") == NULL); -+ looknew->idnin = isatty(1)?(getenv("IDN_DISABLE") == NULL):false; - if (looknew->idnin) { - const char *charset = getenv("CHARSET"); - if (charset && !strcmp(charset, "ASCII")) +@@ -4877,9 +4877,20 @@ idn_ace_to_locale(const char *from, char *to, size_t tolen) { + */ + res = idn2_to_unicode_8zlz(utf8_src, &tmp_str, 0); + if (res != IDN2_OK) { +- fatal("Cannot represent '%s' in the current locale (%s), " +- "use +noidnout or a different locale", ++ static bool warned = false; ++ ++ res = idn2_to_ascii_8z(utf8_src, &tmp_str, 0); ++ if (res != IDN2_OK) { ++ fatal("Cannot represent '%s' " ++ "in the current locale nor ascii (%s), " ++ "use +noidnout or a different locale", + from, idn2_strerror(res)); ++ } else if (!warned) { ++ fprintf(stderr, ";; Warning: cannot represent '%s' " ++ "in the current locale", ++ tmp_str); ++ warned = true; ++ } + } + + /* +diff --git a/bin/tests/system/idna/tests.sh b/bin/tests/system/idna/tests.sh +index 7acb0fa..0269bcd 100644 +--- a/bin/tests/system/idna/tests.sh ++++ b/bin/tests/system/idna/tests.sh +@@ -244,6 +244,23 @@ idna_enabled_test() { + idna_test "$text" "+idnin +noidnout" "xn--nxasmq6b.com" "xn--nxasmq6b.com." + idna_test "$text" "+idnin +idnout" "xn--nxasmq6b.com" ".com." + ++ # Test of valid A-label in locale that cannot display it ++ # ++ # +noidnout: The string is sent as-is to the server and the returned qname ++ # is displayed in the same form. ++ # +idnout: The string is sent as-is to the server and the returned qname ++ # is displayed as the corresponding A-label. ++ # ++ # The "+[no]idnout" flag has no effect in these cases. ++ text="Checking valid A-label in C locale" ++ label="xn--nxasmq6b.com" ++ LC_ALL=C idna_test "$text" "" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+noidnin +noidnout" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+noidnin +idnout" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+idnin +noidnout" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+idnin +idnout" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+noidnin +idnout" "$label" "$label." ++ + + + # Tests of invalid A-labels -- 2.20.1 diff --git a/bind-9.11-rt31459.patch b/bind-9.11-rt31459.patch index 06847bf..e24aa8d 100644 --- a/bind-9.11-rt31459.patch +++ b/bind-9.11-rt31459.patch @@ -1,4 +1,4 @@ -From 45209f5153693339c4582795714b6859693673fc Mon Sep 17 00:00:00 2001 +From 99fc89de7b96713a7c82ea9b98d5bc0c70ad1f6e Mon Sep 17 00:00:00 2001 From: Evan Hunt <each(a)isc.org> Date: Tue, 12 Sep 2017 19:05:46 -0700 Subject: [PATCH] rebased rt31459c @@ -22,27 +22,25 @@ Include new unit test bin/dnssec/dnssec-verify.c | 8 +- bin/dnssec/dnssectool.c | 11 +- bin/named/server.c | 6 + - bin/nsupdate/nsupdate.c | 18 ++- + bin/nsupdate/nsupdate.c | 18 +- bin/tests/makejournal.c | 6 +- - bin/tests/system/pipelined/pipequeries.c | 21 ++- + bin/tests/system/pipelined/pipequeries.c | 21 +- bin/tests/system/pipelined/tests.sh | 4 +- bin/tests/system/rsabigexponent/bigkey.c | 4 + - bin/tests/system/tkey/keycreate.c | 26 +++- - bin/tests/system/tkey/keydelete.c | 26 +++- + bin/tests/system/tkey/keycreate.c | 26 ++- + bin/tests/system/tkey/keydelete.c | 26 ++- bin/tests/system/tkey/tests.sh | 8 +- bin/tools/mdig.c | 3 +- - configure | 250 ++++++++++++++++++------------- - configure.in | 77 +++++++++- - lib/dns/dst_api.c | 21 ++- + configure | 250 +++++++++++++---------- + configure.ac | 77 ++++++- + lib/dns/dst_api.c | 21 +- lib/dns/include/dst/dst.h | 8 + lib/dns/lib.c | 15 +- - lib/dns/openssl_link.c | 72 ++++++++- - lib/dns/pkcs11.c | 29 +++- - lib/dns/tests/Atffile | 1 + + lib/dns/openssl_link.c | 72 ++++++- + lib/dns/pkcs11.c | 29 ++- lib/dns/tests/Kyuafile | 1 + lib/dns/tests/Makefile.in | 7 + - lib/dns/tests/dnstest.c | 14 +- - lib/dns/tests/dstrandom_test.c | 99 ++++++++++++ + lib/dns/tests/dstrandom_test.c | 115 +++++++++++ lib/dns/win32/libdns.def.in | 7 + lib/isc/entropy.c | 24 +++ lib/isc/include/isc/entropy.h | 12 ++ @@ -50,8 +48,8 @@ Include new unit test lib/isc/include/isc/types.h | 2 + lib/isc/pk11.c | 12 +- lib/isc/win32/include/isc/platform.h.in | 5 + - win32utils/Configure | 29 +++- - 38 files changed, 699 insertions(+), 182 deletions(-) + win32utils/Configure | 29 ++- + 36 files changed, 707 insertions(+), 175 deletions(-) create mode 100644 lib/dns/tests/dstrandom_test.c diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c @@ -73,10 +71,10 @@ index 5015abb..295e16f 100644 &entropy_source, randomfile, diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c -index 65fdaaa..6612189 100644 +index 931d5de..864f2ad 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c -@@ -497,14 +497,14 @@ main(int argc, char **argv) { +@@ -494,14 +494,14 @@ main(int argc, char **argv) { if (ectx == NULL) setup_entropy(mctx, NULL, &ectx); @@ -94,7 +92,7 @@ index 65fdaaa..6612189 100644 isc_entropy_stopcallbacksources(ectx); setup_logging(mctx, &log); -@@ -566,8 +566,8 @@ main(int argc, char **argv) { +@@ -563,8 +563,8 @@ main(int argc, char **argv) { if (dns_rdataset_isassociated(&rdataset)) dns_rdataset_disassociate(&rdataset); cleanup_logging(&log); @@ -137,7 +135,7 @@ index 0d1e7f8..79c4d74 100644 dns_name_destroy(); if (verbose > 10) diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c -index 1a2b545..e33cb8b 100644 +index 7d82dbf..10f9359 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c @@ -184,14 +184,14 @@ main(int argc, char **argv) { @@ -295,7 +293,7 @@ index fbc7ece..31a99e7 100644 usekeyboard); diff --git a/bin/named/server.c b/bin/named/server.c -index 7f87ccf..9258e7f 100644 +index b63a386..30e7eac 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -36,6 +36,7 @@ @@ -306,7 +304,7 @@ index 7f87ccf..9258e7f 100644 #include <isc/portset.h> #include <isc/print.h> #include <isc/random.h> -@@ -8171,6 +8172,10 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8210,6 +8211,10 @@ load_configuration(const char *filename, ns_server_t *server, "no source of entropy found"); } else { const char *randomdev = cfg_obj_asstring(obj); @@ -317,7 +315,7 @@ index 7f87ccf..9258e7f 100644 int level = ISC_LOG_ERROR; result = isc_entropy_createfilesource(ns_g_entropy, randomdev); -@@ -8205,6 +8210,7 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8244,6 +8249,7 @@ load_configuration(const char *filename, ns_server_t *server, } isc_entropy_detach(&ns_g_fallbackentropy); } @@ -326,7 +324,7 @@ index 7f87ccf..9258e7f 100644 } } diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c -index 5eefc57..1559a33 100644 +index 509784c..6d7a02e 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -35,6 +35,7 @@ @@ -469,7 +467,7 @@ index 2fcc064..7b4f617 100644 isc_log_destroy(&lctx); diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh -index a6720ce..9063b1f 100644 +index 61f1ff7..ed1302a 100644 --- a/bin/tests/system/pipelined/tests.sh +++ b/bin/tests/system/pipelined/tests.sh @@ -19,7 +19,7 @@ status=0 @@ -480,7 +478,7 @@ index a6720ce..9063b1f 100644 +$PIPEQUERIES -p ${PORT} -r $RANDFILE < input > raw || ret=1 awk '{ print $1 " " $5 }' < raw > output sort < output > output-sorted - diff ref output-sorted || { ret=1 ; echo_i "diff sorted failed"; } + $DIFF ref output-sorted || { ret=1 ; echo_i "diff sorted failed"; } @@ -43,7 +43,7 @@ status=`expr $status + $ret` echo_i "check keep-response-order" @@ -488,7 +486,7 @@ index a6720ce..9063b1f 100644 -$PIPEQUERIES -p ${PORT} ++ < inputb > rawb || ret=1 +$PIPEQUERIES -p ${PORT} -r $RANDFILE ++ < inputb > rawb || ret=1 awk '{ print $1 " " $5 }' < rawb > outputb - diff refb outputb || ret=1 + $DIFF refb outputb || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c index 4462f2e..f06268d 100644 @@ -691,10 +689,10 @@ index 9f90dd7..fad6c83 100644 echo "I:failed" status=`expr $status + $ret` diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c -index 4876875..e46653a 100644 +index b27fc1d..e28871b 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c -@@ -1955,12 +1955,11 @@ main(int argc, char *argv[]) { +@@ -1969,12 +1969,11 @@ main(int argc, char *argv[]) { ectx = NULL; RUNCHECK(isc_entropy_create(mctx, &ectx)); @@ -709,7 +707,7 @@ index 4876875..e46653a 100644 parse_args(false, argc, argv); if (server == NULL) diff --git a/configure b/configure -index 4394755..2e0af33 100755 +index e425720..4f09c96 100755 --- a/configure +++ b/configure @@ -640,6 +640,7 @@ ac_includes_default="\ @@ -720,7 +718,7 @@ index 4394755..2e0af33 100755 BUILD_LIBS BUILD_LDFLAGS BUILD_CPPFLAGS -@@ -823,6 +824,7 @@ XMLSTATS +@@ -824,6 +825,7 @@ XMLSTATS NZDTARGETS NZDSRCS NZD_TOOLS @@ -728,7 +726,7 @@ index 4394755..2e0af33 100755 PKCS11_TEST PKCS11_ED25519 PKCS11_GOST -@@ -1035,6 +1037,7 @@ with_eddsa +@@ -1039,6 +1041,7 @@ with_eddsa with_aes enable_openssl_hash with_cc_alg @@ -736,7 +734,7 @@ index 4394755..2e0af33 100755 with_lmdb with_libxml2 with_libjson -@@ -1728,6 +1731,7 @@ Optional Features: +@@ -1735,6 +1738,7 @@ Optional Features: --enable-threads enable multithreading --enable-native-pkcs11 use native PKCS11 for all crypto [default=no] --enable-openssl-hash use OpenSSL for hash functions [default=no] @@ -744,7 +742,7 @@ index 4394755..2e0af33 100755 --enable-largefile 64-bit file support --enable-backtrace log stack backtrace on abort [default=yes] --enable-symtable use internal symbol table for backtrace -@@ -16631,6 +16635,7 @@ case "$use_openssl" in +@@ -16684,6 +16688,7 @@ case "$use_openssl" in $as_echo "disabled because of native PKCS11" >&6; } DST_OPENSSL_INC="" CRYPTO="-DPKCS11CRYPTO" @@ -752,7 +750,7 @@ index 4394755..2e0af33 100755 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -16645,6 +16650,7 @@ $as_echo "disabled because of native PKCS11" >&6; } +@@ -16698,6 +16703,7 @@ $as_echo "disabled because of native PKCS11" >&6; } $as_echo "no" >&6; } DST_OPENSSL_INC="" CRYPTO="" @@ -760,7 +758,7 @@ index 4394755..2e0af33 100755 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -16657,6 +16663,7 @@ $as_echo "no" >&6; } +@@ -16710,6 +16716,7 @@ $as_echo "no" >&6; } auto) DST_OPENSSL_INC="" CRYPTO="" @@ -768,7 +766,7 @@ index 4394755..2e0af33 100755 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -16666,7 +16673,7 @@ $as_echo "no" >&6; } +@@ -16719,7 +16726,7 @@ $as_echo "no" >&6; } OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" as_fn_error $? "OpenSSL was not found in any of $openssldirs; use --with-openssl=/path @@ -777,7 +775,7 @@ index 4394755..2e0af33 100755 ;; *) if test "yes" = "$want_native_pkcs11" -@@ -16697,6 +16704,7 @@ $as_echo "not found" >&6; } +@@ -16750,6 +16757,7 @@ $as_echo "not found" >&6; } as_fn_error $? "\"$use_openssl/include/openssl/opensslv.h\" not found" "$LINENO" 5 fi CRYPTO='-DOPENSSL' @@ -785,7 +783,7 @@ index 4394755..2e0af33 100755 if test "/usr" = "$use_openssl" then DST_OPENSSL_INC="" -@@ -17358,8 +17366,6 @@ fi +@@ -17411,8 +17419,6 @@ fi # Use OpenSSL for hash functions # @@ -794,7 +792,7 @@ index 4394755..2e0af33 100755 ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH" case $want_openssl_hash in yes) -@@ -17728,6 +17734,86 @@ if test "rt" = "$have_clock_gt"; then +@@ -17787,6 +17793,86 @@ if test "rt" = "$have_clock_gt"; then LIBS="-lrt $LIBS" fi @@ -881,7 +879,7 @@ index 4394755..2e0af33 100755 # # was --with-lmdb specified? # -@@ -19810,9 +19896,12 @@ _ACEOF +@@ -19869,9 +19955,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: size_t for buflen; int for flags" >&5 $as_echo "size_t for buflen; int for flags" >&6; } @@ -896,7 +894,7 @@ index 4394755..2e0af33 100755 $as_echo "#define IRS_GETNAMEINFO_FLAGS_T int" >>confdefs.h -@@ -21123,12 +21212,7 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM" +@@ -21186,12 +21275,7 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM" ISC_PLATFORM_USESTDASM="#undef ISC_PLATFORM_USESTDASM" ISC_PLATFORM_USEMACASM="#undef ISC_PLATFORM_USEMACASM" if test "yes" = "$use_atomic"; then @@ -910,7 +908,7 @@ index 4394755..2e0af33 100755 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -@@ -21161,6 +21245,11 @@ cat >>confdefs.h <<_ACEOF +@@ -21224,6 +21308,11 @@ cat >>confdefs.h <<_ACEOF _ACEOF @@ -922,7 +920,7 @@ index 4394755..2e0af33 100755 if test $ac_cv_sizeof_void_p = 8; then arch=x86_64 have_xaddq=yes -@@ -21169,39 +21258,6 @@ _ACEOF +@@ -21232,39 +21321,6 @@ _ACEOF fi ;; x86_64-*|amd64-*) @@ -962,7 +960,7 @@ index 4394755..2e0af33 100755 if test $ac_cv_sizeof_void_p = 8; then arch=x86_64 have_xaddq=yes -@@ -21232,6 +21288,10 @@ $as_echo_n "checking architecture type for atomic operations... " >&6; } +@@ -21295,6 +21351,10 @@ $as_echo_n "checking architecture type for atomic operations... " >&6; } $as_echo "$arch" >&6; } fi @@ -973,7 +971,7 @@ index 4394755..2e0af33 100755 if test "yes" = "$have_atomic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for inline assembly code" >&5 $as_echo_n "checking compiler support for inline assembly code... " >&6; } -@@ -23519,6 +23579,30 @@ CFLAGS="$CFLAGS $SO_CFLAGS" +@@ -23848,6 +23908,30 @@ CFLAGS="$CFLAGS $SO_CFLAGS" # dlzdir='${DLZ_DRIVER_DIR}' @@ -1004,7 +1002,7 @@ index 4394755..2e0af33 100755 # # Private autoconf macro to simplify configuring drivers: # -@@ -23849,11 +23933,11 @@ $as_echo "no" >&6; } +@@ -24178,11 +24262,11 @@ $as_echo "no" >&6; } $as_echo "using mysql with libs ${mysql_lib} and includes ${mysql_include}" >&6; } ;; *) @@ -1019,7 +1017,7 @@ index 4394755..2e0af33 100755 fi CONTRIB_DLZ="$CONTRIB_DLZ -DDLZ_MYSQL" -@@ -23938,7 +24022,7 @@ $as_echo "" >&6; } +@@ -24267,7 +24351,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). @@ -1028,7 +1026,7 @@ index 4394755..2e0af33 100755 # include a blank element first for d in "" $bdb_incdirs do -@@ -23963,57 +24047,9 @@ $as_echo "" >&6; } +@@ -24292,57 +24376,9 @@ $as_echo "" >&6; } bdb_libnames="db53 db-5.3 db51 db-5.1 db48 db-4.8 db47 db-4.7 db46 db-4.6 db45 db-4.5 db44 db-4.4 db43 db-4.3 db42 db-4.2 db41 db-4.1 db" for d in $bdb_libnames do @@ -1088,7 +1086,7 @@ index 4394755..2e0af33 100755 break fi done -@@ -24172,10 +24208,10 @@ $as_echo "no" >&6; } +@@ -24501,10 +24537,10 @@ $as_echo "no" >&6; } DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES -I$use_dlz_ldap/include" DLZ_DRIVER_LDAP_INCLUDES="-I$use_dlz_ldap/include" fi @@ -1102,7 +1100,7 @@ index 4394755..2e0af33 100755 fi -@@ -24261,11 +24297,11 @@ fi +@@ -24590,11 +24626,11 @@ fi odbcdirs="/usr /usr/local /usr/pkg" for d in $odbcdirs do @@ -1116,7 +1114,7 @@ index 4394755..2e0af33 100755 break fi done -@@ -24540,6 +24576,8 @@ DNS_CRYPTO_LIBS="$NEWFLAGS" +@@ -24869,6 +24905,8 @@ DNS_CRYPTO_LIBS="$NEWFLAGS" @@ -1125,7 +1123,7 @@ index 4394755..2e0af33 100755 # # Commands to run at the end of config.status. # Don't just put these into configure, it won't work right if somebody -@@ -26930,6 +26968,8 @@ report() { +@@ -27248,6 +27286,8 @@ report() { echo " IPv6 support (--enable-ipv6)" test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \ echo " OpenSSL cryptography/DNSSEC (--with-openssl)" @@ -1134,16 +1132,16 @@ index 4394755..2e0af33 100755 test "X$PYTHON" = "X" || echo " Python tools (--with-python)" test "X$XMLSTATS" = "X" || echo " XML statistics (--with-libxml2)" test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)" -@@ -26970,6 +27010,8 @@ report() { +@@ -27288,6 +27328,8 @@ report() { echo " Very verbose query trace logging (--enable-querytrace)" - test "no" = "$atf" || echo " Automated Testing Framework (--with-atf)" + test "no" = "$with_cmocka" || echo " CMocka Unit Testing Framework (--with-cmocka)" + echo " Cryptographic library for DNSSEC: $CRYPTOLIB" + echo " Dynamically loadable zone (DLZ) drivers:" test "no" = "$use_dlz_bdb" || \ echo " Berkeley DB (--with-dlz-bdb)" -@@ -27017,6 +27059,8 @@ report() { +@@ -27335,6 +27377,8 @@ report() { echo " ECDSA algorithm support (--with-ecdsa)" test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \ echo " EDDSA algorithm support (--with-eddsa)" @@ -1152,11 +1150,11 @@ index 4394755..2e0af33 100755 test "yes" = "$enable_seccomp" || \ echo " Use libseccomp system call filtering (--enable-seccomp)" -diff --git a/configure.in b/configure.in -index b07895f..898b4ac 100644 ---- a/configure.in -+++ b/configure.in -@@ -1542,6 +1542,7 @@ case "$use_openssl" in +diff --git a/configure.ac b/configure.ac +index 7c5ad51..fddc63a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1503,6 +1503,7 @@ case "$use_openssl" in AC_MSG_RESULT(disabled because of native PKCS11) DST_OPENSSL_INC="" CRYPTO="-DPKCS11CRYPTO" @@ -1164,7 +1162,7 @@ index b07895f..898b4ac 100644 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -1555,6 +1556,7 @@ case "$use_openssl" in +@@ -1516,6 +1517,7 @@ case "$use_openssl" in AC_MSG_RESULT(no) DST_OPENSSL_INC="" CRYPTO="" @@ -1172,7 +1170,7 @@ index b07895f..898b4ac 100644 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -1567,6 +1569,7 @@ case "$use_openssl" in +@@ -1528,6 +1530,7 @@ case "$use_openssl" in auto) DST_OPENSSL_INC="" CRYPTO="" @@ -1180,7 +1178,7 @@ index b07895f..898b4ac 100644 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -1577,7 +1580,7 @@ case "$use_openssl" in +@@ -1538,7 +1541,7 @@ case "$use_openssl" in OPENSSLLINKSRCS="" AC_MSG_ERROR( [OpenSSL was not found in any of $openssldirs; use --with-openssl=/path @@ -1189,7 +1187,7 @@ index b07895f..898b4ac 100644 ;; *) if test "yes" = "$want_native_pkcs11" -@@ -1607,6 +1610,7 @@ If you don't want OpenSSL, use --without-openssl]) +@@ -1568,6 +1571,7 @@ If you don't want OpenSSL, use --without-openssl]) AC_MSG_ERROR(["$use_openssl/include/openssl/opensslv.h" not found]) fi CRYPTO='-DOPENSSL' @@ -1197,7 +1195,7 @@ index b07895f..898b4ac 100644 if test "/usr" = "$use_openssl" then DST_OPENSSL_INC="" -@@ -2080,7 +2084,6 @@ fi +@@ -2041,7 +2045,6 @@ fi # Use OpenSSL for hash functions # @@ -1205,7 +1203,7 @@ index b07895f..898b4ac 100644 ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH" case $want_openssl_hash in yes) -@@ -2347,6 +2350,67 @@ if test "rt" = "$have_clock_gt"; then +@@ -2313,6 +2316,67 @@ if test "rt" = "$have_clock_gt"; then LIBS="-lrt $LIBS" fi @@ -1273,7 +1271,7 @@ index b07895f..898b4ac 100644 # # was --with-lmdb specified? # -@@ -4139,12 +4203,12 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM" +@@ -4109,12 +4173,12 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM" ISC_PLATFORM_USESTDASM="#undef ISC_PLATFORM_USESTDASM" ISC_PLATFORM_USEMACASM="#undef ISC_PLATFORM_USEMACASM" if test "yes" = "$use_atomic"; then @@ -1287,7 +1285,7 @@ index b07895f..898b4ac 100644 if test $ac_cv_sizeof_void_p = 8; then arch=x86_64 have_xaddq=yes -@@ -4153,7 +4217,6 @@ if test "yes" = "$use_atomic"; then +@@ -4123,7 +4187,6 @@ if test "yes" = "$use_atomic"; then fi ;; x86_64-*|amd64-*) @@ -1295,7 +1293,7 @@ index b07895f..898b4ac 100644 if test $ac_cv_sizeof_void_p = 8; then arch=x86_64 have_xaddq=yes -@@ -5517,6 +5580,8 @@ report() { +@@ -5541,6 +5604,8 @@ report() { echo " IPv6 support (--enable-ipv6)" test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \ echo " OpenSSL cryptography/DNSSEC (--with-openssl)" @@ -1304,16 +1302,16 @@ index b07895f..898b4ac 100644 test "X$PYTHON" = "X" || echo " Python tools (--with-python)" test "X$XMLSTATS" = "X" || echo " XML statistics (--with-libxml2)" test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)" -@@ -5557,6 +5622,8 @@ report() { +@@ -5581,6 +5646,8 @@ report() { echo " Very verbose query trace logging (--enable-querytrace)" - test "no" = "$atf" || echo " Automated Testing Framework (--with-atf)" + test "no" = "$with_cmocka" || echo " CMocka Unit Testing Framework (--with-cmocka)" + echo " Cryptographic library for DNSSEC: $CRYPTOLIB" + echo " Dynamically loadable zone (DLZ) drivers:" test "no" = "$use_dlz_bdb" || \ echo " Berkeley DB (--with-dlz-bdb)" -@@ -5604,6 +5671,8 @@ report() { +@@ -5628,6 +5695,8 @@ report() { echo " ECDSA algorithm support (--with-ecdsa)" test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \ echo " EDDSA algorithm support (--with-eddsa)" @@ -1323,7 +1321,7 @@ index b07895f..898b4ac 100644 test "yes" = "$enable_seccomp" || \ echo " Use libseccomp system call filtering (--enable-seccomp)" diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c -index 5703f9c..afb4d80 100644 +index 320c0f8..b55ebe0 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -276,6 +276,12 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, @@ -1359,7 +1357,7 @@ index 5703f9c..afb4d80 100644 if (dst__memory_pool != NULL) isc_mem_detach(&dst__memory_pool); if (dst_entropy_pool != NULL) -@@ -1998,13 +2012,17 @@ dst__entropy_getdata(void *buf, unsigned int len, bool pseudo) { +@@ -2001,13 +2015,17 @@ dst__entropy_getdata(void *buf, unsigned int len, bool pseudo) { flags &= ~ISC_ENTROPY_GOODONLY; else flags |= ISC_ENTROPY_BLOCKING; @@ -1378,7 +1376,7 @@ index 5703f9c..afb4d80 100644 #ifdef GSSAPI unsigned int flags = dst_entropy_flags; isc_result_t ret; -@@ -2027,6 +2045,7 @@ dst__entropy_status(void) { +@@ -2030,6 +2048,7 @@ dst__entropy_status(void) { #endif return (isc_entropy_status(dst_entropy_pool)); #else @@ -1387,10 +1385,10 @@ index 5703f9c..afb4d80 100644 #endif } diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h -index 32b0742..78e1277 100644 +index 1924e74..6813c96 100644 --- a/lib/dns/include/dst/dst.h +++ b/lib/dns/include/dst/dst.h -@@ -160,6 +160,14 @@ dst_lib_destroy(void); +@@ -159,6 +159,14 @@ dst_lib_destroy(void); * Releases all resources allocated by DST. */ @@ -1461,7 +1459,7 @@ index 304814b..60543c4 100644 isc_hash_destroy(); cleanup_db: diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c -index a30a2ab..d88d643 100644 +index d65ce26..6849732 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -31,6 +31,7 @@ @@ -1499,7 +1497,7 @@ index a30a2ab..d88d643 100644 #if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) static void -@@ -190,7 +193,7 @@ _set_thread_id(CRYPTO_THREADID *id) +@@ -192,7 +195,7 @@ _set_thread_id(CRYPTO_THREADID *id) isc_result_t dst__openssl_init(const char *engine) { isc_result_t result; @@ -1508,7 +1506,7 @@ index a30a2ab..d88d643 100644 ENGINE *re; #else UNUSED(engine); -@@ -220,6 +223,7 @@ dst__openssl_init(const char *engine) { +@@ -222,6 +225,7 @@ dst__openssl_init(const char *engine) { ERR_load_crypto_strings(); #endif @@ -1516,7 +1514,7 @@ index a30a2ab..d88d643 100644 rm = mem_alloc(sizeof(RAND_METHOD) FILELINE); if (rm == NULL) { result = ISC_R_NOMEMORY; -@@ -231,6 +235,7 @@ dst__openssl_init(const char *engine) { +@@ -233,6 +237,7 @@ dst__openssl_init(const char *engine) { rm->add = entropy_add; rm->pseudorand = entropy_getpseudo; rm->status = entropy_status; @@ -1524,7 +1522,7 @@ index a30a2ab..d88d643 100644 #if !defined(OPENSSL_NO_ENGINE) #if !defined(CONF_MFLAGS_DEFAULT_SECTION) -@@ -264,6 +269,7 @@ dst__openssl_init(const char *engine) { +@@ -266,6 +271,7 @@ dst__openssl_init(const char *engine) { } } @@ -1532,7 +1530,7 @@ index a30a2ab..d88d643 100644 re = ENGINE_get_default_RAND(); if (re == NULL) { re = ENGINE_new(); -@@ -276,9 +282,21 @@ dst__openssl_init(const char *engine) { +@@ -278,9 +284,21 @@ dst__openssl_init(const char *engine) { ENGINE_free(re); } else ENGINE_finish(re); @@ -1554,7 +1552,7 @@ index a30a2ab..d88d643 100644 return (ISC_R_SUCCESS); #if !defined(OPENSSL_NO_ENGINE) -@@ -286,10 +304,14 @@ dst__openssl_init(const char *engine) { +@@ -288,10 +306,14 @@ dst__openssl_init(const char *engine) { if (e != NULL) ENGINE_free(e); e = NULL; @@ -1569,7 +1567,7 @@ index a30a2ab..d88d643 100644 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) CRYPTO_set_locking_callback(NULL); DESTROYMUTEXBLOCK(locks, nlocks); -@@ -304,14 +326,17 @@ void +@@ -306,14 +328,17 @@ void dst__openssl_destroy(void) { #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) OPENSSL_cleanup(); @@ -1587,7 +1585,7 @@ index a30a2ab..d88d643 100644 if (rm != NULL) { #if OPENSSL_VERSION_NUMBER >= 0x00907000L RAND_cleanup(); -@@ -319,6 +344,7 @@ dst__openssl_destroy(void) { +@@ -321,6 +346,7 @@ dst__openssl_destroy(void) { mem_free(rm FILELINE); rm = NULL; } @@ -1595,7 +1593,7 @@ index a30a2ab..d88d643 100644 #if (OPENSSL_VERSION_NUMBER >= 0x00907000L) CONF_modules_free(); #endif -@@ -454,11 +480,45 @@ dst__openssl_getengine(const char *engine) { +@@ -456,11 +482,45 @@ dst__openssl_getengine(const char *engine) { } #endif @@ -1700,35 +1698,23 @@ index 5a2c502..8eaef53 100644 #endif /* PKCS11CRYPTO */ /*! \file */ -diff --git a/lib/dns/tests/Atffile b/lib/dns/tests/Atffile -index 953082d..603c4b5 100644 ---- a/lib/dns/tests/Atffile -+++ b/lib/dns/tests/Atffile -@@ -10,6 +10,7 @@ tp: dbversion_test - tp: dh_test - tp: dispatch_test - tp: dnstap_test -+tp: dstrandom_test - tp: dst_test - tp: geoip_test - tp: gost_test diff --git a/lib/dns/tests/Kyuafile b/lib/dns/tests/Kyuafile -index 0353a73..cb2324d 100644 +index 937b548..f3c0e38 100644 --- a/lib/dns/tests/Kyuafile +++ b/lib/dns/tests/Kyuafile -@@ -10,6 +10,7 @@ atf_test_program{name='dh_test'} - atf_test_program{name='dispatch_test'} - atf_test_program{name='dnstap_test'} - atf_test_program{name='dst_test'} -+atf_test_program{name='dstrandom_test'} - atf_test_program{name='geoip_test'} - atf_test_program{name='gost_test'} - atf_test_program{name='keytable_test'} +@@ -10,6 +10,7 @@ tap_test_program{name='dh_test'} + tap_test_program{name='dispatch_test'} + tap_test_program{name='dnstap_test'} + tap_test_program{name='dst_test'} ++tap_test_program{name='dstrandom_test'} + tap_test_program{name='geoip_test'} + tap_test_program{name='gost_test'} + tap_test_program{name='keytable_test'} diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in -index 58fa872..625e809 100644 +index 0897579..9f1781a 100644 --- a/lib/dns/tests/Makefile.in +++ b/lib/dns/tests/Makefile.in -@@ -40,6 +40,7 @@ SRCS = acl_test.c \ +@@ -37,6 +37,7 @@ SRCS = acl_test.c \ dnstap_test.c \ dst_test.c \ dnstest.c \ @@ -1736,7 +1722,7 @@ index 58fa872..625e809 100644 geoip_test.c \ gost_test.c \ keytable_test.c \ -@@ -71,6 +72,7 @@ TARGETS = acl_test@EXEEXT@ \ +@@ -69,6 +70,7 @@ TARGETS = acl_test@EXEEXT@ \ dh_test@EXEEXT@ \ dispatch_test@EXEEXT@ \ dnstap_test@EXEEXT@ \ @@ -1744,9 +1730,9 @@ index 58fa872..625e809 100644 dst_test@EXEEXT@ \ geoip_test@EXEEXT@ \ gost_test@EXEEXT@ \ -@@ -255,6 +257,11 @@ tsig_test@EXEEXT@: tsig_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} - tsig_test.@O@ dnstest.@O@ ${DNSLIBS} \ - ${ISCLIBS} ${LIBS} +@@ -258,6 +260,11 @@ zt_test@EXEEXT@: zt_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} + ${LDFLAGS} -o $@ zt_test.@O@ dnstest.@O@ \ + ${DNSLIBS} ${ISCLIBS} ${LIBS} +dstrandom_test@EXEEXT@: dstrandom_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ @@ -1756,51 +1742,12 @@ index 58fa872..625e809 100644 unit:: sh ${top_builddir}/unit/unittest.sh -diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c -index 51bb90b..1b25b90 100644 ---- a/lib/dns/tests/dnstest.c -+++ b/lib/dns/tests/dnstest.c -@@ -122,12 +122,12 @@ dns_test_begin(FILE *logfile, bool start_managers) { - CHECK(isc_mem_create(0, 0, &mctx)); - CHECK(isc_entropy_create(mctx, &ectx)); - -- CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE)); -- hash_active = true; -- - CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING)); - dst_active = true; - -+ CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE)); -+ hash_active = true; -+ - if (logfile != NULL) { - isc_logdestination_t destination; - isc_logconfig_t *logconfig = NULL; -@@ -171,14 +171,14 @@ dns_test_begin(FILE *logfile, bool start_managers) { - - void - dns_test_end(void) { -- if (dst_active) { -- dst_lib_destroy(); -- dst_active = false; -- } - if (hash_active) { - isc_hash_destroy(); - hash_active = false; - } -+ if (dst_active) { -+ dst_lib_destroy(); -+ dst_active = false; -+ } - if (ectx != NULL) - isc_entropy_detach(&ectx); - diff --git a/lib/dns/tests/dstrandom_test.c b/lib/dns/tests/dstrandom_test.c new file mode 100644 -index 0000000..b980d8a +index 0000000..bd3d164 --- /dev/null +++ b/lib/dns/tests/dstrandom_test.c -@@ -0,0 +1,99 @@ +@@ -0,0 +1,115 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * @@ -1812,18 +1759,25 @@ index 0000000..b980d8a + * information regarding copyright ownership. + */ + -+/*! \file */ -+ +#include <config.h> + -+#include <atf-c.h> ++#if HAVE_CMOCKA ++ ++#include <stdarg.h> ++#include <stddef.h> ++#include <setjmp.h> + ++#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> + ++#define UNIT_TESTING ++#include <cmocka.h> ++ +#include <isc/entropy.h> +#include <isc/mem.h> ++#include <isc/print.h> +#include <isc/platform.h> +#include <isc/util.h> + @@ -1833,26 +1787,23 @@ index 0000000..b980d8a +isc_entropy_t *ectx = NULL; +unsigned char buffer[128]; + -+ATF_TC(isc_entropy_getdata); -+ATF_TC_HEAD(isc_entropy_getdata, tc) { -+ atf_tc_set_md_var(tc, "descr", -+ "isc_entropy_getdata() examples"); -+ atf_tc_set_md_var(tc, "X-randomfile", -+ "testdata/dstrandom/random.data"); -+} -+ATF_TC_BODY(isc_entropy_getdata, tc) { ++/* isc_entropy_getdata() examples */ ++static void ++isc_entropy_getdata_test(void **state) { + isc_result_t result; + unsigned int returned, status; ++ const char *randomfile = "testdata/dstrandom/random.data"; + int ret; -+ const char *randomfile = atf_tc_get_md_var(tc, "X-randomfile"); ++ ++ UNUSED(state); + + isc_mem_debugging |= ISC_MEM_DEBUGRECORD; + result = isc_mem_create(0, 0, &mctx); -+ ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ++ assert_int_equal(result, ISC_R_SUCCESS); + result = isc_entropy_create(mctx, &ectx); -+ ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ++ assert_int_equal(result, ISC_R_SUCCESS); + result = dst_lib_init(mctx, ectx, 0); -+ ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ++ assert_int_equal(result, ISC_R_SUCCESS); + +#ifdef ISC_PLATFORM_CRYPTORANDOM + isc_entropy_usehook(ectx, true); @@ -1860,51 +1811,63 @@ index 0000000..b980d8a + returned = 0; + result = isc_entropy_getdata(ectx, buffer, sizeof(buffer), + &returned, 0); -+ ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); -+ ATF_REQUIRE(returned == sizeof(buffer)); ++ assert_int_equal(result, ISC_R_SUCCESS); ++ assert_int_equal(returned, sizeof(buffer)); + + status = isc_entropy_status(ectx); -+ ATF_REQUIRE_EQ(status, 0); ++ assert_int_equal(status, 0); + + isc_entropy_usehook(ectx, false); +#endif + + ret = chdir(TESTS); -+ ATF_REQUIRE_EQ(ret, 0); ++ assert_int_equal(ret, 0); + + result = isc_entropy_createfilesource(ectx, randomfile); -+ ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ++ assert_int_equal(result, ISC_R_SUCCESS); + + returned = 0; + result = isc_entropy_getdata(ectx, buffer, sizeof(buffer), + &returned, 0); -+ ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); -+ ATF_REQUIRE(returned == sizeof(buffer)); ++ assert_int_equal(result, ISC_R_SUCCESS); ++ assert_int_equal(returned, sizeof(buffer)); + + status = isc_entropy_status(ectx); -+ ATF_REQUIRE(status > 0); ++ assert_true(status > 0); + + dst_lib_destroy(); + isc_entropy_detach(&ectx); -+ ATF_REQUIRE(ectx == NULL); ++ assert_null(ectx); ++ + isc_mem_destroy(&mctx); -+ ATF_REQUIRE(mctx == NULL); ++ assert_null(mctx); +} + -+/* -+ * Main -+ */ -+ATF_TP_ADD_TCS(tp) { -+ ATF_TP_ADD_TC(tp, isc_entropy_getdata); ++int ++main(void) { ++ const struct CMUnitTest tests[] = { ++ cmocka_unit_test(isc_entropy_getdata_test), ++ }; + -+ return (atf_no_error()); ++ return (cmocka_run_group_tests(tests, NULL, NULL)); +} + ++#else /* HAVE_CMOCKA */ ++ ++#include <stdio.h> ++ ++int ++main(void) { ++ printf("1..0 # Skipped: cmocka not available\n"); ++ return (0); ++} ++ ++#endif diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in -index 62a156c..bf83fe5 100644 +index 5c45d59..34b660c 100644 --- a/lib/dns/win32/libdns.def.in +++ b/lib/dns/win32/libdns.def.in -@@ -1483,6 +1483,13 @@ dst_lib_destroy +@@ -1484,6 +1484,13 @@ dst_lib_destroy dst_lib_init dst_lib_init2 dst_lib_initmsgcat @@ -2029,7 +1992,7 @@ index 42ff7e0..8d87c44 100644 typedef int (*isc_sockfdwatch_t)(isc_task_t *, isc_socket_t *, void *, int); diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c -index a01e698..875c232 100644 +index bb9912b..1f583a3 100644 --- a/lib/isc/pk11.c +++ b/lib/isc/pk11.c @@ -321,14 +321,16 @@ pk11_rand_seed_fromfile(const char *randomfile) { @@ -2071,7 +2034,7 @@ index 5b8a2c9..913a2ce 100644 * Define if the hash functions must be provided by OpenSSL. */ diff --git a/win32utils/Configure b/win32utils/Configure -index ff596b7..09b476f 100644 +index ad99f89..2c55946 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -381,6 +381,7 @@ my @substdefh = ("AES_CC", @@ -2082,7 +2045,7 @@ index ff596b7..09b476f 100644 "ISC_PLATFORM_HAVEATOMICSTORE", "ISC_PLATFORM_HAVEATOMICSTOREQ", "ISC_PLATFORM_HAVECMPXCHG", -@@ -509,7 +510,8 @@ my @allcond = (@substcond, "NOTYET", "NOLONGER"); +@@ -510,7 +511,8 @@ my @allcond = (@substcond, "NOTYET", "NOLONGER"); # enable-xxx/disable-xxx @@ -2092,7 +2055,7 @@ index ff596b7..09b476f 100644 "fixed-rrset", "intrinsics", "isc-spnego", -@@ -571,6 +573,7 @@ my @help = ( +@@ -573,6 +575,7 @@ my @help = ( "\nOptional Features:\n", " enable-intrinsics enable instrinsic/atomic functions [default=yes]\n", " enable-native-pkcs11 use native PKCS#11 for all crypto [default=no]\n", @@ -2100,7 +2063,7 @@ index ff596b7..09b476f 100644 " enable-openssl-hash use OpenSSL for hash functions [default=yes]\n", " enable-isc-spnego use SPNEGO from lib/dns [default=yes]\n", " enable-filter-aaaa enable filtering of AAAA records [default=yes]\n", -@@ -614,7 +617,9 @@ my $want_clean = "no"; +@@ -617,7 +620,9 @@ my $want_clean = "no"; my $want_unknown = "no"; my $unknown_value; my $enable_intrinsics = "yes"; @@ -2110,7 +2073,7 @@ index ff596b7..09b476f 100644 my $enable_openssl_hash = "auto"; my $enable_filter_aaaa = "yes"; my $enable_isc_spnego = "yes"; -@@ -823,6 +828,10 @@ sub myenable { +@@ -828,6 +833,10 @@ sub myenable { if ($val =~ /^yes$/i) { $enable_native_pkcs11 = "yes"; } @@ -2121,7 +2084,7 @@ index ff596b7..09b476f 100644 } elsif ($key =~ /^openssl-hash$/i) { if ($val =~ /^yes$/i) { $enable_openssl_hash = "yes"; -@@ -1106,6 +1115,11 @@ if ($verbose) { +@@ -1119,6 +1128,11 @@ if ($verbose) { } else { print "native-pkcs11: disabled\n"; } @@ -2133,7 +2096,7 @@ index ff596b7..09b476f 100644 if ($enable_openssl_hash eq "yes") { print "openssl-hash: enabled\n"; } else { -@@ -1454,6 +1468,7 @@ if ($enable_intrinsics eq "yes") { +@@ -1472,6 +1486,7 @@ if ($enable_intrinsics eq "yes") { # enable-native-pkcs11 if ($enable_native_pkcs11 eq "yes") { @@ -2141,7 +2104,7 @@ index ff596b7..09b476f 100644 if ($use_openssl eq "auto") { $use_openssl = "no"; } -@@ -1663,6 +1678,7 @@ if ($use_openssl eq "yes") { +@@ -1681,6 +1696,7 @@ if ($use_openssl eq "yes") { $openssl_dll = File::Spec->catdir($openssl_path, "@dirlist[0]"); } @@ -2149,7 +2112,7 @@ index ff596b7..09b476f 100644 $configcond{"OPENSSL"} = 1; $configdefd{"CRYPTO"} = "OPENSSL"; $configvar{"OPENSSL_PATH"} = "$openssl_path"; -@@ -2214,6 +2230,15 @@ if ($cookie_algorithm eq "sha1") { +@@ -2232,6 +2248,15 @@ if ($cookie_algorithm eq "sha1") { die "Unrecognized cookie algorithm: $cookie_algorithm\n"; } @@ -2165,7 +2128,7 @@ index ff596b7..09b476f 100644 # enable-openssl-hash if ($enable_openssl_hash eq "yes") { if ($use_openssl eq "no") { -@@ -3536,6 +3561,7 @@ exit 0; +@@ -3558,6 +3583,7 @@ exit 0; # --enable-developer partially supported # --enable-newstats (9.9/9.9sub only) # --enable-native-pkcs11 supported @@ -2173,7 +2136,7 @@ index ff596b7..09b476f 100644 # --enable-openssl-version-check included without a way to disable it # --enable-openssl-hash supported # --enable-threads included without a way to disable it -@@ -3561,6 +3587,7 @@ exit 0; +@@ -3583,6 +3609,7 @@ exit 0; # --with-gost supported # --with-aes supported # --with-cc-alg supported @@ -2182,5 +2145,5 @@ index ff596b7..09b476f 100644 # --with-gssapi supported with MIT (K)erberos (f)or (W)indows # --with-lmdb no supported on WIN32 (port is not reliable) -- -2.14.4 +2.20.1 diff --git a/bind-9.11-rt46047.patch b/bind-9.11-rt46047.patch index 3cb3c0f..1f40a16 100644 --- a/bind-9.11-rt46047.patch +++ b/bind-9.11-rt46047.patch @@ -1,4 +1,4 @@ -From 9a074d5cd6c6276d95bc1cce3a14afaabc88c6c5 Mon Sep 17 00:00:00 2001 +From 2b7a633f29c2ae8fe801f2a98541013837ebaeaa Mon Sep 17 00:00:00 2001 From: Evan Hunt <each(a)isc.org> Date: Thu, 28 Sep 2017 10:09:22 -0700 Subject: [PATCH] completed and corrected the crypto-random change @@ -24,29 +24,29 @@ Subject: [PATCH] completed and corrected the crypto-random change "configure --disable-crypto-rand". [RT #31459] [RT #46047] --- - bin/confgen/keygen.c | 12 +++---- - bin/dnssec/dnssec-keygen.docbook | 24 +++++++++----- - bin/dnssec/dnssectool.c | 12 +++---- + bin/confgen/keygen.c | 12 +++--- + bin/dnssec/dnssec-keygen.docbook | 24 +++++++---- + bin/dnssec/dnssectool.c | 12 +++--- bin/named/client.c | 3 +- - bin/named/config.c | 4 ++- - bin/named/controlconf.c | 19 +++++++---- - bin/named/include/named/server.h | 2 ++ + bin/named/config.c | 4 +- + bin/named/controlconf.c | 19 +++++--- + bin/named/include/named/server.h | 2 + bin/named/interfacemgr.c | 1 + bin/named/query.c | 1 + - bin/named/server.c | 53 ++++++++++++++++++------------ - bin/nsupdate/nsupdate.c | 4 +-- - bin/tests/system/pipelined/pipequeries.c | 4 +-- - bin/tests/system/tkey/keycreate.c | 4 +-- - bin/tests/system/tkey/keydelete.c | 4 +-- - doc/arm/Bv9ARM-book.xml | 55 ++++++++++++++++++++++---------- - doc/arm/notes.xml | 26 +++++++++++++++ - lib/dns/dst_api.c | 4 ++- - lib/dns/include/dst/dst.h | 14 ++++++-- + bin/named/server.c | 51 ++++++++++++++-------- + bin/nsupdate/nsupdate.c | 4 +- + bin/tests/system/pipelined/pipequeries.c | 4 +- + bin/tests/system/tkey/keycreate.c | 4 +- + bin/tests/system/tkey/keydelete.c | 4 +- + doc/arm/Bv9ARM-book.xml | 55 +++++++++++++++++------- + doc/arm/notes.xml | 26 +++++++++++ + lib/dns/dst_api.c | 4 +- + lib/dns/include/dst/dst.h | 14 +++++- lib/dns/openssl_link.c | 3 +- - lib/isc/include/isc/entropy.h | 50 +++++++++++++++++++++-------- - lib/isc/include/isc/random.h | 28 ++++++++++------ + lib/isc/include/isc/entropy.h | 50 +++++++++++++++------ + lib/isc/include/isc/random.h | 28 +++++++----- lib/isccfg/namedconf.c | 2 +- - 22 files changed, 221 insertions(+), 108 deletions(-) + 22 files changed, 220 insertions(+), 107 deletions(-) diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c index 295e16f..0f79aa8 100644 @@ -76,10 +76,10 @@ index 295e16f..0f79aa8 100644 &entropy_source, randomfile, diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook -index 96dfef6..1c84b06 100644 +index ee6a489..17dddb6 100644 --- a/bin/dnssec/dnssec-keygen.docbook +++ b/bin/dnssec/dnssec-keygen.docbook -@@ -349,15 +349,23 @@ +@@ -350,15 +350,23 @@ <term>-r <replaceable class="parameter">randomdev</replaceable></term> <listitem> <para> @@ -140,10 +140,10 @@ index 31a99e7..38c83ed 100644 usekeyboard); diff --git a/bin/named/client.c b/bin/named/client.c -index 0f6e162..5e39b82 100644 +index d425df2..7ab3dec 100644 --- a/bin/named/client.c +++ b/bin/named/client.c -@@ -1608,7 +1608,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, +@@ -1609,7 +1609,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, isc_buffer_init(&buf, cookie, sizeof(cookie)); isc_stdtime_get(&now); @@ -154,7 +154,7 @@ index 0f6e162..5e39b82 100644 compute_cookie(client, now, nonce, ns_g_server->secret, &buf); diff --git a/bin/named/config.c b/bin/named/config.c -index 2c4c93c..16ed248 100644 +index a153172..8d46bc3 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -93,7 +93,9 @@ options {\n\ @@ -253,7 +253,7 @@ index 419927b..d721f47 100644 #include <isc/task.h> #include <isc/util.h> diff --git a/bin/named/query.c b/bin/named/query.c -index f8dbef2..2f3c0ca 100644 +index 1d3edbc..193efde 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -19,6 +19,7 @@ @@ -265,10 +265,10 @@ index f8dbef2..2f3c0ca 100644 #include <isc/serial.h> #include <isc/stats.h> diff --git a/bin/named/server.c b/bin/named/server.c -index 9258e7f..f4320df 100644 +index 30e7eac..27ea3bf 100644 --- a/bin/named/server.c +++ b/bin/named/server.c -@@ -8164,21 +8164,30 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8203,21 +8203,30 @@ load_configuration(const char *filename, ns_server_t *server, * Open the source of entropy. */ if (first_time) { @@ -277,11 +277,6 @@ index 9258e7f..f4320df 100644 obj = NULL; result = ns_config_get(maps, "random-device", &obj); - if (result != ISC_R_SUCCESS) { -- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, -- NS_LOGMODULE_SERVER, ISC_LOG_INFO, -- "no source of entropy found"); -- } else { -- const char *randomdev = cfg_obj_asstring(obj); + if (result == ISC_R_SUCCESS) { + if (!cfg_obj_isvoid(obj)) { + level = ISC_LOG_INFO; @@ -289,28 +284,32 @@ index 9258e7f..f4320df 100644 + } + } + if (randomdev == NULL) { - #ifdef ISC_PLATFORM_CRYPTORANDOM -- if (strcmp(randomdev, ISC_PLATFORM_CRYPTORANDOM) == 0) -- isc_entropy_usehook(ns_g_entropy, true); ++#ifdef ISC_PLATFORM_CRYPTORANDOM + isc_entropy_usehook(ns_g_entropy, true); - #else -- int level = ISC_LOG_ERROR; -- result = isc_entropy_createfilesource(ns_g_entropy, -- randomdev); ++#else + if ((obj != NULL) && !cfg_obj_isvoid(obj)) + level = ISC_LOG_INFO; -+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, +- NS_LOGMODULE_SERVER, ISC_LOG_INFO, + NS_LOGMODULE_SERVER, level, -+ "no source of entropy found"); + "no source of entropy found"); + if ((obj == NULL) || cfg_obj_isvoid(obj)) { + CHECK(ISC_R_FAILURE); + } +#endif -+ } else { + } else { +- const char *randomdev = cfg_obj_asstring(obj); +-#ifdef ISC_PLATFORM_CRYPTORANDOM +- if (strcmp(randomdev, ISC_PLATFORM_CRYPTORANDOM) == 0) +- isc_entropy_usehook(ns_g_entropy, true); +-#else +- int level = ISC_LOG_ERROR; +- result = isc_entropy_createfilesource(ns_g_entropy, +- randomdev); #ifdef PATH_RANDOMDEV if (ns_g_fallbackentropy != NULL) { level = ISC_LOG_INFO; -@@ -8189,8 +8198,8 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8228,8 +8237,8 @@ load_configuration(const char *filename, ns_server_t *server, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, level, @@ -321,7 +320,7 @@ index 9258e7f..f4320df 100644 randomdev, isc_result_totext(result)); } -@@ -8210,7 +8219,6 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8249,7 +8258,6 @@ load_configuration(const char *filename, ns_server_t *server, } isc_entropy_detach(&ns_g_fallbackentropy); } @@ -329,7 +328,7 @@ index 9258e7f..f4320df 100644 #endif } } -@@ -8998,6 +9006,9 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { +@@ -9040,6 +9048,9 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { CHECKFATAL(dns_tkeyctx_create(ns_g_mctx, ns_g_entropy, &server->tkeyctx), "creating TKEY context"); @@ -339,7 +338,7 @@ index 9258e7f..f4320df 100644 /* * Setup the server task, which is responsible for coordinating -@@ -9204,7 +9215,8 @@ ns_server_destroy(ns_server_t **serverp) { +@@ -9246,7 +9257,8 @@ ns_server_destroy(ns_server_t **serverp) { if (server->zonemgr != NULL) dns_zonemgr_detach(&server->zonemgr); @@ -349,7 +348,7 @@ index 9258e7f..f4320df 100644 if (server->tkeyctx != NULL) dns_tkeyctx_destroy(&server->tkeyctx); -@@ -13105,10 +13117,10 @@ newzone_cfgctx_destroy(void **cfgp) { +@@ -13197,10 +13209,10 @@ newzone_cfgctx_destroy(void **cfgp) { static isc_result_t generate_salt(unsigned char *salt, size_t saltlen) { @@ -362,7 +361,7 @@ index 9258e7f..f4320df 100644 } rnd; unsigned char text[512 + 1]; isc_region_t r; -@@ -13118,9 +13130,10 @@ generate_salt(unsigned char *salt, size_t saltlen) { +@@ -13210,9 +13222,10 @@ generate_salt(unsigned char *salt, size_t saltlen) { if (saltlen > 256U) return (ISC_R_RANGE); @@ -377,7 +376,7 @@ index 9258e7f..f4320df 100644 memmove(salt, rnd.rnd, saltlen); diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c -index 1559a33..68b9a99 100644 +index 6d7a02e..626b1cf 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -283,9 +283,7 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { @@ -437,10 +436,10 @@ index 2146f9b..ac2c311 100644 } #endif diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml -index baff8d3..00a50e4 100644 +index dd5365c..1a463b0 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml -@@ -5070,22 +5070,45 @@ badresp:1,adberr:0,findfail:0,valfail:0] +@@ -5071,22 +5071,45 @@ badresp:1,adberr:0,findfail:0,valfail:0] <term><command>random-device</command></term> <listitem> <para> @@ -503,11 +502,11 @@ index baff8d3..00a50e4 100644 </listitem> </varlistentry> diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml -index d9537a3..5c2cc13 100644 +index ad4b34c..2685b8e 100644 --- a/doc/arm/notes.xml +++ b/doc/arm/notes.xml -@@ -180,6 +180,32 @@ - option. [GL #105] +@@ -229,6 +229,32 @@ + is used from the shell scripts. </para> </listitem> + <listitem> @@ -535,15 +534,15 @@ index d9537a3..5c2cc13 100644 + case <filename>/dev/random</filename> will be the default + entropy source. [RT #31459] [RT #46047] + </para> -+ </listitem> ++ </listitem> </itemizedlist> </section> diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c -index afb4d80..4e62a97 100644 +index b55ebe0..d2b43d3 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c -@@ -2013,10 +2013,12 @@ dst__entropy_getdata(void *buf, unsigned int len, bool pseudo) { +@@ -2016,10 +2016,12 @@ dst__entropy_getdata(void *buf, unsigned int len, bool pseudo) { else flags |= ISC_ENTROPY_BLOCKING; #ifdef ISC_PLATFORM_CRYPTORANDOM @@ -558,10 +557,10 @@ index afb4d80..4e62a97 100644 } diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h -index 78e1277..10293d0 100644 +index 6813c96..665574d 100644 --- a/lib/dns/include/dst/dst.h +++ b/lib/dns/include/dst/dst.h -@@ -164,8 +164,18 @@ isc_result_t +@@ -163,8 +163,18 @@ isc_result_t dst_random_getdata(void *data, unsigned int length, unsigned int *returned, unsigned int flags); /*%< @@ -583,10 +582,10 @@ index 78e1277..10293d0 100644 bool diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c -index d88d643..7a233dd 100644 +index 6849732..e00a0e4 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c -@@ -482,7 +482,8 @@ dst__openssl_getengine(const char *engine) { +@@ -484,7 +484,8 @@ dst__openssl_getengine(const char *engine) { isc_result_t dst_random_getdata(void *data, unsigned int length, @@ -740,7 +739,7 @@ index f8aed34..17c551b 100644 ISC_LANG_ENDDECLS diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c -index cd797a6..589da07 100644 +index fbc62cc..9cad61d 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -1109,7 +1109,7 @@ options_clauses[] = { @@ -753,5 +752,5 @@ index cd797a6..589da07 100644 { "recursive-clients", &cfg_type_uint32, 0 }, { "reserved-sockets", &cfg_type_uint32, 0 }, -- -2.14.4 +2.20.1 diff --git a/bind-9.11-tests-variants.patch b/bind-9.11-tests-variants.patch index b8ab1c0..55f4491 100644 --- a/bind-9.11-tests-variants.patch +++ b/bind-9.11-tests-variants.patch @@ -1,4 +1,4 @@ -From 118c70ab26f54f8ecd38da36f3e7d7ed66e2e764 Mon Sep 17 00:00:00 2001 +From 7d689f77714430a4ef6cead040ec304dca0b8bd3 Mon Sep 17 00:00:00 2001 From: Petr Mensik <pemensik(a)redhat.com> Date: Fri, 1 Mar 2019 15:48:20 +0100 Subject: [PATCH] Make alternative named builds testable in system tests @@ -17,19 +17,19 @@ export NAMED_VARIANT=-pkcs11 DNSSEC_VARIANT=-pkcs11 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in -index 0b9706a..a446c18 100644 +index b072af8..d2cb8ed 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in -@@ -20,7 +20,7 @@ TOP=${SYSTEMTESTTOP:=.}/../../.. - # Make it absolute so that it continues to work after we cd. - TOP=`cd $TOP && pwd` +@@ -27,7 +27,7 @@ ALTERNATIVE_ALGORITHM=RSASHA1 + ALTERNATIVE_ALGORITHM_NUMBER=5 + ALTERNATIVE_BITS=1280 -NAMED=$TOP/bin/named/named +NAMED=$TOP/bin/named${NAMED_VARIANT}/named${NAMED_VARIANT} # We must use "named -l" instead of "lwresd" because argv[0] is lost # if the program is libtoolized. LWRESD="$TOP/bin/named/named -l" -@@ -31,13 +31,14 @@ NSUPDATE=$TOP/bin/nsupdate/nsupdate +@@ -38,13 +38,14 @@ NSUPDATE=$TOP/bin/nsupdate/nsupdate DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen TSIGKEYGEN=$TOP/bin/confgen/tsig-keygen RNDCCONFGEN=$TOP/bin/confgen/rndc-confgen @@ -51,7 +51,7 @@ index 0b9706a..a446c18 100644 CHECKDS=$TOP/bin/python/dnssec-checkds COVERAGE=$TOP/bin/python/dnssec-coverage KEYMGR=$TOP/bin/python/dnssec-keymgr -@@ -57,7 +58,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read +@@ -64,7 +65,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read MDIG=$TOP/bin/tools/mdig NZD2NZF=$TOP/bin/tools/named-nzd2nzf FSTRM_CAPTURE=@FSTRM_CAPTURE@ diff --git a/bind-9.11-unit-disable-random.patch b/bind-9.11-unit-disable-random.patch index 5658d12..553f725 100644 --- a/bind-9.11-unit-disable-random.patch +++ b/bind-9.11-unit-disable-random.patch @@ -1,4 +1,4 @@ -From c89b0e288f923af69b97e8acc29250b262be7d1e Mon Sep 17 00:00:00 2001 +From 373f07148217a8e70e33446f5108fb42d1079ba6 Mon Sep 17 00:00:00 2001 From: Petr Mensik <pemensik(a)redhat.com> Date: Thu, 21 Feb 2019 22:42:27 +0100 Subject: [PATCH] Disable random_test @@ -9,37 +9,22 @@ subtests can occasionally fail, stop it. It can be used again by defining 'unstable' variable in Kyuafile. --- - lib/isc/tests/Atffile | 3 ++- lib/isc/tests/Kyuafile | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/isc/tests/Atffile b/lib/isc/tests/Atffile -index 8681844..74a4a77 100644 ---- a/lib/isc/tests/Atffile -+++ b/lib/isc/tests/Atffile -@@ -20,7 +20,8 @@ tp: pool_test - tp: print_test - tp: queue_test - tp: radix_test --tp: random_test -+# random test fails too often -+#tp: random_test - tp: regex_test - tp: result_test - tp: safe_test diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile -index 1c510c1..a86824a 100644 +index 4cd2574..9df2340 100644 --- a/lib/isc/tests/Kyuafile +++ b/lib/isc/tests/Kyuafile -@@ -19,7 +19,7 @@ atf_test_program{name='pool_test'} - atf_test_program{name='print_test'} - atf_test_program{name='queue_test'} - atf_test_program{name='radix_test'} --atf_test_program{name='random_test'} -+atf_test_program{name='random_test', required_configs='unstable'} - atf_test_program{name='regex_test'} - atf_test_program{name='result_test'} - atf_test_program{name='safe_test'} +@@ -19,7 +19,7 @@ tap_test_program{name='pool_test'} + tap_test_program{name='print_test'} + tap_test_program{name='queue_test'} + tap_test_program{name='radix_test'} +-tap_test_program{name='random_test'} ++tap_test_program{name='random_test', required_configs='unstable'} + tap_test_program{name='regex_test'} + tap_test_program{name='result_test'} + tap_test_program{name='safe_test'} -- 2.20.1 diff --git a/bind-9.11-unit-dnstap-pkcs11.patch b/bind-9.11-unit-dnstap-pkcs11.patch deleted file mode 100644 index 8620e9f..0000000 --- a/bind-9.11-unit-dnstap-pkcs11.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c -index 56e3da4..1f31542 100644 ---- a/lib/dns/tests/dnstap_test.c -+++ b/lib/dns/tests/dnstap_test.c -@@ -297,6 +297,9 @@ ATF_TC_BODY(totext, tc) { - - UNUSED(tc); - -+ /* make sure text conversion gets the right local time */ -+ setenv("TZ", "PST8", 1); -+ - result = dns_test_begin(NULL, true); - ATF_REQUIRE(result == ISC_R_SUCCESS); - -@@ -306,9 +309,6 @@ ATF_TC_BODY(totext, tc) { - result = isc_stdio_open(TAPTEXT, "r", &fp); - ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - -- /* make sure text conversion gets the right local time */ -- setenv("TZ", "PST8", 1); -- - while (dns_dt_getframe(handle, &data, &dsize) == ISC_R_SUCCESS) { - dns_dtdata_t *dtdata = NULL; - isc_buffer_t *b = NULL; diff --git a/bind-9.9.1-P2-multlib-conflict.patch b/bind-9.9.1-P2-multlib-conflict.patch index 96506dd..8768b86 100644 --- a/bind-9.9.1-P2-multlib-conflict.patch +++ b/bind-9.9.1-P2-multlib-conflict.patch @@ -1,8 +1,8 @@ diff --git a/config.h.in b/config.h.in -index e1364dd921..1dc65cfb21 100644 +index 4ecaa8f..2f65ccc 100644 --- a/config.h.in +++ b/config.h.in -@@ -588,7 +588,7 @@ int sigwait(const unsigned int *set, int *sig); +@@ -600,7 +600,7 @@ int sigwait(const unsigned int *set, int *sig); #undef PREFER_GOSTASN1 /* The size of `void *', as computed by sizeof. */ @@ -11,39 +11,8 @@ index e1364dd921..1dc65cfb21 100644 /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -diff --git a/configure.in b/configure.in -index 73b1c8ccbb..129fc3f311 100644 ---- a/configure.in -+++ b/configure.in -@@ -3523,14 +3523,14 @@ AC_TRY_COMPILE([ - #include <sys/socket.h> - #include <netdb.h> - int getnameinfo(const struct sockaddr *, socklen_t, char *, -- socklen_t, char *, socklen_t, unsigned int);], -+ socklen_t, char *, socklen_t, int);], - [ return (0);], -- [AC_MSG_RESULT(socklen_t for buflen; u_int for flags) -+ [AC_MSG_RESULT(socklen_t for buflen; int for flags) - AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t, - [Define to the sockaddr length type used by getnameinfo(3).]) - AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t, - [Define to the buffer length type used by getnameinfo(3).]) -- AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, unsigned int, -+ AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int, - [Define to the flags type used by getnameinfo(3).])], - [AC_TRY_COMPILE([ - #include <sys/types.h> -@@ -3557,7 +3557,7 @@ int getnameinfo(const struct sockaddr *, size_t, char *, - [AC_MSG_RESULT(not match any subspecies; assume standard definition) - AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t) - AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t) --AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)])])]) -+AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, unsigned int)])])]) - - # - # ...and same for gai_strerror(). diff --git a/isc-config.sh.in b/isc-config.sh.in -index a8a0a89e88..b5e94ed13e 100644 +index a8a0a89..b5e94ed 100644 --- a/isc-config.sh.in +++ b/isc-config.sh.in @@ -13,7 +13,18 @@ prefix=@prefix@ diff --git a/bind.spec b/bind.spec index aa765cc..ef1be71 100644 --- a/bind.spec +++ b/bind.spec @@ -128,18 +128,12 @@ Patch159:bind-9.11-rt46047.patch Patch160:bind-9.11-rh1624100.patch # https://gitlab.isc.org/isc-projects/bind9/issues/555 Patch161:bind-9.11-host-idn-disable.patch -# https://gitlab.isc.org/isc-projects/bind9/issues/624 -Patch162:bind-9.11-unit-dnstap-pkcs11.patch # https://gitlab.isc.org/isc-projects/bind9/commit/8a98277811e Patch163:bind-9.11-rh1663318.patch # https://gitlab.isc.org/isc-projects/bind9/issues/819 Patch164:bind-9.11-rh1666814.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1647829 Patch165:bind-9.11-rh1647829.patch -# commit 8e1cc95c943b7dfaaaaf2d9a4971861735cc3fb2 -Patch166:bind-9.11-rh1647829-2.patch -# https://gitlab.isc.org/isc-projects/bind9/issues/225 -Patch167:bind-9.11-ed448-disable.patch # random_test fails too often by random, disable it Patch168:bind-9.11-unit-disable-random.patch Patch169:bind-9.11-feature-test-dlz.patch @@ -520,12 +514,9 @@ are used for building ISC DHCP. %patch159 -p1 -b .rt46047 %patch160 -p1 -b .rh1624100 %patch161 -p1 -b .host-idn-disable -%patch162 -p1 -b .dnstap-pkcs11 %patch163 -p1 -b .rh1663318 %patch164 -p1 -b .rh1666814 %patch165 -p1 -b .rh1647829 -%patch166 -p1 -b .rh1647829-2 -%patch167 -p1 -b .noed448 %patch168 -p1 -b .random_test-disable %patch169 -p1 -b .featuretest-dlz %patch170 -p1 -b .featuretest-named diff --git a/bind97-rh478718.patch b/bind97-rh478718.patch index ef44490..dfc4165 100644 --- a/bind97-rh478718.patch +++ b/bind97-rh478718.patch @@ -1,8 +1,8 @@ -diff --git a/configure.in b/configure.in -index 896e81c1ce..73b1c8ccbb 100644 ---- a/configure.in -+++ b/configure.in -@@ -4275,6 +4275,10 @@ if test "yes" = "$use_atomic"; then +diff --git a/configure.ac b/configure.ac +index 26c509e..c1bfd62 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4152,6 +4152,10 @@ if test "yes" = "$use_atomic"; then AC_MSG_RESULT($arch) fi @@ -14,10 +14,10 @@ index 896e81c1ce..73b1c8ccbb 100644 AC_MSG_CHECKING([compiler support for inline assembly code]) diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in -index 2ff522342f..58df86adb3 100644 +index c902d46..9c7c342 100644 --- a/lib/isc/include/isc/platform.h.in +++ b/lib/isc/include/isc/platform.h.in -@@ -289,19 +289,25 @@ +@@ -284,19 +284,25 @@ * If the "xaddq" operation (64bit xadd) is available on this architecture, * ISC_PLATFORM_HAVEXADDQ will be defined. */ diff --git a/bind98-rh735103.patch b/bind98-rh735103.patch deleted file mode 100644 index 51bf290..0000000 --- a/bind98-rh735103.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up bind-9.10.1b1/lib/isc/unix/socket.c.rh735103 bind-9.10.1b1/lib/isc/unix/socket.c ---- bind-9.10.1b1/lib/isc/unix/socket.c.rh735103 2014-06-23 06:47:35.000000000 +0200 -+++ bind-9.10.1b1/lib/isc/unix/socket.c 2014-07-29 16:25:27.172818662 +0200 -@@ -67,6 +67,20 @@ - #include <isc/util.h> - #include <isc/xml.h> - -+/* See task.c about the following definition: */ -+#ifdef BIND9 -+#ifdef ISC_PLATFORM_USETHREADS -+#define USE_WATCHER_THREAD -+#else -+#define USE_SHARED_MANAGER -+#endif /* ISC_PLATFORM_USETHREADS */ -+#else /* BIND9 */ -+#undef ISC_PLATFORM_HAVESYSUNH -+#undef ISC_PLATFORM_HAVEKQUEUE -+#undef ISC_PLATFORM_HAVEEPOLL -+#undef ISC_PLATFORM_HAVEDEVPOLL -+#endif /* BIND9 */ -+ - #ifdef ISC_PLATFORM_HAVESYSUNH - #include <sys/un.h> - #endif -@@ -86,13 +100,6 @@ - - #include "errno2result.h" - --/* See task.c about the following definition: */ --#ifdef ISC_PLATFORM_USETHREADS --#define USE_WATCHER_THREAD --#else --#define USE_SHARED_MANAGER --#endif /* ISC_PLATFORM_USETHREADS */ -- - #ifndef USE_WATCHER_THREAD - #include "socket_p.h" - #include "../task_p.h" commit 2aa49f0cece9cce65d5255d5f03471b1951c2ec4 Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Mar 5 14:35:50 2019 +0100 Update to 9.11.6 Update lastest release, patches not yet adepted for it. diff --git a/.gitignore b/.gitignore index 858d487..4c7e54a 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ bind-9.7.2b1.tar.gz /bind-9.11.5-P1.tar.gz /config-19.tar.bz2 /bind-9.11.5-P4.tar.gz +/bind-9.11.6.tar.gz diff --git a/bind-9.11.5-P4.tar.gz.asc b/bind-9.11.5-P4.tar.gz.asc deleted file mode 100644 index d7b138e..0000000 --- a/bind-9.11.5-P4.tar.gz.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Comment: GPGTools - http://gpgtools.org - -iQIzBAABAgAdFiEEvg6XSLcYJToou4n/8bEb8FzwLlcFAlxks5sACgkQ8bEb8Fzw -Lld2iA//SfqtuHZGjTKVk35vLEjpK52Xs/rmawtTI1aMApk8jEXgD7yASa5dkgM1 -xRcU7H/8omkf16Oi1m1fdamnMYhW6AvbfX4hdRY9EDn3JepXGdO0ft9G2KzmvZBt -mU8bcqOfPHzEG0mu/oWMtL9eh9Edh5dFWxHkSGUnadXFTWH0NXRiyQwwmY6VexV4 -CQ7VkfP1fkuyZpq5tjyg9Z/umOmmwuwjkoaTbHxtfRLWVwMNgw24Pt6hUqjjJmCz -auDlBuGXKjBgRqRmAQR3klmcvNCna3+4e1+W9w/pgRxeEr9YD1JLVyhsAvLZ9FUc -Dpxz/MKfRkM71Lv3wvxrIODUrmSSecQ520lljxnNammnO0UuS6Og7LCpl6fSWm0c -y3A51mq25TJ1AyOlaiSU2TPYc5XJOMjyBqIqAvJei1cV/R2gMTjbYGz3rU+b9LlG -iRgdvAmUUhvBYAKXX7SmMUOFpXDiFv+Zbk0Gincok47VHihO4hksPx+RbL8BSOUJ -PGsQytwVnSQJTrDGuELyQYSGJzN8l8fMLKckNiRecNWFHCOQFpkdbtlYp+C4yopR -lGkx04ZVarlJBOPRkoN6mzZiXR17WaghHHXNq4gOP+HME6YAWJv3oLAAxeD8Tvyd -p4M4xCHw3WZt6OiKwgCE02wnthn3aUyRv+oOGYCL3+eTtoUzdNKJAjMEAAECAB0W -IQQVaJBoXqDfahNx7yAXzF2x8AiEBwUCXGSznAAKCRAXzF2x8AiEB3qgD/4qc2S3 -KcshK/BX10j75dmPVmNGdW1SH8V1h+nFKVIkvTzVXybBL3XeF7HP6/aJd460ku4n -XZ5FXd78f+g+G2gJaMA+rprS0NfpclhUS64SVTSDY727dnmV49xDdRIpqmUB7B1w -Nx9bLRHBxuPigE6S+Nmt78xrFmtS1cwegY2pz3ZD4HDDmtKMRuhZ9el71S7vLJyh -60pvFCqQMPJX7r0OXFC4iYwgIHab0iHQu4AASvaXzi03dR2S058aRk6gBMoBlQcL -Mcc/RzpHdJAKRx1bmU3h//HUAa5S6cKpRjDsFGj0GtFNY/ksdevTXTM3qB9k5GlR -T4mEadsWP3ARL9qQHyW4eStTdkH1qzgJF2tKn2M+dXlfdRXNImZPrEDXOfzmyRfA -ZoJLBeaJw5MaWeTtAcuPsppGDUuA9+hk9mpycmFZrxD21X4pr+NMrHa3TCFzAwgF -qyc96uX1SiFMRyUmLJY2ZMBR2y8W7TdL+MWjWzsGxQg8Dj3IaAbvRg1XztxDP9XB -RPYTniq7VOw4eEk3UgfjnIYfnEBQY+5d79MlSwxE4NBRg/h+ulZSHjP5HQ6BGzqu -aPg+p/P+G2GfQ5x0RxchG0B/Ogj2PRIwXptgwOXVoEs1671odj3aEE5E8JKquYlO -PRIIubc/EfYopZfyM2ryv2hAT+1z8ngeac1ycQ== -=kFOo ------END PGP SIGNATURE----- diff --git a/bind-9.11.6.tar.gz.asc b/bind-9.11.6.tar.gz.asc new file mode 100644 index 0000000..02ebf56 --- /dev/null +++ b/bind-9.11.6.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABAgAdFiEEFWiQaF6g32oTce8gF8xdsfAIhAcFAlx4dTcACgkQF8xdsfAI +hAc9QA/9FaZaH6OxWxjxdU2VdTzZzrxIn5VcTnrSLzeKapBgfH22dmmJZBPHqkCE +uch+d4eWH3CwcVjDs5auW7o69q0KnUDObpg1aGXVjRnBHKyH88Ziny4sd1kMXcZz +lk3HW3Cl+WQBxrA3l+QUQrW+IYIUM36ZpkMxbvgZOwGj8H8rzUjeszDqY86JH/QF +7RekyZwQ/Mb21sJTNntYufOn1KnKm4WZ52jihLVEaNLzQQLRxPIajSOVo+77LPpI +SJWo+iH4vz+5jEQUhDQ1eivDaKxRj/LcrVHQLB9JgCM+ZiRvxZRwqs6mANfDnpke +Ohzwf9Lh255bfq3xNQLYwwDbUpQ8JoEQ91Qw6F1MQ/32uhiBlUnWd2Yua22oSlOg +IcjXYW9i23Zyuuf1GLIENNaXNnVgxM44mmxQh0/Okf7Npake4kxKGEGtPkAdbWUk +NSghxHu8/0h5rwth7Rox4mWvp1vjRMjOGAjqMr5eVjXvFnFSazkY47fmliZCTDFm +O3Otqib4Z35hvXOZJvTIP/IOfjo4g3zNVcfxQHNCpyRSKqBs1smWPc3VbwlOr/nI +g/BxY595ylLIW7Ln46/3mkqZJPQO5F8AqQ+YPr+6ts908qQbA+P8nXRrZ/tcxFaM +N+LbjmvgzCtbReoKhS17PdTDqu8p61LIDdrtxZP02Fr4fcIRRQk= +=uY61 +-----END PGP SIGNATURE----- diff --git a/bind.spec b/bind.spec index ecbc8f7..aa765cc 100644 --- a/bind.spec +++ b/bind.spec @@ -2,7 +2,7 @@ # Red Hat BIND package .spec file # -%global PATCHVER P4 +#%%global PATCHVER P4 #%%global PREVER rc1 %global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}} @@ -53,8 +53,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Name: bind License: MPLv2.0 -Version: 9.11.5 -Release: 15%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Version: 9.11.6 +Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -1538,6 +1538,9 @@ fi; %changelog +* Tue Mar 05 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.6-1 +- Update to 9.11.6 + * Fri Mar 01 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-15.P4 - Support testing of named variants diff --git a/sources b/sources index 8336c9d..cae8504 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bind-9.11.5-P4.tar.gz) = ba750ffd080a47309db8be3df3d80896c5872aadb1a14ac7effd1bb783c2a2ae1e82959d6999eecc3d694336887060a84ae8813a17836b9064515cdd96fcb573 +SHA512 (bind-9.11.6.tar.gz) = 17a76ad4aafddeb86e330c4ca9b5fecb8df9e1109df4ff8d7a31d1da406f2597050d569460529b710f213360642842fcb9bdaa4eb79be10fcb093872fe75fdfd SHA512 (config-19.tar.bz2) = 36aa38a0c7c33267ae594b31c81681290ac58dde7ca6749bd599da531380b5b1428330813dbe983e01071ccaed83e83f6a9cd92179a53b7d0ccbb6851a0b017c commit 25e332108e68a819adc334c9c3261a9d8188bf71 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Mar 1 16:24:20 2019 +0100 Make alternative named builds testable in system tests Red Hat has alternative variant builds of named, which are not ever tested by system tests. New variables make it relatively easy to test alternative variants. For sdb variant use: export NAMED_VARIANT=-sdb DNSSEC_VARIANT= For pkcs variant use: export NAMED_VARIANT=-pkcs11 DNSSEC_VARIANT=-pkcs11 followed by make test in build directory. Note: PKCS11 tests are still skipped, it requires SLOT variable exported. Fails in some cases. diff --git a/bind-9.11-tests-pkcs11.patch b/bind-9.11-tests-pkcs11.patch new file mode 100644 index 0000000..79c55b2 --- /dev/null +++ b/bind-9.11-tests-pkcs11.patch @@ -0,0 +1,39 @@ +From 66298a12b09784eab2c052ab22f87bb2b2f1267b Mon Sep 17 00:00:00 2001 +From: Petr Mensik <pemensik(a)redhat.com> +Date: Fri, 1 Mar 2019 15:55:46 +0100 +Subject: [PATCH] Detect correctly pkcs11 support + +It fails now always, because oot builds are not supported by +cleanpkcs11.sh. +--- + bin/tests/system/cleanpkcs11.sh | 2 +- + bin/tests/system/conf.sh.in | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bin/tests/system/cleanpkcs11.sh b/bin/tests/system/cleanpkcs11.sh +index b974708..3bbef4c 100644 +--- a/bin/tests/system/cleanpkcs11.sh ++++ b/bin/tests/system/cleanpkcs11.sh +@@ -12,6 +12,6 @@ + SYSTEMTESTTOP=. + . $SYSTEMTESTTOP/conf.sh + +-if [ ! -x ../../pkcs11/pkcs11-destroy ]; then exit 1; fi ++if [ ! -x "$PK11DESTROY" ]; then exit 1; fi + + $PK11DEL -w0 > /dev/null 2>&1 +diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in +index a446c18..ede1203 100644 +--- a/bin/tests/system/conf.sh.in ++++ b/bin/tests/system/conf.sh.in +@@ -46,6 +46,7 @@ CHECKZONE=$TOP/bin/check/named-checkzone + CHECKCONF=$TOP/bin/check/named-checkconf + PK11GEN="$TOP/bin/pkcs11/pkcs11-keygen -q -s ${SLOT:-0} -p ${HSMPIN:-1234}" + PK11LIST="$TOP/bin/pkcs11/pkcs11-list -s ${SLOT:-0} -p ${HSMPIN:-1234}" ++PK11DESTROY=$TOP/bin/pkcs11/pkcs11-destroy + PK11DEL="$TOP/bin/pkcs11/pkcs11-destroy -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0" + JOURNALPRINT=$TOP/bin/tools/named-journalprint + VERIFY=$TOP/bin/dnssec/dnssec-verify +-- +2.20.1 + diff --git a/bind-9.11-tests-variants.patch b/bind-9.11-tests-variants.patch new file mode 100644 index 0000000..b8ab1c0 --- /dev/null +++ b/bind-9.11-tests-variants.patch @@ -0,0 +1,65 @@ +From 118c70ab26f54f8ecd38da36f3e7d7ed66e2e764 Mon Sep 17 00:00:00 2001 +From: Petr Mensik <pemensik(a)redhat.com> +Date: Fri, 1 Mar 2019 15:48:20 +0100 +Subject: [PATCH] Make alternative named builds testable in system tests + +Red Hat has alternative variant builds of named, which are not ever +tested by system tests. New variables make it relatively easy to test +alternative variants. + +For sdb variant use: +export NAMED_VARIANT=-sdb DNSSEC_VARIANT= + +For pkcs variant use: +export NAMED_VARIANT=-pkcs11 DNSSEC_VARIANT=-pkcs11 +--- + bin/tests/system/conf.sh.in | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in +index 0b9706a..a446c18 100644 +--- a/bin/tests/system/conf.sh.in ++++ b/bin/tests/system/conf.sh.in +@@ -20,7 +20,7 @@ TOP=${SYSTEMTESTTOP:=.}/../../.. + # Make it absolute so that it continues to work after we cd. + TOP=`cd $TOP && pwd` + +-NAMED=$TOP/bin/named/named ++NAMED=$TOP/bin/named${NAMED_VARIANT}/named${NAMED_VARIANT} + # We must use "named -l" instead of "lwresd" because argv[0] is lost + # if the program is libtoolized. + LWRESD="$TOP/bin/named/named -l" +@@ -31,13 +31,14 @@ NSUPDATE=$TOP/bin/nsupdate/nsupdate + DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen + TSIGKEYGEN=$TOP/bin/confgen/tsig-keygen + RNDCCONFGEN=$TOP/bin/confgen/rndc-confgen +-KEYGEN=$TOP/bin/dnssec/dnssec-keygen +-KEYFRLAB=$TOP/bin/dnssec/dnssec-keyfromlabel +-SIGNER=$TOP/bin/dnssec/dnssec-signzone +-REVOKE=$TOP/bin/dnssec/dnssec-revoke +-SETTIME=$TOP/bin/dnssec/dnssec-settime +-DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey +-IMPORTKEY=$TOP/bin/dnssec/dnssec-importkey ++KEYGEN=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-keygen${DNSSEC_VARIANT} ++KEYFRLAB=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-keyfromlabel${DNSSEC_VARIANT} ++SIGNER=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-signzone${DNSSEC_VARIANT} ++REVOKE=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-revoke${DNSSEC_VARIANT} ++SETTIME=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-settime${DNSSEC_VARIANT} ++DSFROMKEY=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-dsfromkey${DNSSEC_VARIANT} ++IMPORTKEY=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-importkey${DNSSEC_VARIANT} ++CHECKDS=$TOP/bin/python/dnssec-checkds + CHECKDS=$TOP/bin/python/dnssec-checkds + COVERAGE=$TOP/bin/python/dnssec-coverage + KEYMGR=$TOP/bin/python/dnssec-keymgr +@@ -57,7 +58,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read + MDIG=$TOP/bin/tools/mdig + NZD2NZF=$TOP/bin/tools/named-nzd2nzf + FSTRM_CAPTURE=@FSTRM_CAPTURE@ +-FEATURETEST=$TOP/bin/named/feature-test ++FEATURETEST=$TOP/bin/named${NAMED_VARIANT}/feature-test${NAMED_VARIANT} + + RANDFILE=$TOP/bin/tests/system/random.data + +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index d2a0951..ecbc8f7 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 14%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 15%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -144,6 +144,8 @@ Patch167:bind-9.11-ed448-disable.patch Patch168:bind-9.11-unit-disable-random.patch Patch169:bind-9.11-feature-test-dlz.patch Patch170:bind-9.11-feature-test-named.patch +Patch171:bind-9.11-tests-variants.patch +Patch172:bind-9.11-tests-pkcs11.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -527,6 +529,8 @@ are used for building ISC DHCP. %patch168 -p1 -b .random_test-disable %patch169 -p1 -b .featuretest-dlz %patch170 -p1 -b .featuretest-named +%patch171 -p1 -b .test-variant +%patch172 -p1 -b .test-pkcs11 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1534,6 +1538,9 @@ fi; %changelog +* Fri Mar 01 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-15.P4 +- Support testing of named variants + * Thu Feb 28 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-14.P4 - Modify feature-test detection of dlz-filesystem commit d0d728803b336b60cd2cefe582adb87739ca377e Author: Petr Menk <pemensik(a)redhat.com> Date: Thu Feb 28 18:17:53 2019 +0100 Modify feature test to detect dlz support System tests are failing for named, because it cannot detect it does not support filesystem SDB. Move feature test to named directory, so it is built for every variant. diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch index aa95e33..f5a6d78 100644 --- a/bind-9.10-dist-native-pkcs11.patch +++ b/bind-9.10-dist-native-pkcs11.patch @@ -1,3 +1,22 @@ +From c6c0dc7addd8b27718247aa9c67e3cf3f80a8be3 Mon Sep 17 00:00:00 2001 +From: Petr Mensik <pemensik(a)redhat.com> +Date: Fri, 1 Mar 2019 11:10:03 +0100 +Subject: [PATCH] bind-9.10-dist-native-pkcs11.patch + +--- + bin/Makefile.in | 4 +-- + bin/dnssec-pkcs11/Makefile.in | 44 ++++++++++++++--------------- + bin/dnssec/Makefile.in | 2 +- + bin/named-pkcs11/Makefile.in | 45 +++++++++++++---------------- + bin/named/Makefile.in | 2 +- + bin/pkcs11/Makefile.in | 6 ++-- + configure.in | 53 +++++++++++++++++++++++++++-------- + lib/Makefile.in | 2 +- + lib/dns-pkcs11/Makefile.in | 30 ++++++++++---------- + lib/isc-pkcs11/Makefile.in | 28 +++++++++--------- + make/includes.in | 10 +++++++ + 11 files changed, 129 insertions(+), 97 deletions(-) + diff --git a/bin/Makefile.in b/bin/Makefile.in index f0c504a..ce7a2da 100644 --- a/bin/Makefile.in @@ -14,7 +33,7 @@ index f0c504a..ce7a2da 100644 @BIND9_MAKE_RULES@ diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in -index ce0a177..f8370cf 100644 +index ce0a177..8908a45 100644 --- a/bin/dnssec-pkcs11/Makefile.in +++ b/bin/dnssec-pkcs11/Makefile.in @@ -17,18 +17,18 @@ VERSION=@BIND9_VERSION@ @@ -24,8 +43,9 @@ index ce0a177..f8370cf 100644 -CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ +CINCLUDES = ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES} - CDEFINES = -DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \ +-CDEFINES = -DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \ - @CRYPTO@ -DPK11_LIB_LOCATION=\"@PKCS11_PROVIDER@\" ++CDEFINES = -DVERSION=\"${VERSION}\" @PKCS11_ENGINE@ \ + @CRYPTO_PK11@ -DPK11_LIB_LOCATION=\"@PKCS11_PROVIDER@\" CWARNINGS = @@ -142,7 +162,7 @@ index ce0a177..7cede84 100644 CWARNINGS = diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in -index d92bc9a..a8c42a4 100644 +index c0861f6..df80f81 100644 --- a/bin/named-pkcs11/Makefile.in +++ b/bin/named-pkcs11/Makefile.in @@ -43,26 +43,26 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@ @@ -189,12 +209,12 @@ index d92bc9a..a8c42a4 100644 NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \ - ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@ -+ @LIBS@ ++ @LIBS@ SUBDIRS = unix --TARGETS = named@EXEEXT@ lwresd@EXEEXT@ -+TARGETS = named-pkcs11@EXEEXT@ +-TARGETS = named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@ ++TARGETS = named-pkcs11@EXEEXT@ feature-test-pkcs11@EXEEXT@ GEOIPLINKOBJS = geoip.@O@ @@ -218,7 +238,7 @@ index d92bc9a..a8c42a4 100644 MANPAGES = named.8 lwresd.8 named.conf.5 -@@ -146,14 +144,14 @@ server.@O@: server.c +@@ -146,21 +144,21 @@ server.@O@: server.c -DPRODUCT=\"${PRODUCT}\" \ -DVERSION=\"${VERSION}\" -c ${srcdir}/server.c @@ -234,9 +254,17 @@ index d92bc9a..a8c42a4 100644 - @LN@ named@EXEEXT@ lwresd@EXEEXT@ + @LN@ named-pkcs11@EXEEXT@ lwresd@EXEEXT@ - doc man:: ${MANOBJS} + # Bit of hack, do not produce intermediate .o object for featuretest + feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c + ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ + -c ${top_srcdir}/bin/tests/system/feature-test.c + +-feature-test@EXEEXT@: feature-test.@O@ ++feature-test-pkcs11@EXEEXT@: feature-test.@O@ + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \ + -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS} -@@ -184,16 +182,11 @@ install-man8: named.8 lwresd.8 +@@ -193,16 +191,11 @@ install-man8: named.8 lwresd.8 install-man: install-man5 install-man8 @@ -257,7 +285,7 @@ index d92bc9a..a8c42a4 100644 @DLZ_DRIVER_RULES@ diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in -index d92bc9a..6d2bfd1 100644 +index c0861f6..04dea99 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -47,7 +47,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ @@ -291,7 +319,7 @@ index a058c91..d4b689a 100644 DEPLIBS = ${ISCDEPLIBS} diff --git a/configure.in b/configure.in -index 898b4ac..1edafd1 100644 +index b2bb268..d9e0797 100644 --- a/configure.in +++ b/configure.in @@ -1109,12 +1109,14 @@ AC_SUBST(USE_GSSAPI) @@ -369,7 +397,7 @@ index 898b4ac..1edafd1 100644 then AC_MSG_RESULT() AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.]) -@@ -2011,6 +2015,7 @@ AC_SUBST(OPENSSL_ED25519) +@@ -2016,6 +2020,7 @@ AC_SUBST(OPENSSL_ED25519) AC_SUBST(OPENSSL_GOST) DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" @@ -377,7 +405,7 @@ index 898b4ac..1edafd1 100644 ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" if test "yes" = "$with_aes" -@@ -2329,6 +2334,7 @@ esac +@@ -2334,6 +2339,7 @@ esac AC_SUBST(PKCS11LINKOBJS) AC_SUBST(PKCS11LINKSRCS) AC_SUBST(CRYPTO) @@ -385,7 +413,7 @@ index 898b4ac..1edafd1 100644 AC_SUBST(PKCS11_ECDSA) AC_SUBST(PKCS11_GOST) AC_SUBST(PKCS11_ED25519) -@@ -5401,8 +5407,11 @@ AC_CONFIG_FILES([ +@@ -5406,8 +5412,11 @@ AC_CONFIG_FILES([ bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile @@ -397,7 +425,7 @@ index 898b4ac..1edafd1 100644 bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile -@@ -5476,6 +5485,10 @@ AC_CONFIG_FILES([ +@@ -5480,6 +5489,10 @@ AC_CONFIG_FILES([ lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile @@ -408,7 +436,7 @@ index 898b4ac..1edafd1 100644 lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile -@@ -5500,6 +5513,24 @@ AC_CONFIG_FILES([ +@@ -5504,6 +5517,24 @@ AC_CONFIG_FILES([ lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile @@ -610,3 +638,6 @@ index fa86ad1..3cfbe9f 100644 + +DNS_PKCS11_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \ + -I${top_srcdir}/lib/dns-pkcs11/include +-- +2.20.1 + diff --git a/bind-9.10-sdb.patch b/bind-9.10-sdb.patch index 7874a5c..e087ad7 100644 --- a/bind-9.10-sdb.patch +++ b/bind-9.10-sdb.patch @@ -1,3 +1,17 @@ +From 09b71a1994d7ea3b299746167b6bcf24021edd76 Mon Sep 17 00:00:00 2001 +From: Petr Mensik <pemensik(a)redhat.com> +Date: Thu, 28 Feb 2019 18:37:01 +0100 +Subject: [PATCH] bind-9.10-sdb.patch + +--- + bin/Makefile.in | 4 +- + bin/named-sdb/Makefile.in | 25 +++++------- + bin/named-sdb/main.c | 83 +++++++++++++++++++++++++++++++++++++++ + bin/named/Makefile.in | 16 +++----- + bin/sdb_tools/Makefile.in | 10 +++-- + configure.in | 3 ++ + 6 files changed, 110 insertions(+), 31 deletions(-) + diff --git a/bin/Makefile.in b/bin/Makefile.in index ce7a2da..4e6a824 100644 --- a/bin/Makefile.in @@ -14,7 +28,7 @@ index ce7a2da..4e6a824 100644 @BIND9_MAKE_RULES@ diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in -index 6d2bfd1..d3f42e8 100644 +index 04dea99..4ff053e 100644 --- a/bin/named-sdb/Makefile.in +++ b/bin/named-sdb/Makefile.in @@ -30,10 +30,10 @@ VERSION=@BIND9_VERSION@ @@ -35,8 +49,8 @@ index 6d2bfd1..d3f42e8 100644 SUBDIRS = unix --TARGETS = named@EXEEXT@ lwresd@EXEEXT@ -+TARGETS = named-sdb@EXEEXT@ +-TARGETS = named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@ ++TARGETS = named-sdb@EXEEXT@ feature-test-sdb@EXEEXT@ GEOIPLINKOBJS = geoip.@O@ @@ -49,7 +63,16 @@ index 6d2bfd1..d3f42e8 100644 export MAKE_SYMTABLE="yes"; \ export BASEOBJS="${OBJS} ${UOBJS}"; \ ${FINALBUILDCMD} -@@ -173,8 +173,6 @@ statschannel.@O@: bind9.xsl.h +@@ -160,7 +160,7 @@ feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c + ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ + -c ${top_srcdir}/bin/tests/system/feature-test.c + +-feature-test@EXEEXT@: feature-test.@O@ ++feature-test-sdb@EXEEXT@: feature-test.@O@ + ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \ + -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS} + +@@ -182,8 +182,6 @@ statschannel.@O@: bind9.xsl.h installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} @@ -58,7 +81,7 @@ index 6d2bfd1..d3f42e8 100644 install-man5: named.conf.5 ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5 -@@ -184,16 +182,11 @@ install-man8: named.8 lwresd.8 +@@ -193,16 +191,11 @@ install-man8: named.8 lwresd.8 install-man: install-man5 install-man8 @@ -79,10 +102,10 @@ index 6d2bfd1..d3f42e8 100644 @DLZ_DRIVER_RULES@ diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c -index bb639d9..555c4d9 100644 +index 8cec1ad..de5e5bb 100644 --- a/bin/named-sdb/main.c +++ b/bin/named-sdb/main.c -@@ -91,6 +91,10 @@ +@@ -93,6 +93,10 @@ * Include header files for database drivers here. */ /* #include "xxdb.h" */ @@ -93,7 +116,7 @@ index bb639d9..555c4d9 100644 #ifdef CONTRIB_DLZ /* -@@ -1061,6 +1065,11 @@ setup(void) { +@@ -1063,6 +1067,11 @@ setup(void) { ns_main_earlyfatal("isc_app_start() failed: %s", isc_result_totext(result)); @@ -105,7 +128,7 @@ index bb639d9..555c4d9 100644 isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>", ns_g_product, ns_g_version, -@@ -1261,6 +1270,75 @@ setup(void) { +@@ -1263,6 +1272,75 @@ setup(void) { isc_result_totext(result)); #endif @@ -181,7 +204,7 @@ index bb639d9..555c4d9 100644 ns_server_create(ns_g_mctx, &ns_g_server); #ifdef HAVE_LIBSECCOMP -@@ -1303,6 +1381,11 @@ cleanup(void) { +@@ -1305,6 +1383,11 @@ cleanup(void) { dns_name_destroy(); @@ -194,7 +217,7 @@ index bb639d9..555c4d9 100644 ISC_LOG_NOTICE, "exiting"); ns_log_shutdown(); diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in -index 6d2bfd1..86f8587 100644 +index 04dea99..9ed9637 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -45,9 +45,9 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@ @@ -243,7 +266,7 @@ index 6d2bfd1..86f8587 100644 MANPAGES = named.8 lwresd.8 named.conf.5 -@@ -195,7 +193,5 @@ uninstall:: +@@ -204,7 +202,5 @@ uninstall:: rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@ ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@ @@ -287,10 +310,10 @@ index c7e0868..95ab742 100644 + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir} ${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1 diff --git a/configure.in b/configure.in -index 62536a6..f571a4f 100644 +index c09c21a..e48bd2e 100644 --- a/configure.in +++ b/configure.in -@@ -5445,6 +5445,8 @@ AC_CONFIG_FILES([ +@@ -5417,6 +5417,8 @@ AC_CONFIG_FILES([ bin/named/unix/Makefile bin/named-pkcs11/Makefile bin/named-pkcs11/unix/Makefile @@ -299,7 +322,7 @@ index 62536a6..f571a4f 100644 bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile -@@ -5469,6 +5471,7 @@ AC_CONFIG_FILES([ +@@ -5441,6 +5443,7 @@ AC_CONFIG_FILES([ bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile @@ -307,3 +330,6 @@ index 62536a6..f571a4f 100644 bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile +-- +2.20.1 + diff --git a/bind-9.11-feature-test-dlz.patch b/bind-9.11-feature-test-dlz.patch new file mode 100644 index 0000000..2c06d9f --- /dev/null +++ b/bind-9.11-feature-test-dlz.patch @@ -0,0 +1,85 @@ +From fe4074d27f642dd93afb5988a2edc7c173b22520 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> +Date: Wed, 30 Jan 2019 15:12:54 +0100 +Subject: [PATCH] Support DLZ filesystem detection in feature-test + +Do not use variable from configure to detect the feature. +--- + bin/tests/system/Makefile.in | 2 +- + bin/tests/system/dlz/{prereq.sh.in => prereq.sh} | 2 +- + bin/tests/system/feature-test.c | 9 +++++++++ + configure.in | 1 - + 4 files changed, 11 insertions(+), 3 deletions(-) + rename bin/tests/system/dlz/{prereq.sh.in => prereq.sh} (91%) + +diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in +index c18b4c5..dea2f75 100644 +--- a/bin/tests/system/Makefile.in ++++ b/bin/tests/system/Makefile.in +@@ -19,7 +19,7 @@ SUBDIRS = dlzexternal dyndb lwresd pipelined rndc rsabigexponent tkey + + CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES} + +-CDEFINES = @USE_GSSAPI@ ++CDEFINES = @USE_GSSAPI@ @CONTRIB_DLZ@ + CWARNINGS = + + DNSLIBS = +diff --git a/bin/tests/system/dlz/prereq.sh.in b/bin/tests/system/dlz/prereq.sh +similarity index 91% +rename from bin/tests/system/dlz/prereq.sh.in +rename to bin/tests/system/dlz/prereq.sh +index afec653..fb3328e 100644 +--- a/bin/tests/system/dlz/prereq.sh.in ++++ b/bin/tests/system/dlz/prereq.sh +@@ -12,7 +12,7 @@ + SYSTEMTESTTOP=.. + . $SYSTEMTESTTOP/conf.sh + +-if [ "@DLZ_SYSTEM_TEST@" != "filesystem" ]; then ++if ! $FEATURETEST --with-dlz-filesystem; then + echo_i "DLZ filesystem driver not supported" + exit 255 + fi +diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c +index 5eee6aa..78bd3b9 100644 +--- a/bin/tests/system/feature-test.c ++++ b/bin/tests/system/feature-test.c +@@ -51,6 +51,7 @@ usage() { + fprintf(stderr, " --rpz-nsip\n"); + fprintf(stderr, " --with-idn\n"); + fprintf(stderr, " --with-lmdb\n"); ++ fprintf(stderr, " --with-dlz-filesystem\n"); + } + + int +@@ -182,6 +183,14 @@ main(int argc, char **argv) { + #endif + } + ++ if (strcmp(argv[1], "--with-dlz-filesystem") == 0) { ++#ifdef DLZ_FILESYSTEM ++ return (0); ++#else ++ return (1); ++#endif ++ } ++ + if (strcmp(argv[1], "--ipv6only=no") == 0) { + #ifdef WIN32 + return (0); +diff --git a/configure.in b/configure.in +index fc1ad41..b2bb268 100644 +--- a/configure.in ++++ b/configure.in +@@ -5439,7 +5439,6 @@ AC_CONFIG_FILES([ + bin/tests/pkcs11/benchmarks/Makefile + bin/tests/system/Makefile + bin/tests/system/conf.sh +- bin/tests/system/dlz/prereq.sh + bin/tests/system/dlzexternal/Makefile + bin/tests/system/dlzexternal/ns1/dlzs.conf + bin/tests/system/dyndb/Makefile +-- +2.20.1 + diff --git a/bind-9.11-feature-test-named.patch b/bind-9.11-feature-test-named.patch new file mode 100644 index 0000000..9758c38 --- /dev/null +++ b/bind-9.11-feature-test-named.patch @@ -0,0 +1,58 @@ +From 4293078b294cbb766abe84d3b1618b1cb5413c82 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> +Date: Wed, 30 Jan 2019 14:37:17 +0100 +Subject: [PATCH 2/2] Create feature-test in source directory + +Feature-test tool is used in system tests to test compiled in changes. +Because we build more variants of named with different configuration, +compile feature-test for each of them this way. +--- + bin/named/Makefile.in | 11 ++++++++++- + bin/tests/system/conf.sh.in | 2 +- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in +index 1c413973d0..b31df9a718 100644 +--- a/bin/named/Makefile.in ++++ b/bin/named/Makefile.in +@@ -79,7 +79,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ + + SUBDIRS = unix + +-TARGETS = named@EXEEXT@ lwresd@EXEEXT@ ++TARGETS = named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@ + + GEOIPLINKOBJS = geoip.@O@ + +@@ -151,6 +151,15 @@ lwresd@EXEEXT@: named@EXEEXT@ + rm -f lwresd@EXEEXT@ + @LN@ named@EXEEXT@ lwresd@EXEEXT@ + ++# Bit of hack, do not produce intermediate .o object for featuretest ++feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c ++ ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ ++ -c ${top_srcdir}/bin/tests/system/feature-test.c ++ ++feature-test@EXEEXT@: feature-test.@O@ ++ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \ ++ -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS} ++ + doc man:: ${MANOBJS} + + docclean manclean maintainer-clean:: +diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in +index 2236f0a151..b072af8467 100644 +--- a/bin/tests/system/conf.sh.in ++++ b/bin/tests/system/conf.sh.in +@@ -64,7 +64,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read + MDIG=$TOP/bin/tools/mdig + NZD2NZF=$TOP/bin/tools/named-nzd2nzf + FSTRM_CAPTURE=@FSTRM_CAPTURE@ +-FEATURETEST=$TOP/bin/tests/system/feature-test ++FEATURETEST=$TOP/bin/named/feature-test + + RANDFILE=$TOP/bin/tests/system/random.data + +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index eafbae7..d2a0951 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 13%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 14%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -142,6 +142,8 @@ Patch166:bind-9.11-rh1647829-2.patch Patch167:bind-9.11-ed448-disable.patch # random_test fails too often by random, disable it Patch168:bind-9.11-unit-disable-random.patch +Patch169:bind-9.11-feature-test-dlz.patch +Patch170:bind-9.11-feature-test-named.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -523,6 +525,8 @@ are used for building ISC DHCP. %patch166 -p1 -b .rh1647829-2 %patch167 -p1 -b .noed448 %patch168 -p1 -b .random_test-disable +%patch169 -p1 -b .featuretest-dlz +%patch170 -p1 -b .featuretest-named mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1530,6 +1534,9 @@ fi; %changelog +* Thu Feb 28 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-14.P4 +- Modify feature-test detection of dlz-filesystem + * Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-13.P4 - Update to 9.11.5-P4 commit 8da0172aacced475265010cbe42e08c698235c15 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Feb 22 21:31:30 2019 +0100 Upstream tests in beakerlib Prepare system tests from source package and start them. Check results and report failure. diff --git a/tests/Run-internal-BIND-test-suite/Makefile b/tests/Run-internal-BIND-test-suite/Makefile new file mode 100644 index 0000000..2343d3d --- /dev/null +++ b/tests/Run-internal-BIND-test-suite/Makefile @@ -0,0 +1,74 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of tests/Run-internal-BIND-test-suite +# Description: Run internal BIND test suite +# Author: Martin Cermak <mcermak(a)redhat.com> +# Author: Petr Mensik <pemensik(a)redhat.com> +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2010 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=tests/Run-internal-BIND-test-suite +export TESTVERSION=1.3 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE knownerror* setup-named-softhsm.sh bind-systest-filter.sh + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Martin Cermak <mcermak(a)redhat.com>" > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Run internal BIND test suite" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 8h" >> $(METADATA) + @echo "RunFor: bind" >> $(METADATA) + @echo "Requires: bind rpm-build bind-utils" >> $(METADATA) + @echo "Requires: perl-Net-DNS perl-Net-DNS-Nameserver" >> $(METADATA) + @echo "Requires: bind-pkcs11 bind-pkcs11-utils softhsm" >> $(METADATA) + @echo "Requires: openssl-devel libtool autoconf" >> $(METADATA) + @echo "Requires: libcap-devel libidn-devel libxml2-devel" >> $(METADATA) + @echo "Requires: openldap-devel postgresql-devel" >> $(METADATA) + @echo "Requires: sqlite-devel krb5-devel net-tools" >> $(METADATA) + @echo "Requires: dnf-utils" >> $(METADATA) + @echo "Requires: kyua libatf-c" >> $(METADATA) + @echo "Requires: gcc-c++" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Bug: 642970" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/Run-internal-BIND-test-suite/PURPOSE b/tests/Run-internal-BIND-test-suite/PURPOSE new file mode 100644 index 0000000..754ba2a --- /dev/null +++ b/tests/Run-internal-BIND-test-suite/PURPOSE @@ -0,0 +1,6 @@ +PURPOSE of tests/Run-internal-BIND-test-suite +Description: Run internal BIND test suite +Author: Martin Cermak <mcermak(a)redhat.com> +Bug summary: Run internal BIND test suite +Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=642970 + diff --git a/tests/Run-internal-BIND-test-suite/bind-systest-filter.sh b/tests/Run-internal-BIND-test-suite/bind-systest-filter.sh new file mode 100755 index 0000000..8a153a1 --- /dev/null +++ b/tests/Run-internal-BIND-test-suite/bind-systest-filter.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# +# This script will filter out output from BINDs tests +# It supports form from BIND 9.9 and BIND 9.11 +# Its purpose is to display only failed tests from list of all tests + +CURRENT_TEST= +CURRENT_OUTPUT= +STATUS_ONLY= + +for P; do + case "$P" in + -s|--status) STATUS_ONLY=yes; shift ;; + esac +done + +cat $@ | while read LINE; do + if [ "${LINE#S:}" != "$LINE" ]; then + CURRENT_TEST=`echo $LINE | cut -d: -f2` + CURRENT_OUTPUT="$LINE"$'\n' + elif [ "${LINE#R:}" != "$LINE" ]; then + # echo "$CURRENT_TEST $LINE" + if [ "${LINE/#R:*:*}" != "$LINE" ]; then + # more recent results contain test name + # R:dlz:FAIL + CURRENT_TEST="${LINE#R:}" + CURRENT_TEST="${CURRENT_TEST/%:*}" + RESULT="${LINE/#*:}" + else + # S:dlz:time + # R:FAIL + RESULT="${LINE/#R*:/}" + fi + if [ "$RESULT" != "PASS" ]; then + if [ -n "$STATUS_ONLY" ]; then + echo "$RESULT $CURRENT_TEST" + else + CURRENT_OUTPUT+="$LINE" + echo "$CURRENT_OUTPUT" + echo + fi + fi + CURRENT_OUTPUT= + else + CURRENT_OUTPUT+="$LINE"$'\n' + fi +done diff --git a/tests/Run-internal-BIND-test-suite/knownerror b/tests/Run-internal-BIND-test-suite/knownerror new file mode 100644 index 0000000..2d0c8e9 --- /dev/null +++ b/tests/Run-internal-BIND-test-suite/knownerror @@ -0,0 +1,2 @@ +A:System test dlz +A:System test idna diff --git a/tests/Run-internal-BIND-test-suite/runtest.sh b/tests/Run-internal-BIND-test-suite/runtest.sh new file mode 100755 index 0000000..7f4d212 --- /dev/null +++ b/tests/Run-internal-BIND-test-suite/runtest.sh @@ -0,0 +1,146 @@ +#!/bin/bash +# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of tests/Run-internal-BIND-test-suite +# Description: Run internal BIND test suite +# Author: Martin Cermak <mcermak(a)redhat.com> +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2010 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include rhts environment +. /usr/bin/rhts-environment.sh +. /usr/lib/beakerlib/beakerlib.sh + +PACKAGE="bind" + +rlJournalStart + rlPhaseStartSetup + # package assertions + rlAssertRpm $PACKAGE + rlAssertRpm rpm-build + rlAssertRpm perl-Net-DNS-Nameserver + + #pwd + ORIG=`pwd` + FOUNDERROR=`mktemp` + SETUP_SOFTHSM=`readlink -f setup-named-softhsm.sh` + FILTER=`readlink -f bind-systest-filter.sh` + + TAG=generic + if [ -f /etc/os-release ]; then + # extract platform tag + TAG=`(source /etc/os-release && echo ${PLATFORM_ID#platform:})` + fi + + if [ -f "knownerror.$TAG" ]; then + KNOWNERROR=`readlink -f knownerror.$TAG` + elif [ -f "knownerror" ]; then + KNOWNERROR=`readlink -f knownerror` + fi + + #tempdir + rlRun "TMPDIR=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "pushd $TMPDIR" + + # topdir + TOPDIR=`rpm -E '%{_topdir}'` + + # cleanup in topdir + mkdir -p $TOPDIR/{BUILD,SOURCES,SPECS} + rm -rf $TOPDIR/{BUILD,SOURCES,SPECS}/* + + # download src rpm + if ! ls bind*.src.rpm; then + rlRun "dnf --enablerepo='*-source' download bind.src" 0 "Fetch source from repository" + rlRun "rpm -i bind*.src.rpm" + fi + + rlRun "rpm --define '_topdir $TOPDIR' -Uvh *rpm &> $TMPDIR/install.txt" + rlRun "cd $TOPDIR/SPECS" + + rlRun "dnf -y builddep *.spec" + + # stop bind if it is running + rlServiceStop named + rlPhaseEnd + + rlPhaseStartTest + # rebuild from source + rlRun "rpmbuild -ba *.spec &> $TMPDIR/build.txt" + + # the test + rlRun "cd $TOPDIR/BUILD/bind*" + + rlLogInfo "Test takes place in `pwd`" + + rlRun "chown -R root ." + + if [ -x "$SETUP_SOFTHSM" ]; then + rlRun "eval \"$(bash $SETUP_SOFTHSM -A)\"" 0 "Preparing PKCS#11 token slot" + rlRun "pkcs11-tokens" 0 "Testing token slot availability" + else + rlLog "PKCS#11 not initialized" + fi + + if [ -d build ]; then + BUILD=build + else + BUILD=. + fi + + rlRun "./bin/tests/system/ifconfig.sh up" 0 "Setup fake network interfaces." + + # required by idna test + export LC_ALL=en_US.UTF-8 + + rlRun "pushd $BUILD" + rlRun "make test &> $TMPDIR/test.txt" 0-255 "Perform the test." + rlRun "popd" + + rlRun "grep -C 10 FAIL $TMPDIR/test.txt" 0-255 "Quickly show the test error (if any)." + + rlRun "./bin/tests/system/ifconfig.sh down" 0 "Remove fake network interfaces." + + + #list of failures: + rlRun "$FILTER $TMPDIR/test.txt" 0 "Showing unsuccessful tests" + rlRun "$FILTER -s $TMPDIR/test.txt > $FOUNDERROR" 0 + rlRun "ls $KNOWNERROR $FOUNDERROR $TMPDIR/test.txt" 0 'check if there is needed files' + rlLog "`cat $FOUNDERROR`" + + rlAssertLesserOrEqual "Checking number of found errors is in limits" "$(grep '^FAIL' $FOUNDERROR | wc -l)" "$(wc -l <$KNOWNERROR)" + cat $FOUNDERROR | while read STATUS TEST ; do + if [ "$STATUS" = FAIL ]; then + rlRun "grep '$TEST' $KNOWNERROR" 0 "Check $TEST failure is expected" + else + rlLog "$STATUS $TEST" + fi + done + rlPhaseEnd + + rlPhaseStartCleanup + rlBundleLogs "TEST_LOGS" "$TMPDIR/install.txt" "$TMPDIR/builddeps.txt" "$TMPDIR/build.txt" "$TMPDIR/test.txt" + rlRun "popd" + rlRun "rm -r $TMPDIR" 0 "Removing tmp directory" + rlRun "rm -rf $FOUNDERROR" + rlPhaseEnd +rlJournalEnd diff --git a/tests/Run-internal-BIND-test-suite/setup-named-softhsm.sh b/tests/Run-internal-BIND-test-suite/setup-named-softhsm.sh new file mode 100755 index 0000000..a13c91e --- /dev/null +++ b/tests/Run-internal-BIND-test-suite/setup-named-softhsm.sh @@ -0,0 +1,123 @@ +#!/bin/sh +# +# This script will initialise token storage of softhsm PKCS11 provider +# in custom location. Is useful to store tokens in non-standard location. +# +# Output can be evaluated from bash, it will prepare it for usage of temporary tokens. +# Recommended use: +# eval $(bash setup-named-softhsm.sh -A) +# + +SOFTHSM2_CONF="$1" +TOKENPATH="$2" +GROUPNAME="$3" +# Do not use this script for real keys worth protection +# This is intended for crypto accelerators using PKCS11 interface. +# Uninitialized token would fail any crypto operation. +PIN=1234 +SO_PIN=1234 +LABEL=rpm + +set -e + +echo_i() +{ + echo "#" $@ +} + +random() +{ + if [ -x "$(which openssl 2>/dev/null)" ]; then + openssl rand -base64 $1 + else + dd if=/dev/urandom bs=1c count=$1 | base64 + fi +} + +usage() +{ + echo "Usage: $0 -A [token directory] [group]" + echo " or: $0 <config file> <token directory> [group]" +} + +if [ "$SOFTHSM2_CONF" = "-A" -a -z "$TOKENPATH" ]; then + TOKENPATH=$(mktemp -d /var/tmp/softhsm-XXXXXX) +fi + +if [ -z "$SOFTHSM2_CONF" -o -z "$TOKENPATH" ]; then + usage >&2 + exit 1 +fi + +if [ "$SOFTHSM2_CONF" = "-A" ]; then + # Automagic mode instead + MODE=secure + SOFTHSM2_CONF="$TOKENPATH/softhsm2.conf" + PIN_SOURCE="$TOKENPATH/pin" + SOPIN_SOURCE="$TOKENPATH/so-pin" + TOKENPATH="$TOKENPATH/tokens" +else + MODE=legacy +fi + +[ -d "$TOKENPATH" ] || mkdir -p "$TOKENPATH" + +umask 0022 + +if ! [ -f "$SOFTHSM2_CONF" ]; then +cat << SED > "$SOFTHSM2_CONF" +# SoftHSM v2 configuration file + +directories.tokendir = ${TOKENPATH} +objectstore.backend = file + +# ERROR, WARNING, INFO, DEBUG +log.level = ERROR + +# If CKF_REMOVABLE_DEVICE flag should be set +slots.removable = false +SED +else + echo_i "Config file $SOFTHSM2_CONF already exists" >&2 +fi + +if [ -n "$PIN_SOURCE" ]; then + touch "$PIN_SOURCE" "$SOPIN_SOURCE" + chmod 0600 "$PIN_SOURCE" "$SOPIN_SOURCE" + if [ -n "$GROUPNAME" ]; then + chgrp "$GROUPNAME" "$PIN_SOURCE" "$SOPIN_SOURCE" + chmod g+r "$PIN_SOURCE" "$SOPIN_SOURCE" + fi +fi + +export SOFTHSM2_CONF + +if softhsm2-util --show-slots | grep 'Initialized:[[:space:]]*yes' > /dev/null +then + echo_i "Token in ${TOKENPATH} is already initialized" >&2 + + [ -f "$PIN_SOURCE" ] && PIN=$(cat "$PIN_SOURCE") + [ -f "$SOPIN_SOURCE" ] && SO_PIN=$(cat "$SOPIN_SOURCE") +else + PIN=$(random 6) + SO_PIN=$(random 18) + if [ -n "$PIN_SOURCE" ]; then + echo -n "$PIN" > "$PIN_SOURCE" + echo -n "$SO_PIN" > "$SOPIN_SOURCE" + fi + + echo_i "Initializing tokens to ${TOKENPATH}..." + softhsm2-util --init-token --free --label "$LABEL" --pin "$PIN" --so-pin "$SO_PIN" | sed -e 's/^/# /' + + if [ -n "$GROUPNAME" ]; then + chgrp -R -- "$GROUPNAME" "$TOKENPATH" + chmod -R -- g=rX,o= "$TOKENPATH" + fi +fi + +echo "export SOFTHSM2_CONF=\"$SOFTHSM2_CONF\"" +echo "export PIN_SOURCE=\"$PIN_SOURCE\"" +echo "export SOPIN_SOURCE=\"$SOPIN_SOURCE\"" +# These are intentionaly not exported +echo "PIN=\"$PIN\"" +echo "SO_PIN=\"$SO_PIN\"" commit 321554b987592b3a13f2b13c1700eba6b371630e Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Feb 22 19:40:00 2019 +0100 Update to BIND 9.11.5-P4 Add also PGP signature as part of repository. diff --git a/.gitignore b/.gitignore index 854f798..858d487 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ bind-9.7.2b1.tar.gz /bind-9.11.5.tar.gz /bind-9.11.5-P1.tar.gz /config-19.tar.bz2 +/bind-9.11.5-P4.tar.gz diff --git a/bind-9.11.5-P4.tar.gz.asc b/bind-9.11.5-P4.tar.gz.asc new file mode 100644 index 0000000..d7b138e --- /dev/null +++ b/bind-9.11.5-P4.tar.gz.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABAgAdFiEEvg6XSLcYJToou4n/8bEb8FzwLlcFAlxks5sACgkQ8bEb8Fzw +Lld2iA//SfqtuHZGjTKVk35vLEjpK52Xs/rmawtTI1aMApk8jEXgD7yASa5dkgM1 +xRcU7H/8omkf16Oi1m1fdamnMYhW6AvbfX4hdRY9EDn3JepXGdO0ft9G2KzmvZBt +mU8bcqOfPHzEG0mu/oWMtL9eh9Edh5dFWxHkSGUnadXFTWH0NXRiyQwwmY6VexV4 +CQ7VkfP1fkuyZpq5tjyg9Z/umOmmwuwjkoaTbHxtfRLWVwMNgw24Pt6hUqjjJmCz +auDlBuGXKjBgRqRmAQR3klmcvNCna3+4e1+W9w/pgRxeEr9YD1JLVyhsAvLZ9FUc +Dpxz/MKfRkM71Lv3wvxrIODUrmSSecQ520lljxnNammnO0UuS6Og7LCpl6fSWm0c +y3A51mq25TJ1AyOlaiSU2TPYc5XJOMjyBqIqAvJei1cV/R2gMTjbYGz3rU+b9LlG +iRgdvAmUUhvBYAKXX7SmMUOFpXDiFv+Zbk0Gincok47VHihO4hksPx+RbL8BSOUJ +PGsQytwVnSQJTrDGuELyQYSGJzN8l8fMLKckNiRecNWFHCOQFpkdbtlYp+C4yopR +lGkx04ZVarlJBOPRkoN6mzZiXR17WaghHHXNq4gOP+HME6YAWJv3oLAAxeD8Tvyd +p4M4xCHw3WZt6OiKwgCE02wnthn3aUyRv+oOGYCL3+eTtoUzdNKJAjMEAAECAB0W +IQQVaJBoXqDfahNx7yAXzF2x8AiEBwUCXGSznAAKCRAXzF2x8AiEB3qgD/4qc2S3 +KcshK/BX10j75dmPVmNGdW1SH8V1h+nFKVIkvTzVXybBL3XeF7HP6/aJd460ku4n +XZ5FXd78f+g+G2gJaMA+rprS0NfpclhUS64SVTSDY727dnmV49xDdRIpqmUB7B1w +Nx9bLRHBxuPigE6S+Nmt78xrFmtS1cwegY2pz3ZD4HDDmtKMRuhZ9el71S7vLJyh +60pvFCqQMPJX7r0OXFC4iYwgIHab0iHQu4AASvaXzi03dR2S058aRk6gBMoBlQcL +Mcc/RzpHdJAKRx1bmU3h//HUAa5S6cKpRjDsFGj0GtFNY/ksdevTXTM3qB9k5GlR +T4mEadsWP3ARL9qQHyW4eStTdkH1qzgJF2tKn2M+dXlfdRXNImZPrEDXOfzmyRfA +ZoJLBeaJw5MaWeTtAcuPsppGDUuA9+hk9mpycmFZrxD21X4pr+NMrHa3TCFzAwgF +qyc96uX1SiFMRyUmLJY2ZMBR2y8W7TdL+MWjWzsGxQg8Dj3IaAbvRg1XztxDP9XB +RPYTniq7VOw4eEk3UgfjnIYfnEBQY+5d79MlSwxE4NBRg/h+ulZSHjP5HQ6BGzqu +aPg+p/P+G2GfQ5x0RxchG0B/Ogj2PRIwXptgwOXVoEs1671odj3aEE5E8JKquYlO +PRIIubc/EfYopZfyM2ryv2hAT+1z8ngeac1ycQ== +=kFOo +-----END PGP SIGNATURE----- diff --git a/bind.spec b/bind.spec index 5ca6e49..eafbae7 100644 --- a/bind.spec +++ b/bind.spec @@ -2,7 +2,7 @@ # Red Hat BIND package .spec file # -%global PATCHVER P1 +%global PATCHVER P4 #%%global PREVER rc1 %global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}} @@ -54,12 +54,13 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 12%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 13%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # Source: https://ftp.isc.org/isc/bind9/%{BINDVERSION}/bind-%{BINDVERSION}.tar.gz Source1: named.sysconfig +Source2: https://ftp.isc.org/isc/bind9/%{BINDVERSION}/bind-%{BINDVERSION}.tar.gz.asc Source3: named.logrotate Source7: bind-9.3.1rc1-sdb_tools-Makefile.in Source8: dnszone.schema @@ -1529,6 +1530,9 @@ fi; %changelog +* Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-13.P4 +- Update to 9.11.5-P4 + * Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-12.P1 - Enable DNSTAP support (#1564776) - Enable LMDB support for rndc addzone diff --git a/sources b/sources index e4f563b..8336c9d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bind-9.11.5-P1.tar.gz) = cf0e511342affc81fc89656417a6d74a8ee4c3ffcc242e3aad76864f34d8ff7b0b52ada422385b5becafb7ef3a81dddfb28ba1488c8bee168f16842e2c617069 +SHA512 (bind-9.11.5-P4.tar.gz) = ba750ffd080a47309db8be3df3d80896c5872aadb1a14ac7effd1bb783c2a2ae1e82959d6999eecc3d694336887060a84ae8813a17836b9064515cdd96fcb573 SHA512 (config-19.tar.bz2) = 36aa38a0c7c33267ae594b31c81681290ac58dde7ca6749bd599da531380b5b1428330813dbe983e01071ccaed83e83f6a9cd92179a53b7d0ccbb6851a0b017c commit d3fe8d6248ba08cb0c343f81f25d815bba173190 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Feb 22 19:19:59 2019 +0100 Enable json statistics format Statistics channel would include also json format, use URL http://localhost:80/v3/json/. XML format is still supported. diff --git a/bind.spec b/bind.spec index 211da6b..5ca6e49 100644 --- a/bind.spec +++ b/bind.spec @@ -16,8 +16,8 @@ # due to extensive changes to Makefiles %bcond_without PKCS11 %bcond_without DEVEL -%bcond_with JSON %bcond_without LMDB +%bcond_without JSON %bcond_without DNSTAP %bcond_with DLZ %bcond_without EXPORT_LIBS @@ -1532,6 +1532,7 @@ fi; * Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-12.P1 - Enable DNSTAP support (#1564776) - Enable LMDB support for rndc addzone +- Enable json format in statistics-channel * Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-11.P1 - Disable often failing unit test random_test commit ec6f94669ad65412d41dfefc0f43e8bec2da7994 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Feb 22 19:18:45 2019 +0100 Enable LMDB support Provides faster adding and removing of dynamically created zones runtime. Useful on higher number of zones used. diff --git a/bind.spec b/bind.spec index 3e41327..211da6b 100644 --- a/bind.spec +++ b/bind.spec @@ -16,8 +16,8 @@ # due to extensive changes to Makefiles %bcond_without PKCS11 %bcond_without DEVEL -%bcond_with LMDB %bcond_with JSON +%bcond_without LMDB %bcond_without DNSTAP %bcond_with DLZ %bcond_without EXPORT_LIBS @@ -1531,6 +1531,7 @@ fi; %changelog * Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-12.P1 - Enable DNSTAP support (#1564776) +- Enable LMDB support for rndc addzone * Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-11.P1 - Disable often failing unit test random_test commit f0b6f15ced5af5f309ccbfe35c6ec38ddca7b619 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Feb 22 19:14:36 2019 +0100 Enable DNSTAP (#1564776) Enable support for DNSTAP. It will introduce new linked libraries to bind and its tools, including bind-utils. diff --git a/bind.spec b/bind.spec index 4c81673..3e41327 100644 --- a/bind.spec +++ b/bind.spec @@ -18,7 +18,7 @@ %bcond_without DEVEL %bcond_with LMDB %bcond_with JSON -%bcond_with DNSTAP +%bcond_without DNSTAP %bcond_with DLZ %bcond_without EXPORT_LIBS %if 0%{?fedora} >= 17 @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 11%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 12%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -1529,6 +1529,9 @@ fi; %changelog +* Fri Feb 22 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-12.P1 +- Enable DNSTAP support (#1564776) + * Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-11.P1 - Disable often failing unit test random_test commit bd6e8b8965ba3f68f1034213b7d933423828e9a6 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Feb 22 16:39:54 2019 +0100 Fix spec usage of softhsm helper Output produced by helper is multiline starting with comment. Unless it is enclosed in quotes, it will be concatenated into single line. Fixes commit fa1631eef77a827e0df168df837e84c2d8790ce5 diff --git a/bind.spec b/bind.spec index 9165139..4c81673 100644 --- a/bind.spec +++ b/bind.spec @@ -805,7 +805,7 @@ sed -e '/^tp:.*-pkcs11/ d' -e '/^tp:\s*lwres/ d' \ %check %if %{with PKCS11} # Tests require initialization of pkcs11 token - eval $(bash %{SOURCE48} -A "`pwd`/softhsm-tokens") + eval "$(bash %{SOURCE48} -A "`pwd`/softhsm-tokens")" %endif %if %{with UNITTEST} diff --git a/setup-named-softhsm.sh b/setup-named-softhsm.sh index a13c91e..c0f8445 100755 --- a/setup-named-softhsm.sh +++ b/setup-named-softhsm.sh @@ -4,8 +4,9 @@ # in custom location. Is useful to store tokens in non-standard location. # # Output can be evaluated from bash, it will prepare it for usage of temporary tokens. +# Quotes around eval are mandatory! # Recommended use: -# eval $(bash setup-named-softhsm.sh -A) +# eval "$(bash setup-named-softhsm.sh -A)" # SOFTHSM2_CONF="$1" commit ad76423202011e1a254f57ac35160a17767adebd Author: Petr Menk <pemensik(a)redhat.com> Date: Thu Feb 21 22:50:12 2019 +0100 Disable random_test in unit tests It fails sometimes, but aborts whole build just because some fail. Keep it disabled until fixed. diff --git a/bind-9.11-unit-disable-random.patch b/bind-9.11-unit-disable-random.patch new file mode 100644 index 0000000..5658d12 --- /dev/null +++ b/bind-9.11-unit-disable-random.patch @@ -0,0 +1,45 @@ +From c89b0e288f923af69b97e8acc29250b262be7d1e Mon Sep 17 00:00:00 2001 +From: Petr Mensik <pemensik(a)redhat.com> +Date: Thu, 21 Feb 2019 22:42:27 +0100 +Subject: [PATCH] Disable random_test + +It fails too often on some architecture, failing the whole build along. +Because it runs two times for pkcs11 and normal build and any of +subtests can occasionally fail, stop it. + +It can be used again by defining 'unstable' variable in Kyuafile. +--- + lib/isc/tests/Atffile | 3 ++- + lib/isc/tests/Kyuafile | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/isc/tests/Atffile b/lib/isc/tests/Atffile +index 8681844..74a4a77 100644 +--- a/lib/isc/tests/Atffile ++++ b/lib/isc/tests/Atffile +@@ -20,7 +20,8 @@ tp: pool_test + tp: print_test + tp: queue_test + tp: radix_test +-tp: random_test ++# random test fails too often ++#tp: random_test + tp: regex_test + tp: result_test + tp: safe_test +diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile +index 1c510c1..a86824a 100644 +--- a/lib/isc/tests/Kyuafile ++++ b/lib/isc/tests/Kyuafile +@@ -19,7 +19,7 @@ atf_test_program{name='pool_test'} + atf_test_program{name='print_test'} + atf_test_program{name='queue_test'} + atf_test_program{name='radix_test'} +-atf_test_program{name='random_test'} ++atf_test_program{name='random_test', required_configs='unstable'} + atf_test_program{name='regex_test'} + atf_test_program{name='result_test'} + atf_test_program{name='safe_test'} +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index 5af1fc5..9165139 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 10%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 11%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -139,6 +139,8 @@ Patch165:bind-9.11-rh1647829.patch Patch166:bind-9.11-rh1647829-2.patch # https://gitlab.isc.org/isc-projects/bind9/issues/225 Patch167:bind-9.11-ed448-disable.patch +# random_test fails too often by random, disable it +Patch168:bind-9.11-unit-disable-random.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -519,6 +521,7 @@ are used for building ISC DHCP. %patch165 -p1 -b .rh1647829 %patch166 -p1 -b .rh1647829-2 %patch167 -p1 -b .noed448 +%patch168 -p1 -b .random_test-disable mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1526,6 +1529,9 @@ fi; %changelog +* Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-11.P1 +- Disable often failing unit test random_test + * Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-10.P1 - Disable autodetected eddsa algorithm ED448 commit c2772a07e8962b1fc25c24ae1597e7cdee284a06 Author: Petr Menk <pemensik(a)redhat.com> Date: Thu Feb 21 15:36:27 2019 +0100 Disable ED448 It is breaking dnssec system test. Its implementation in BIND is broken. diff --git a/bind-9.11-ed448-disable.patch b/bind-9.11-ed448-disable.patch new file mode 100644 index 0000000..179f32f --- /dev/null +++ b/bind-9.11-ed448-disable.patch @@ -0,0 +1,41 @@ +From e6bad0789c731f06de781997e33e864c71510ff2 Mon Sep 17 00:00:00 2001 +From: Petr Mensik <pemensik(a)redhat.com> +Date: Thu, 21 Feb 2019 12:36:17 +0100 +Subject: [PATCH] Disable autodetected ED448 algorithm support + +Implementation is broken in bind, disabled also in more recent versions. +Makes bin/tests/system/dnssec fail. +--- + configure.in | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index ca84ff3239..da4dd5f249 100644 +--- a/configure.in ++++ b/configure.in +@@ -1917,6 +1917,9 @@ int main() { + } + ], + [AC_MSG_RESULT(yes) ++ # ED448 support is broken in BIND ++ # https://gitlab.isc.org/isc-projects/bind9/issues/225 ++ # disable if autodetected, can be enabled by --with-eddsa=all + have_ed448="yes"], + [AC_MSG_RESULT(no) + have_ed448="no"], +@@ -1929,8 +1932,10 @@ int main() { + esac + case $have_ed448 in + yes) +- AC_DEFINE(HAVE_OPENSSL_ED448, 1, +- [Define if your OpenSSL version supports Ed448.]) ++ # ED448 support is broken in BIND ++ # https://gitlab.isc.org/isc-projects/bind9/issues/225 ++ # AC_DEFINE(HAVE_OPENSSL_ED448, 1, ++ # [Define if your OpenSSL version supports Ed448.]) + ;; + *) + ;; +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index f7ff9dc..5af1fc5 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 9%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 10%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ # @@ -137,6 +137,8 @@ Patch164:bind-9.11-rh1666814.patch Patch165:bind-9.11-rh1647829.patch # commit 8e1cc95c943b7dfaaaaf2d9a4971861735cc3fb2 Patch166:bind-9.11-rh1647829-2.patch +# https://gitlab.isc.org/isc-projects/bind9/issues/225 +Patch167:bind-9.11-ed448-disable.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -516,6 +518,7 @@ are used for building ISC DHCP. %patch164 -p1 -b .rh1666814 %patch165 -p1 -b .rh1647829 %patch166 -p1 -b .rh1647829-2 +%patch167 -p1 -b .noed448 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1523,6 +1526,9 @@ fi; %changelog +* Thu Feb 21 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-10.P1 +- Disable autodetected eddsa algorithm ED448 + * Thu Jan 31 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-9.P1 - dig prints ASCII name instead of failure (#1647829) - disable IDN output from scripts commit fa1631eef77a827e0df168df837e84c2d8790ce5 Author: Petr Menk <pemensik(a)redhat.com> Date: Wed Feb 20 18:53:13 2019 +0100 Simplify pkcs11 token generation Make default secure enough, no predefined pins are used. Generate pin and save it into file protected by unix rights. HSM tools will probably require it anyway. Use smart defaults. diff --git a/bind.spec b/bind.spec index cde769e..f7ff9dc 100644 --- a/bind.spec +++ b/bind.spec @@ -799,8 +799,7 @@ sed -e '/^tp:.*-pkcs11/ d' -e '/^tp:\s*lwres/ d' \ %check %if %{with PKCS11} # Tests require initialization of pkcs11 token - export SOFTHSM2_CONF="`pwd`/softhsm2.conf" - sh %{SOURCE48} "${SOFTHSM2_CONF}" "`pwd`/softhsm-tokens" + eval $(bash %{SOURCE48} -A "`pwd`/softhsm-tokens") %endif %if %{with UNITTEST} diff --git a/setup-named-softhsm.sh b/setup-named-softhsm.sh index 7ae0a6d..a13c91e 100755 --- a/setup-named-softhsm.sh +++ b/setup-named-softhsm.sh @@ -2,6 +2,11 @@ # # This script will initialise token storage of softhsm PKCS11 provider # in custom location. Is useful to store tokens in non-standard location. +# +# Output can be evaluated from bash, it will prepare it for usage of temporary tokens. +# Recommended use: +# eval $(bash setup-named-softhsm.sh -A) +# SOFTHSM2_CONF="$1" TOKENPATH="$2" @@ -10,14 +15,55 @@ GROUPNAME="$3" # This is intended for crypto accelerators using PKCS11 interface. # Uninitialized token would fail any crypto operation. PIN=1234 +SO_PIN=1234 +LABEL=rpm set -e +echo_i() +{ + echo "#" $@ +} + +random() +{ + if [ -x "$(which openssl 2>/dev/null)" ]; then + openssl rand -base64 $1 + else + dd if=/dev/urandom bs=1c count=$1 | base64 + fi +} + +usage() +{ + echo "Usage: $0 -A [token directory] [group]" + echo " or: $0 <config file> <token directory> [group]" +} + +if [ "$SOFTHSM2_CONF" = "-A" -a -z "$TOKENPATH" ]; then + TOKENPATH=$(mktemp -d /var/tmp/softhsm-XXXXXX) +fi + if [ -z "$SOFTHSM2_CONF" -o -z "$TOKENPATH" ]; then - echo "Usage: $0 <config file> <token directory> [group]" >&2 + usage >&2 exit 1 fi +if [ "$SOFTHSM2_CONF" = "-A" ]; then + # Automagic mode instead + MODE=secure + SOFTHSM2_CONF="$TOKENPATH/softhsm2.conf" + PIN_SOURCE="$TOKENPATH/pin" + SOPIN_SOURCE="$TOKENPATH/so-pin" + TOKENPATH="$TOKENPATH/tokens" +else + MODE=legacy +fi + +[ -d "$TOKENPATH" ] || mkdir -p "$TOKENPATH" + +umask 0022 + if ! [ -f "$SOFTHSM2_CONF" ]; then cat << SED > "$SOFTHSM2_CONF" # SoftHSM v2 configuration file @@ -32,19 +78,36 @@ log.level = ERROR slots.removable = false SED else - echo "Config file $SOFTHSM2_CONF already exists" >&2 + echo_i "Config file $SOFTHSM2_CONF already exists" >&2 fi -[ -d "$TOKENPATH" ] || mkdir -p "$TOKENPATH" +if [ -n "$PIN_SOURCE" ]; then + touch "$PIN_SOURCE" "$SOPIN_SOURCE" + chmod 0600 "$PIN_SOURCE" "$SOPIN_SOURCE" + if [ -n "$GROUPNAME" ]; then + chgrp "$GROUPNAME" "$PIN_SOURCE" "$SOPIN_SOURCE" + chmod g+r "$PIN_SOURCE" "$SOPIN_SOURCE" + fi +fi export SOFTHSM2_CONF if softhsm2-util --show-slots | grep 'Initialized:[[:space:]]*yes' > /dev/null then - echo "Token in ${TOKENPATH} is already initialized" >&2 + echo_i "Token in ${TOKENPATH} is already initialized" >&2 + + [ -f "$PIN_SOURCE" ] && PIN=$(cat "$PIN_SOURCE") + [ -f "$SOPIN_SOURCE" ] && SO_PIN=$(cat "$SOPIN_SOURCE") else - echo "Initializing tokens to ${TOKENPATH}..." - softhsm2-util --init-token --free --label rpm --pin $PIN --so-pin $PIN + PIN=$(random 6) + SO_PIN=$(random 18) + if [ -n "$PIN_SOURCE" ]; then + echo -n "$PIN" > "$PIN_SOURCE" + echo -n "$SO_PIN" > "$SOPIN_SOURCE" + fi + + echo_i "Initializing tokens to ${TOKENPATH}..." + softhsm2-util --init-token --free --label "$LABEL" --pin "$PIN" --so-pin "$SO_PIN" | sed -e 's/^/# /' if [ -n "$GROUPNAME" ]; then chgrp -R -- "$GROUPNAME" "$TOKENPATH" @@ -53,3 +116,8 @@ else fi echo "export SOFTHSM2_CONF=\"$SOFTHSM2_CONF\"" +echo "export PIN_SOURCE=\"$PIN_SOURCE\"" +echo "export SOPIN_SOURCE=\"$SOPIN_SOURCE\"" +# These are intentionaly not exported +echo "PIN=\"$PIN\"" +echo "SO_PIN=\"$SO_PIN\"" commit 6fee3d63e97cc86062b9fedb5d9294455cf522b6 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Feb 15 19:49:27 2019 +0100 Remove revoked KSK 19164 from trusted root keys diff --git a/.gitignore b/.gitignore index eb450f2..854f798 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ bind-9.7.2b1.tar.gz /bind-9.11.4-P2.tar.gz /bind-9.11.5.tar.gz /bind-9.11.5-P1.tar.gz +/config-19.tar.bz2 diff --git a/bind.spec b/bind.spec index 82b6312..cde769e 100644 --- a/bind.spec +++ b/bind.spec @@ -66,7 +66,7 @@ Source8: dnszone.schema Source12: README.sdb_pgsql Source25: named.conf.sample Source26: named.conf -Source28: config-18.tar.bz2 +Source28: config-19.tar.bz2 Source30: ldap2zone.c Source31: ldap2zone.1 Source32: named-sdb.8 @@ -1528,6 +1528,7 @@ fi; - dig prints ASCII name instead of failure (#1647829) - disable IDN output from scripts - Update project URL +- Removed revoked KSK 19164 from trusted keys * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 32:9.11.5-8.P1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 37dc9dc..e4f563b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (bind-9.11.5-P1.tar.gz) = cf0e511342affc81fc89656417a6d74a8ee4c3ffcc242e3aad76864f34d8ff7b0b52ada422385b5becafb7ef3a81dddfb28ba1488c8bee168f16842e2c617069 -SHA512 (config-18.tar.bz2) = c0a0a1fd58a7e2c09fe69915b9a4c682d1b6c96e78583f63ce5355f663c9509d28facfd3aa078b228b69954d0af4bfa484ef661a9568aaafe6eade97dda3c3d9 +SHA512 (config-19.tar.bz2) = 36aa38a0c7c33267ae594b31c81681290ac58dde7ca6749bd599da531380b5b1428330813dbe983e01071ccaed83e83f6a9cd92179a53b7d0ccbb6851a0b017c diff --git a/trusted-key.key b/trusted-key.key index df2fd0d..7b845f3 100644 --- a/trusted-key.key +++ b/trusted-key.key @@ -1,2 +1 @@ -. 3600 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= . 3600 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= commit 6ecd16d4585bafcc4fae224c16d6d0f059955492 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Feb 15 10:10:44 2019 +0100 Update project URL diff --git a/bind.spec b/bind.spec index 35e9c5c..82b6312 100644 --- a/bind.spec +++ b/bind.spec @@ -56,7 +56,7 @@ License: MPLv2.0 Version: 9.11.5 Release: 9%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 -Url: http://www.isc.org/products/BIND/ +Url: https://www.isc.org/downloads/bind/ # Source: https://ftp.isc.org/isc/bind9/%{BINDVERSION}/bind-%{BINDVERSION}.tar.gz Source1: named.sysconfig @@ -1527,6 +1527,7 @@ fi; * Thu Jan 31 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-9.P1 - dig prints ASCII name instead of failure (#1647829) - disable IDN output from scripts +- Update project URL * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 32:9.11.5-8.P1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild commit 1da60a891af5ae99154986131505ff4233c61d88 Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Feb 12 22:09:48 2019 +0100 More fixes to compile DLZ diff --git a/bind.spec b/bind.spec index 0b3f47a..35e9c5c 100644 --- a/bind.spec +++ b/bind.spec @@ -641,6 +641,9 @@ export LIBDIR_SUFFIX --with-dlz-filesystem=yes \ --with-dlz-bdb=yes \ %endif +%if %{with DLZ} + --with-dlz-bdb=yes \ +%endif %if %{with GSSTSIG} --with-gssapi=yes \ --disable-isc-spnego \ @@ -941,9 +944,10 @@ install -m 644 %{SOURCE12} contrib/sdb/pgsql/ %endif %if %{with DLZ} + pushd build pushd contrib/dlz pushd bin/dlzbdb - make DESTDIR=${RPM_BUILD_ROOT} install + make DESTDIR=${RPM_BUILD_ROOT} install popd pushd modules for DIR in bdbhpt filesystem ldap mysql mysqldyn sqlite3; do @@ -952,6 +956,7 @@ install -m 644 %{SOURCE12} contrib/sdb/pgsql/ mv mysqldyn/testing/README mysqldyn/testing/README.testing popd popd + popd %endif # Install isc/errno2result.h header commit de8fa0799a58ae497abd3327f2c4c13e32cb7674 Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Feb 12 20:45:49 2019 +0100 Improve descriptions for DLZ plugins diff --git a/bind.spec b/bind.spec index 4cf4e14..0b3f47a 100644 --- a/bind.spec +++ b/bind.spec @@ -404,42 +404,42 @@ Summary: BIND server bdb DLZ module Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} %description dlz-bdb -Dynamic Loadable Zones module for BIND server. +Dynamic Loadable Zones Berkeley DB module for BIND server. %package dlz-filesystem Summary: BIND server filesystem DLZ module Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} %description dlz-filesystem -Dynamic Loadable Zones module for BIND server. +Dynamic Loadable Zones filesystem module for BIND server. %package dlz-ldap Summary: BIND server ldap DLZ module Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} %description dlz-ldap -Dynamic Loadable Zones module for BIND server. +Dynamic Loadable Zones LDAP module for BIND server. %package dlz-mysql Summary: BIND server mysql DLZ module Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} %description dlz-mysql -Dynamic Loadable Zones module for BIND server. +Dynamic Loadable Zones MySQL module for BIND server. %package dlz-mysqldyn Summary: BIND server mysqldyn DLZ module Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} %description dlz-mysqldyn -Dynamic Loadable Zones module for BIND server. +BIND 9 DLZ MySQL module with support for dynamic DNS (DDNS) %package dlz-sqlite3 Summary: BIND server sqlite3 DLZ module Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} %description dlz-sqlite3 -Dynamic Loadable Zones module for BIND server. +Dynamic Loadable Zones sqlite3 module for BIND server. %endif @@ -1489,6 +1489,7 @@ fi; %{_sbindir}/dlzbdb %{_libdir}/bind/dlz_bdbhpt_dynamic.so %doc contrib/dlz/modules/bdbhpt/testing/* +%doc contrib/dlz/modules/bdbhpt/README* %files dlz-filesystem %{_libdir}/bind/dlz_filesystem_dynamic.so @@ -1500,7 +1501,7 @@ fi; %files dlz-mysqldyn %{_libdir}/bind/dlz_mysqldyn_mod.so %doc contrib/dlz/modules/mysqldyn/testing/* -%doc contrib/dlz/modules/mysqldyn/README +%doc contrib/dlz/modules/mysqldyn/README* %files dlz-ldap %{_libdir}/bind/dlz_ldap_dynamic.so commit 7a958a2a9f9461e4d789cf15fd0bfac005a8e491 Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Jan 29 19:54:36 2019 +0100 Disable dig IDN output into scripts Dig could be used to receive zone via AXFR. If IDN data are inside and are decoded, it cannot be used as named zone file. Disable +idnout if stdin is not a tty. diff --git a/bind-9.11-rh1647829-2.patch b/bind-9.11-rh1647829-2.patch new file mode 100644 index 0000000..bb8b3e9 --- /dev/null +++ b/bind-9.11-rh1647829-2.patch @@ -0,0 +1,28 @@ +From 58e1af6ca75d035b6391708be2c2272bb8d04620 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej(a)sury.org> +Date: Sun, 4 Nov 2018 02:20:41 +0700 +Subject: [PATCH] Enable IDN processing (both idnin and idnout) only on tty, + disable it when the stdout is not a tty + +(cherry picked from commit 0e1bf7d017e4f6d787cbeb72cc2aa74e7f30122e) +(cherry picked from commit 8e1cc95c943b7dfaaaaf2d9a4971861735cc3fb2) +--- + bin/dig/dighost.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c +index 74791d671e..3b722ba0ff 100644 +--- a/bin/dig/dighost.c ++++ b/bin/dig/dighost.c +@@ -825,7 +825,7 @@ make_empty_lookup(void) { + looknew->seenbadcookie = false; + looknew->badcookie = true; + #ifdef WITH_IDN_SUPPORT +- looknew->idnin = (getenv("IDN_DISABLE") == NULL); ++ looknew->idnin = isatty(1)?(getenv("IDN_DISABLE") == NULL):false; + if (looknew->idnin) { + const char *charset = getenv("CHARSET"); + if (charset && !strcmp(charset, "ASCII")) +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index a3023ea..4cf4e14 100644 --- a/bind.spec +++ b/bind.spec @@ -135,6 +135,8 @@ Patch163:bind-9.11-rh1663318.patch Patch164:bind-9.11-rh1666814.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1647829 Patch165:bind-9.11-rh1647829.patch +# commit 8e1cc95c943b7dfaaaaf2d9a4971861735cc3fb2 +Patch166:bind-9.11-rh1647829-2.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -513,6 +515,7 @@ are used for building ISC DHCP. %patch163 -p1 -b .rh1663318 %patch164 -p1 -b .rh1666814 %patch165 -p1 -b .rh1647829 +%patch166 -p1 -b .rh1647829-2 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1517,6 +1520,8 @@ fi; %changelog * Thu Jan 31 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-9.P1 - dig prints ASCII name instead of failure (#1647829) +- disable IDN output from scripts + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 32:9.11.5-8.P1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild commit a699858667627bb95545c41fca123366a9c4e7ce Author: Petr Menk <pemensik(a)redhat.com> Date: Tue Jan 29 19:41:22 2019 +0100 dig prints ASCII name instead of failure (#1647829) diff --git a/bind-9.11-rh1647829.patch b/bind-9.11-rh1647829.patch new file mode 100644 index 0000000..ceec7fc --- /dev/null +++ b/bind-9.11-rh1647829.patch @@ -0,0 +1,86 @@ +From 2eca7f5fa97a24997e4d8f900460ba43ae167e97 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> +Date: Tue, 29 Jan 2019 18:07:44 +0100 +Subject: [PATCH] Fallback to ASCII on output IDN conversion error + +It is possible dig used ACE encoded name in locale, which does not +support converting it to unicode. Instead of fatal error, fallback to +ACE name on output. + +(cherry picked from commit 7f4cb8f9584597fea16de6557124ac8b1bd47440) + +Modify idna test to fallback to ACE + +Test valid A-label on input would be displayed as A-label on output if +locale does not allow U-label. + +(cherry picked from commit 4ce232f8605bdbe0594ebe5a71383c9d4e6f263b) + +Emit warning on IDN output failure + +Warning is emitted before any dig headers. + +(cherry picked from commit 4b410038c531fbb902cd5fb83174eed1f06cb7d7) +--- + bin/dig/dighost.c | 15 +++++++++++++-- + bin/tests/system/idna/tests.sh | 17 +++++++++++++++++ + 2 files changed, 30 insertions(+), 2 deletions(-) + +diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c +index bb8702c..d7cfc33 100644 +--- a/bin/dig/dighost.c ++++ b/bin/dig/dighost.c +@@ -4860,9 +4860,20 @@ idn_ace_to_locale(const char *from, char *to, size_t tolen) { + */ + res = idn2_to_unicode_8zlz(utf8_src, &tmp_str, 0); + if (res != IDN2_OK) { +- fatal("Cannot represent '%s' in the current locale (%s), " +- "use +noidnout or a different locale", ++ static bool warned = false; ++ ++ res = idn2_to_ascii_8z(utf8_src, &tmp_str, 0); ++ if (res != IDN2_OK) { ++ fatal("Cannot represent '%s' " ++ "in the current locale nor ascii (%s), " ++ "use +noidnout or a different locale", + from, idn2_strerror(res)); ++ } else if (!warned) { ++ fprintf(stderr, ";; Warning: cannot represent '%s' " ++ "in the current locale", ++ tmp_str); ++ warned = true; ++ } + } + + /* +diff --git a/bin/tests/system/idna/tests.sh b/bin/tests/system/idna/tests.sh +index 6637bf6..215a9d5 100644 +--- a/bin/tests/system/idna/tests.sh ++++ b/bin/tests/system/idna/tests.sh +@@ -244,6 +244,23 @@ idna_enabled_test() { + idna_test "$text" "+idnin +noidnout" "xn--nxasmq6b.com" "xn--nxasmq6b.com." + idna_test "$text" "+idnin +idnout" "xn--nxasmq6b.com" ".com." + ++ # Test of valid A-label in locale that cannot display it ++ # ++ # +noidnout: The string is sent as-is to the server and the returned qname ++ # is displayed in the same form. ++ # +idnout: The string is sent as-is to the server and the returned qname ++ # is displayed as the corresponding A-label. ++ # ++ # The "+[no]idnout" flag has no effect in these cases. ++ text="Checking valid A-label in C locale" ++ label="xn--nxasmq6b.com" ++ LC_ALL=C idna_test "$text" "" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+noidnin +noidnout" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+noidnin +idnout" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+idnin +noidnout" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+idnin +idnout" "$label" "$label." ++ LC_ALL=C idna_test "$text" "+noidnin +idnout" "$label" "$label." ++ + + + # Tests of invalid A-labels +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index 7a11ebb..a3023ea 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 8%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 9%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ # @@ -133,6 +133,8 @@ Patch162:bind-9.11-unit-dnstap-pkcs11.patch Patch163:bind-9.11-rh1663318.patch # https://gitlab.isc.org/isc-projects/bind9/issues/819 Patch164:bind-9.11-rh1666814.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1647829 +Patch165:bind-9.11-rh1647829.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -510,6 +512,7 @@ are used for building ISC DHCP. %patch162 -p1 -b .dnstap-pkcs11 %patch163 -p1 -b .rh1663318 %patch164 -p1 -b .rh1666814 +%patch165 -p1 -b .rh1647829 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1512,6 +1515,8 @@ fi; %changelog +* Thu Jan 31 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-9.P1 +- dig prints ASCII name instead of failure (#1647829) * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 32:9.11.5-8.P1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild commit 432a81aeff2c5a01a5ccd78e553d20aeca1376b5 Author: Petr Menk <pemensik(a)redhat.com> Date: Wed Feb 6 18:38:12 2019 +0100 Fix DLZ in oot builds DLZ has no VPATH support. Just make duplicates in build directory diff --git a/bind.spec b/bind.spec index c2bbf99..7a11ebb 100644 --- a/bind.spec +++ b/bind.spec @@ -599,6 +599,13 @@ version libtoolize -c -f; aclocal -I libtool.m4 --force; autoconf -f mkdir build + +%if %{with DLZ} +# DLZ modules do not support oot builds. Copy files into build +mkdir -p build/contrib/dlz +cp -frp contrib/dlz/modules build/contrib/dlz/modules +%endif + pushd build LIBDIR_SUFFIX= export LIBDIR_SUFFIX commit 9a4b768e181047ed5934cb199f19b6412fdee6b4 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jan 31 14:36:55 2019 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/bind.spec b/bind.spec index 66a0d39..c2bbf99 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 7%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 8%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ # @@ -1505,6 +1505,9 @@ fi; %changelog +* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 32:9.11.5-8.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Jan 27 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-7.P1 - Update to 9.11.5-P1 commit b2a708808a89b215ffaf2133e711a25a4fe4d13c Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> Date: Tue Jan 29 05:45:26 2019 +0100 Remove unneeded %clean section It is the behavior since EPEL5. Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> diff --git a/bind.spec b/bind.spec index bc2c940..66a0d39 100644 --- a/bind.spec +++ b/bind.spec @@ -1171,10 +1171,6 @@ fi; %endif -%clean -rm -rf ${RPM_BUILD_ROOT} -:; - %files %{_libdir}/bind %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named commit 13f8f23ec518ca7ecd2bb2c9ed231955c670079b Author: Petr Menk <pemensik(a)redhat.com> Date: Mon Jan 28 00:47:11 2019 +0100 Update to 9.11.5-P1 diff --git a/.gitignore b/.gitignore index f656e89..eb450f2 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ bind-9.7.2b1.tar.gz /bind-9.11.4-P1.tar.gz /bind-9.11.4-P2.tar.gz /bind-9.11.5.tar.gz +/bind-9.11.5-P1.tar.gz diff --git a/bind.spec b/bind.spec index 5b2f349..bc2c940 100644 --- a/bind.spec +++ b/bind.spec @@ -2,7 +2,7 @@ # Red Hat BIND package .spec file # -#%%global PATCHVER P2 +%global PATCHVER P1 #%%global PREVER rc1 %global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}} @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 6%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 7%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ # @@ -1509,6 +1509,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Sun Jan 27 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-7.P1 +- Update to 9.11.5-P1 + * Wed Jan 23 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-6 - Reenable crypto rand for DHCP, disable just entropy check (#1663318) diff --git a/sources b/sources index f7e1978..37dc9dc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bind-9.11.5.tar.gz) = 7e34c8033dabaed232479b1dc2849d1247c0137bcb2b63f08f8f72ff2cca0f73e0f05d0b9b8959f8c4db8ee36a700af30fe869be186c7bab7c81a25843384b8d +SHA512 (bind-9.11.5-P1.tar.gz) = cf0e511342affc81fc89656417a6d74a8ee4c3ffcc242e3aad76864f34d8ff7b0b52ada422385b5becafb7ef3a81dddfb28ba1488c8bee168f16842e2c617069 SHA512 (config-18.tar.bz2) = c0a0a1fd58a7e2c09fe69915b9a4c682d1b6c96e78583f63ce5355f663c9509d28facfd3aa078b228b69954d0af4bfa484ef661a9568aaafe6eade97dda3c3d9 commit 32d91f12ca83ef8ec46df091fc0fe72cd05f91d9 Author: Petr Menk <pemensik(a)redhat.com> Date: Wed Jan 23 21:15:03 2019 +0100 Made RAND_status check optional (broke --disable-crypto-rand) Unlike upstream, skip it also for DHCP. Disable RAND_status also in non-threaded builds. DHCP is built without threads and should not check RAND_status on dns library initialization. Lack of entropy is possible state for dhclient, but it must not fail even in this case. Because DHCP itself does not require custom random generator, leave default RAND_OpenSSL configured. It should help TLS connection to LDAP in single DHCP binary, while keeping secure random data if needed. Resolves: #1663318 (modified upstream commit 8a98277811ea50035ff37b744fa3dc5b75bee099) diff --git a/bind-9.11-rh1663318.patch b/bind-9.11-rh1663318.patch index 79487b0..1af7efb 100644 --- a/bind-9.11-rh1663318.patch +++ b/bind-9.11-rh1663318.patch @@ -1,21 +1,37 @@ -From 48d86dd3d834bcedd0c977d193c36b12e8398b4e Mon Sep 17 00:00:00 2001 -From: Francis Dupont <fdupont(a)isc.org> -Date: Sun, 17 Sep 2017 12:02:09 +0200 +From b16a1ff25644bb075f454afe68ee63f6f385ca9c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> +Date: Wed, 23 Jan 2019 21:11:07 +0100 Subject: [PATCH] Made RAND_status check optional (broke --disable-crypto-rand) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Unlike upstream, skip it also for DHCP. + +Disable RAND_status also in non-threaded builds. DHCP is built without +threads and should not check RAND_status on dns library initialization. +Lack of entropy is possible state for dhclient, but it must not fail +even in this case. Because DHCP itself does not require custom random +generator, leave default RAND_OpenSSL configured. It should help TLS +connection to LDAP in single DHCP binary, while keeping secure random +data if needed. + +(modified upstream commit 8a98277811ea50035ff37b744fa3dc5b75bee099) + +Signed-off-by: Petr Menk <pemensik(a)redhat.com> --- lib/dns/openssl_link.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c -index 91e87d0..3cddaa9 100644 +index 7a233dd..941eb17 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -289,6 +289,7 @@ dst__openssl_init(const char *engine) { #endif #endif /* !defined(OPENSSL_NO_ENGINE) */ -+#ifdef ISC_PLATFORM_CRYPTORANDOM ++#if defined(ISC_PLATFORM_CRYPTORANDOM) && defined(ISC_PLATFORM_USETHREADS) /* Protect ourselves against unseeded PRNG */ if (RAND_status() != 1) { FATAL_ERROR(__FILE__, __LINE__, diff --git a/bind.spec b/bind.spec index 421da0d..5b2f349 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 5%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 6%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ # @@ -736,7 +736,6 @@ export LIBDIR_SUFFIX --without-libjson \ --without-zlib \ --without-dlopen \ - --disable-crypto-rand \ --enable-full-report ## We don't want to build other libs than -export twice @@ -1510,6 +1509,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Jan 23 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-6 +- Reenable crypto rand for DHCP, disable just entropy check (#1663318) + * Thu Jan 17 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-5 - Move dnssec related tools from bind-utils to bind-dnssec-utils (#1649398) commit 219b0e889f74ed22e0fa512d501eeba3355a11bf Author: Petr Menk <pemensik(a)redhat.com> Date: Thu Jan 17 13:51:29 2019 +0100 Remove conditional patch for alpha and ia64 It emits warning just because architectures no longer supported diff --git a/bind.spec b/bind.spec index 6293ab4..421da0d 100644 --- a/bind.spec +++ b/bind.spec @@ -489,9 +489,7 @@ are used for building ISC DHCP. # Common patches %patch10 -p1 -b .PIE %patch16 -p1 -b .redhat_doc -%ifnarch alpha ia64 %patch72 -p1 -b .64bit -%endif %patch102 -p1 -b .rh452060 %patch106 -p1 -b .rh490837 %patch109 -p1 -b .rh478718 commit 2830e00b88ea8bb956e0cdeb6f205fc72741b167 Author: Petr Menk <pemensik(a)redhat.com> Date: Thu Jan 17 13:07:46 2019 +0100 Move dnssec related tools to bind-dnssec-utils Most often clients require just dig or host to lookup addresses. Move dnssec and zone file into dedicated subpackage. For a limited time, make bind-utils suggest bind-dnssec-utils, until all dependencies are resolved. (#1649398) diff --git a/bind.spec b/bind.spec index a6357de..6293ab4 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 4%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 5%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ # @@ -159,6 +159,7 @@ Provides: dnssec-conf = 1.27-2 Requires(post): policycoreutils-python-utils Requires(post): libselinux-utils Requires(post): selinux-policy +Recommends: bind-utils bind-dnssec-utils BuildRequires: gcc, make BuildRequires: openssl-devel, libtool, autoconf, pkgconfig, libcap-devel BuildRequires: libidn2-devel, libxml2-devel, GeoIP-devel @@ -299,9 +300,14 @@ Contains license of the BIND DNS suite. %package utils Summary: Utilities for querying DNS name servers -Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: bind-libs-lite%{?_isa} = %{epoch}:%{version}-%{release} -Requires: python3-bind = %{epoch}:%{version}-%{release} +Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} +# TODO: this is just temporary workaround until all packages depending on +# bind-utils can be satisfied without dnssec-utils +# It will be removed after some time, or changed to Recommends +Suggests: bind-dnssec-utils +# For compatibility with Debian package +Provides: dnsutils = %{epoch}:%{version}-%{release} %description utils Bind-utils contains a collection of utilities for querying DNS (Domain @@ -313,6 +319,20 @@ network addresses. You should install bind-utils if you need to get information from DNS name servers. +%package dnssec-utils +Summary: Utilities for DNSSEC keys and DNS zone files management +Requires: bind-libs-lite%{?_isa} = %{epoch}:%{version}-%{release} +Recommends: bind-utils +Requires: python3-bind = %{epoch}:%{version}-%{release} + +%description dnssec-utils +Bind-dnssec-utils contains a collection of utilities for editing +DNSSEC keys and BIND zone files. These tools provide generation, +revocation and verification of keys and DNSSEC signatures in zone files. + +You should install bind-dnssec-utils if you need to sign a DNS zone +or maintain keys for it. + %if %{with DEVEL} %package devel Summary: Header files and libraries needed for BIND DNS development @@ -1254,6 +1274,19 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/nslookup %{_bindir}/nsupdate %{_bindir}/arpaname +%if %{with DNSTAP} +%{_bindir}/dnstap-read +%{_mandir}/man1/dnstap-read.1* +%endif +%{_mandir}/man1/host.1* +%{_mandir}/man1/nsupdate.1* +%{_mandir}/man1/dig.1* +%{_mandir}/man1/delv.1* +%{_mandir}/man1/nslookup.1* +%{_mandir}/man1/arpaname.1* +%{_sysconfdir}/trusted-key.key + +%files dnssec-utils %{_sbindir}/ddns-confgen %{_sbindir}/tsig-keygen %{_sbindir}/genrandom @@ -1268,16 +1301,6 @@ rm -rf ${RPM_BUILD_ROOT} %if %{with LMDB} %{_sbindir}/named-nzd2nzf %endif -%if %{with DNSTAP} -%{_bindir}/dnstap-read -%{_mandir}/man1/dnstap-read.1* -%endif -%{_mandir}/man1/host.1* -%{_mandir}/man1/nsupdate.1* -%{_mandir}/man1/dig.1* -%{_mandir}/man1/delv.1* -%{_mandir}/man1/nslookup.1* -%{_mandir}/man1/arpaname.1* %{_mandir}/man8/ddns-confgen.8* %{_mandir}/man8/tsig-keygen.8* %{_mandir}/man8/genrandom.8* @@ -1292,7 +1315,6 @@ rm -rf ${RPM_BUILD_ROOT} %if %{with LMDB} %{_mandir}/man8/named-nzd2nzf.8* %endif -%{_sysconfdir}/trusted-key.key %if %{with DEVEL} %files devel @@ -1490,6 +1512,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Jan 17 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-5 +- Move dnssec related tools from bind-utils to bind-dnssec-utils (#1649398) + * Wed Jan 16 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-4 - Reject invalid binary file (#1666814) commit 685f10cbfd1120c865ff7d3e4ce3923998fe2286 Author: Petr Menk <pemensik(a)redhat.com> Date: Wed Jan 16 17:08:53 2019 +0100 Reject invalid rbt file if header is corrupted Resolves: rhbz#1666814 diff --git a/bind-9.11-rh1666814.patch b/bind-9.11-rh1666814.patch new file mode 100644 index 0000000..ea1df5d --- /dev/null +++ b/bind-9.11-rh1666814.patch @@ -0,0 +1,37 @@ +From 3bb29f45604ac6890f4ea5cdcbd1a62e6dad14a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> +Date: Wed, 16 Jan 2019 16:27:33 +0100 +Subject: [PATCH 2/2] Fix possible crash when loading corrupted file + +Some values passes internal triggers by coincidence. Fix the check and +check also first_node_offset before even passing it further. +--- + lib/dns/rbt.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c +index 62d0826..b029b7d 100644 +--- a/lib/dns/rbt.c ++++ b/lib/dns/rbt.c +@@ -787,7 +787,7 @@ treefix(dns_rbt_t *rbt, void *base, size_t filesize, dns_rbtnode_t *n, + return (ISC_R_SUCCESS); + + CONFIRM((void *) n >= base); +- CONFIRM((char *) n - (char *) base <= (int) nodemax); ++ CONFIRM((size_t)((char *) n - (char *) base) <= nodemax); + CONFIRM(DNS_RBTNODE_VALID(n)); + + dns_name_init(&nodename, NULL); +@@ -939,7 +939,8 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize, + rbt->root = (dns_rbtnode_t *)((char *)base_address + + header_offset + header->first_node_offset); + +- if ((header->nodecount * sizeof(dns_rbtnode_t)) > filesize) { ++ if ((header->nodecount * sizeof(dns_rbtnode_t)) > filesize ++ || header->first_node_offset > filesize) { + result = ISC_R_INVALIDFILE; + goto cleanup; + } +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index f0c5d10..a6357de 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 4%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ # @@ -131,6 +131,8 @@ Patch161:bind-9.11-host-idn-disable.patch Patch162:bind-9.11-unit-dnstap-pkcs11.patch # https://gitlab.isc.org/isc-projects/bind9/commit/8a98277811e Patch163:bind-9.11-rh1663318.patch +# https://gitlab.isc.org/isc-projects/bind9/issues/819 +Patch164:bind-9.11-rh1666814.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -489,6 +491,7 @@ are used for building ISC DHCP. %patch161 -p1 -b .host-idn-disable %patch162 -p1 -b .dnstap-pkcs11 %patch163 -p1 -b .rh1663318 +%patch164 -p1 -b .rh1666814 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -1487,6 +1490,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Jan 16 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-4 +- Reject invalid binary file (#1666814) + * Mon Jan 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-3 - Disable crypto rand for DHCP (#1663318) commit 67a5cd83ffa71f67f58648e6f6c5cbb1c7ab3fa7 Author: Petr Menk <pemensik(a)redhat.com> Date: Mon Jan 14 18:51:53 2019 +0100 Made RAND_status check optional (broke --disable-crypto-rand) dhclient can terminate if not enough entropy, but it never requires random data. On a new virtual machine, lack of entropy can be common. Ensure it does not prevent DHCP client assigning an IP address. diff --git a/bind-9.11-rh1663318.patch b/bind-9.11-rh1663318.patch new file mode 100644 index 0000000..79487b0 --- /dev/null +++ b/bind-9.11-rh1663318.patch @@ -0,0 +1,32 @@ +From 48d86dd3d834bcedd0c977d193c36b12e8398b4e Mon Sep 17 00:00:00 2001 +From: Francis Dupont <fdupont(a)isc.org> +Date: Sun, 17 Sep 2017 12:02:09 +0200 +Subject: [PATCH] Made RAND_status check optional (broke --disable-crypto-rand) + +--- + lib/dns/openssl_link.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c +index 91e87d0..3cddaa9 100644 +--- a/lib/dns/openssl_link.c ++++ b/lib/dns/openssl_link.c +@@ -289,6 +289,7 @@ dst__openssl_init(const char *engine) { + #endif + #endif /* !defined(OPENSSL_NO_ENGINE) */ + ++#ifdef ISC_PLATFORM_CRYPTORANDOM + /* Protect ourselves against unseeded PRNG */ + if (RAND_status() != 1) { + FATAL_ERROR(__FILE__, __LINE__, +@@ -296,6 +297,7 @@ dst__openssl_init(const char *engine) { + "cannot be initialized (see the `PRNG not " + "seeded' message in the OpenSSL FAQ)"); + } ++#endif + + return (ISC_R_SUCCESS); + +-- +2.20.1 + diff --git a/bind.spec b/bind.spec index 110b520..f0c5d10 100644 --- a/bind.spec +++ b/bind.spec @@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ # @@ -129,6 +129,8 @@ Patch160:bind-9.11-rh1624100.patch Patch161:bind-9.11-host-idn-disable.patch # https://gitlab.isc.org/isc-projects/bind9/issues/624 Patch162:bind-9.11-unit-dnstap-pkcs11.patch +# https://gitlab.isc.org/isc-projects/bind9/commit/8a98277811e +Patch163:bind-9.11-rh1663318.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -486,6 +488,7 @@ are used for building ISC DHCP. %patch160 -p1 -b .rh1624100 %patch161 -p1 -b .host-idn-disable %patch162 -p1 -b .dnstap-pkcs11 +%patch163 -p1 -b .rh1663318 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -712,6 +715,7 @@ export LIBDIR_SUFFIX --without-libjson \ --without-zlib \ --without-dlopen \ + --disable-crypto-rand \ --enable-full-report ## We don't want to build other libs than -export twice @@ -1483,6 +1487,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jan 14 2019 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-3 +- Disable crypto rand for DHCP (#1663318) + * Thu Oct 25 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-2 - Add optional support for JSON statistics - Add optional DNSTAP support (#1564776), new dnstap-read tool commit a1558710fbf2b46acfaab42af347805cf678b340 Author: Adam Williamson <awilliam(a)redhat.com> Date: Fri Jan 11 23:35:03 2019 -0800 Correct a backport inconsistency in bind-9.11-rt46047.patch The patch seems to have been generated from a more recent bind tree in which `ns_g_lctx` was renamed `named_g_lctx`. So the patch uses the `named_g_lctx` name, but the rest of server.c in bind-9.11 still uses the name `ns_g_lctx`, so if you compile with --disable-crypto-rand, the build actually fails with an undeclared name error. diff --git a/bind-9.11-rt46047.patch b/bind-9.11-rt46047.patch index 5030c06..3cb3c0f 100644 --- a/bind-9.11-rt46047.patch +++ b/bind-9.11-rt46047.patch @@ -299,7 +299,7 @@ index 9258e7f..f4320df 100644 - randomdev); + if ((obj != NULL) && !cfg_obj_isvoid(obj)) + level = ISC_LOG_INFO; -+ isc_log_write(named_g_lctx, NS_LOGCATEGORY_GENERAL, ++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, + NS_LOGMODULE_SERVER, level, + "no source of entropy found"); + if ((obj == NULL) || cfg_obj_isvoid(obj)) { commit ae36af4c9fd8189ea9925222f6e9902239f61af3 Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Oct 19 17:41:16 2018 +0200 Add support for DNSTAP Not enabled by default yet. Enables dumping of dns traffic. Fix DNSTAP issues in build and unit tests. Fool rpmlint to accept dnstap relative path. Rpmlint emited error hardcoded-library-path on dnstap path. It is not system-wide library, workaround by using variable. Add dnstap-read utility to utils. When dnstap is enabled, dnstap-read will be part of utils. Disadvantage is all utilities would have dependency on protobuf library, including host and dig. Resolves: #1564776 diff --git a/bind-9.11-unit-dnstap-pkcs11.patch b/bind-9.11-unit-dnstap-pkcs11.patch new file mode 100644 index 0000000..8620e9f --- /dev/null +++ b/bind-9.11-unit-dnstap-pkcs11.patch @@ -0,0 +1,24 @@ +diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c +index 56e3da4..1f31542 100644 +--- a/lib/dns/tests/dnstap_test.c ++++ b/lib/dns/tests/dnstap_test.c +@@ -297,6 +297,9 @@ ATF_TC_BODY(totext, tc) { + + UNUSED(tc); + ++ /* make sure text conversion gets the right local time */ ++ setenv("TZ", "PST8", 1); ++ + result = dns_test_begin(NULL, true); + ATF_REQUIRE(result == ISC_R_SUCCESS); + +@@ -306,9 +309,6 @@ ATF_TC_BODY(totext, tc) { + result = isc_stdio_open(TAPTEXT, "r", &fp); + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + +- /* make sure text conversion gets the right local time */ +- setenv("TZ", "PST8", 1); +- + while (dns_dt_getframe(handle, &data, &dsize) == ISC_R_SUCCESS) { + dns_dtdata_t *dtdata = NULL; + isc_buffer_t *b = NULL; diff --git a/bind.spec b/bind.spec index 14b76ff..110b520 100644 --- a/bind.spec +++ b/bind.spec @@ -18,6 +18,7 @@ %bcond_without DEVEL %bcond_with LMDB %bcond_with JSON +%bcond_with DNSTAP %bcond_with DLZ %bcond_without EXPORT_LIBS %if 0%{?fedora} >= 17 @@ -124,7 +125,10 @@ Patch159:bind-9.11-rt46047.patch # commit b105ccee68ccc3c18e6ea530063b3c8e5a42571c # commit 083461d3329ff6f2410745848a926090586a9846 Patch160:bind-9.11-rh1624100.patch +# https://gitlab.isc.org/isc-projects/bind9/issues/555 Patch161:bind-9.11-host-idn-disable.patch +# https://gitlab.isc.org/isc-projects/bind9/issues/624 +Patch162:bind-9.11-unit-dnstap-pkcs11.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -187,6 +191,9 @@ BuildRequires: lmdb-devel %if %{with JSON} BuildRequires: json-c-devel %endif +%if %{with DNSTAP} +BuildRequires: fstrm-devel protobuf-c-devel +%endif # Needed to regenerate dig.1 manpage BuildRequires: docbook-style-xsl, libxslt @@ -328,6 +335,9 @@ Requires: lmdb-devel %if %{with JSON} Requires: json-c-devel%{?_isa} %endif +%if %{with DNSTAP} +Requires: fstrm-devel%{?_isa} protobuf-c-devel%{?_isa} +%endif %description lite-devel The bind-lite-devel package contains lite version of the header @@ -475,6 +485,7 @@ are used for building ISC DHCP. %patch159 -p1 -b .rt46047 %patch160 -p1 -b .rh1624100 %patch161 -p1 -b .host-idn-disable +%patch162 -p1 -b .dnstap-pkcs11 mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data @@ -605,6 +616,9 @@ export LIBDIR_SUFFIX %if %{with JSON} --with-libjson \ %endif +%if %{with DNSTAP} + --enable-dnstap \ +%endif %if %{with UNITTEST} --with-atf=${ATF_PATH} \ %endif @@ -612,6 +626,15 @@ export LIBDIR_SUFFIX --with-docbook-xsl=%{_datadir}/sgml/docbook/xsl-stylesheets \ --enable-full-report \ ; +%if %{with DNSTAP} + pushd lib + SRCLIB="../../../lib" + (cd dns && ln -s ${SRCLIB}/dns/dnstap.proto) +%if %{with PKCS11} + (cd dns-pkcs11 && ln -s ${SRCLIB}/dns-pkcs11/dnstap.proto) +%endif + popd +%endif make %{?_smp_mflags} ### FIXME hack!!! @@ -1238,6 +1261,10 @@ rm -rf ${RPM_BUILD_ROOT} %if %{with LMDB} %{_sbindir}/named-nzd2nzf %endif +%if %{with DNSTAP} +%{_bindir}/dnstap-read +%{_mandir}/man1/dnstap-read.1* +%endif %{_mandir}/man1/host.1* %{_mandir}/man1/nsupdate.1* %{_mandir}/man1/dig.1* @@ -1458,6 +1485,7 @@ rm -rf ${RPM_BUILD_ROOT} %changelog * Thu Oct 25 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-2 - Add optional support for JSON statistics +- Add optional DNSTAP support (#1564776), new dnstap-read tool * Wed Oct 24 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-1 - Update to 9.11.5 commit eba5779fc1ae3c7d8bc86e5099ccafac3c37f3ba Author: Petr Menk <pemensik(a)redhat.com> Date: Mon Oct 15 17:15:26 2018 +0200 Add JSON statistics support Optional support for HTTP statistics. For now it is still disabled. diff --git a/bind.spec b/bind.spec index b557e44..14b76ff 100644 --- a/bind.spec +++ b/bind.spec @@ -17,6 +17,7 @@ %bcond_without PKCS11 %bcond_without DEVEL %bcond_with LMDB +%bcond_with JSON %bcond_with DLZ %bcond_without EXPORT_LIBS %if 0%{?fedora} >= 17 @@ -52,7 +53,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.5 -Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ # @@ -183,6 +184,9 @@ BuildRequires: krb5-devel %if %{with LMDB} BuildRequires: lmdb-devel %endif +%if %{with JSON} +BuildRequires: json-c-devel +%endif # Needed to regenerate dig.1 manpage BuildRequires: docbook-style-xsl, libxslt @@ -321,6 +325,9 @@ Requires: krb5-devel%{?_isa} %if %{with LMDB} Requires: lmdb-devel %endif +%if %{with JSON} +Requires: json-c-devel%{?_isa} +%endif %description lite-devel The bind-lite-devel package contains lite version of the header @@ -595,6 +602,9 @@ export LIBDIR_SUFFIX %else --with-lmdb=no \ %endif +%if %{with JSON} + --with-libjson \ +%endif %if %{with UNITTEST} --with-atf=${ATF_PATH} \ %endif @@ -1446,6 +1456,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Oct 25 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-2 +- Add optional support for JSON statistics + * Wed Oct 24 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-1 - Update to 9.11.5 commit ad7b3b8f1284fb8077c24233c4172e2174a6d90e Author: Petr Menk <pemensik(a)redhat.com> Date: Fri Oct 19 17:52:10 2018 +0200 Update to 9.11.5 Bump to higher version, update sources. More fixes to rebased BIND. Many patches are affected by stdbool change. Update libraries so versions. diff --git a/.gitignore b/.gitignore index 774f56c..f656e89 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ bind-9.7.2b1.tar.gz /bind-9.11.4.tar.gz /bind-9.11.4-P1.tar.gz /bind-9.11.4-P2.tar.gz +/bind-9.11.5.tar.gz diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch index 6f66dc1..aa95e33 100644 --- a/bind-9.10-dist-native-pkcs11.patch +++ b/bind-9.10-dist-native-pkcs11.patch @@ -14,7 +14,7 @@ index f0c504a..ce7a2da 100644 @BIND9_MAKE_RULES@ diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in -index 1d0c4ce..7b7f89b 100644 +index ce0a177..f8370cf 100644 --- a/bin/dnssec-pkcs11/Makefile.in +++ b/bin/dnssec-pkcs11/Makefile.in @@ -17,18 +17,18 @@ VERSION=@BIND9_VERSION@ @@ -121,15 +121,15 @@ index 1d0c4ce..7b7f89b 100644 -install:: ${TARGETS} installdirs install-man8 +install:: ${TARGETS} installdirs - for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir}; done + for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir} || exit 1; done uninstall:: -- for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done - for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t ; done +- for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done + for t in ${TARGETS}; do ${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/$$t || exit 1; done clean distclean:: diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in -index 1d0c4ce..11538cf 100644 +index ce0a177..7cede84 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in @@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@ @@ -291,10 +291,10 @@ index a058c91..d4b689a 100644 DEPLIBS = ${ISCDEPLIBS} diff --git a/configure.in b/configure.in -index 849fa94..69e6373 100644 +index 898b4ac..1edafd1 100644 --- a/configure.in +++ b/configure.in -@@ -1164,12 +1164,14 @@ AC_SUBST(USE_GSSAPI) +@@ -1109,12 +1109,14 @@ AC_SUBST(USE_GSSAPI) AC_SUBST(DST_GSSAPI_INC) AC_SUBST(DNS_GSSAPI_LIBS) DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS $DNS_CRYPTO_LIBS" @@ -309,7 +309,7 @@ index 849fa94..69e6373 100644 # # was --with-randomdev specified? -@@ -1554,11 +1556,11 @@ fi +@@ -1499,11 +1501,11 @@ fi AC_MSG_CHECKING(for OpenSSL library) OPENSSL_WARNING= openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw" @@ -326,7 +326,7 @@ index 849fa94..69e6373 100644 if test "auto" = "$use_openssl" then -@@ -1571,6 +1573,7 @@ then +@@ -1516,6 +1518,7 @@ then fi done fi @@ -334,7 +334,7 @@ index 849fa94..69e6373 100644 OPENSSL_ECDSA="" OPENSSL_GOST="" OPENSSL_ED25519="" -@@ -1592,11 +1595,10 @@ case "$with_gost" in +@@ -1537,11 +1540,10 @@ case "$with_gost" in ;; esac @@ -349,7 +349,7 @@ index 849fa94..69e6373 100644 CRYPTOLIB="pkcs11" OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" -@@ -1606,7 +1608,9 @@ case "$use_openssl" in +@@ -1551,7 +1553,9 @@ case "$use_openssl" in OPENSSLGOSTLINKSRCS="" OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" @@ -360,7 +360,7 @@ index 849fa94..69e6373 100644 no) AC_MSG_RESULT(no) DST_OPENSSL_INC="" -@@ -1638,7 +1642,7 @@ case "$use_openssl" in +@@ -1583,7 +1587,7 @@ case "$use_openssl" in If you do not want OpenSSL, use --without-openssl]) ;; *) @@ -369,7 +369,7 @@ index 849fa94..69e6373 100644 then AC_MSG_RESULT() AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.]) -@@ -2066,6 +2070,7 @@ AC_SUBST(OPENSSL_ED25519) +@@ -2011,6 +2015,7 @@ AC_SUBST(OPENSSL_ED25519) AC_SUBST(OPENSSL_GOST) DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" @@ -377,7 +377,7 @@ index 849fa94..69e6373 100644 ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" if test "yes" = "$with_aes" -@@ -2384,6 +2389,7 @@ esac +@@ -2329,6 +2334,7 @@ esac AC_SUBST(PKCS11LINKOBJS) AC_SUBST(PKCS11LINKSRCS) AC_SUBST(CRYPTO) @@ -385,7 +385,7 @@ index 849fa94..69e6373 100644 AC_SUBST(PKCS11_ECDSA) AC_SUBST(PKCS11_GOST) AC_SUBST(PKCS11_ED25519) -@@ -5497,8 +5503,11 @@ AC_CONFIG_FILES([ +@@ -5401,8 +5407,11 @@ AC_CONFIG_FILES([ bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile @@ -397,7 +397,7 @@ index 849fa94..69e6373 100644 bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile -@@ -5572,6 +5581,10 @@ AC_CONFIG_FILES([ +@@ -5476,6 +5485,10 @@ AC_CONFIG_FILES([ lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile @@ -408,7 +408,7 @@ index 849fa94..69e6373 100644 lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile -@@ -5596,6 +5609,24 @@ AC_CONFIG_FILES([ +@@ -5500,6 +5513,24 @@ AC_CONFIG_FILES([ lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile @@ -525,7 +525,7 @@ index 4a8549e..6a19906 100644 rm -f include/dns/rdatastruct.h rm -f dnstap.pb-c.c dnstap.pb-c.h include/dns/dnstap.pb-c.h diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in -index ba53ef1..d1f1771 100644 +index 98acfff..2fd6981 100644 --- a/lib/isc-pkcs11/Makefile.in +++ b/lib/isc-pkcs11/Makefile.in @@ -23,8 +23,8 @@ CINCLUDES = -I${srcdir}/unix/include \ @@ -539,7 +539,7 @@ index ba53ef1..d1f1771 100644 CWARNINGS = # Alphabetically -@@ -107,40 +107,40 @@ version.@O@: version.c +@@ -103,40 +103,40 @@ version.@O@: version.c -DLIBAGE=${LIBAGE} \ -c ${srcdir}/version.c diff --git a/bind-9.11-fips-code.patch b/bind-9.11-fips-code.patch index 2dccdea..f4973a6 100644 --- a/bind-9.11-fips-code.patch +++ b/bind-9.11-fips-code.patch @@ -1,11 +1,13 @@ -From fb8665aebd79ea33cb255f578544e1738f5bbb58 Mon Sep 17 00:00:00 2001 +From 9fa0831af989818eb6f908815967590e56a19ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Thu, 2 Aug 2018 23:34:45 +0200 -Subject: [PATCH 1/2] Squashed commit of the following: +Subject: [PATCH] FIPS code changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Squashed commit of the following: + commit b49f70ce0575b6b52a71b90fe0376dbf16f92c6b Author: Petr Menk <pemensik(a)redhat.com> Date: Mon Jan 22 14:12:37 2018 +0100 @@ -95,7 +97,7 @@ Date: Mon Jan 22 07:21:04 2018 +0100 Add runtime detection whether MD5 is useable. --- bin/confgen/keygen.c | 10 ++++- - bin/confgen/rndc-confgen.c | 36 +++++------------- + bin/confgen/rndc-confgen.c | 32 ++++------------ bin/dig/dig.c | 7 ++-- bin/dig/dighost.c | 14 +++++-- bin/dnssec/dnssec-keygen.c | 14 +++++++ @@ -104,12 +106,12 @@ Date: Mon Jan 22 07:21:04 2018 +0100 bin/rndc/rndc.c | 3 +- bin/tests/optional/hash_test.c | 78 ++++++++++++++++++++------------------- bin/tests/system/tkey/keycreate.c | 3 ++ - bin/tests/system/tkey/keydelete.c | 18 ++++++--- + bin/tests/system/tkey/keydelete.c | 17 ++++++--- lib/bind9/check.c | 10 +++++ lib/dns/dst_api.c | 23 ++++++++---- lib/dns/dst_internal.h | 3 +- lib/dns/dst_parse.c | 18 +++++++-- - lib/dns/hmac_link.c | 20 +++------- + lib/dns/hmac_link.c | 18 ++------- lib/dns/opensslrsa_link.c | 6 +++ lib/dns/pkcs11rsa_link.c | 33 +++++++++++++++-- lib/dns/rcode.c | 21 ++++++++++- @@ -120,13 +122,13 @@ Date: Mon Jan 22 07:21:04 2018 +0100 lib/dns/tsig.c | 17 +++++---- lib/isc/include/isc/md5.h | 3 ++ lib/isc/md5.c | 59 +++++++++++++++++++++++++++++ - lib/isc/pk11.c | 58 ++++++++++++++++++++--------- + lib/isc/pk11.c | 44 +++++++++++++++------- lib/isc/tests/hash_test.c | 9 +++-- lib/isccc/cc.c | 42 +++++++++++++-------- - 29 files changed, 424 insertions(+), 177 deletions(-) + 29 files changed, 409 insertions(+), 171 deletions(-) diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c -index 453c641dba..11cc54dd46 100644 +index 8931ad5..5015abb 100644 --- a/bin/confgen/keygen.c +++ b/bin/confgen/keygen.c @@ -22,6 +22,7 @@ @@ -150,7 +152,7 @@ index 453c641dba..11cc54dd46 100644 switch (alg) { #ifndef PK11_MD5_DISABLE case DST_ALG_HMACMD5: -+ if (isc_md5_available() == ISC_FALSE) { ++ if (!isc_md5_available()) { + fatal("unsupported algorithm %d\n", alg); + } else if (keysize < 1 || keysize > 512) { + fatal("keysize %d out of range (must be 1-512)\n", @@ -161,10 +163,10 @@ index 453c641dba..11cc54dd46 100644 case DST_ALG_HMACSHA1: case DST_ALG_HMACSHA224: diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c -index 2925baf32f..d7d8418073 100644 +index 5ca3d76..6b7790a 100644 --- a/bin/confgen/rndc-confgen.c +++ b/bin/confgen/rndc-confgen.c -@@ -35,6 +35,7 @@ +@@ -36,6 +36,7 @@ #include <isc/file.h> #include <isc/keyboard.h> #include <isc/mem.h> @@ -172,16 +174,16 @@ index 2925baf32f..d7d8418073 100644 #include <isc/net.h> #include <isc/print.h> #include <isc/result.h> -@@ -62,7 +63,7 @@ const char *progname; +@@ -63,7 +64,7 @@ const char *progname; - isc_boolean_t verbose = ISC_FALSE; + bool verbose = false; -const char *keyfile, *keydef; +const char *keyfile, *keydef, *algdef; ISC_PLATFORM_NORETURN_PRE static void usage(int status) ISC_PLATFORM_NORETURN_POST; -@@ -70,13 +71,12 @@ usage(int status) ISC_PLATFORM_NORETURN_POST; +@@ -71,13 +72,12 @@ usage(int status) ISC_PLATFORM_NORETURN_POST; static void usage(int status) { @@ -196,7 +198,7 @@ index 2925baf32f..d7d8418073 100644 -b bits: from 1 through 512, default 256; total length of the secret\n\ -c keyfile: specify an alternate key file (requires -a)\n\ -k keyname: the name as it will be used in named.conf and rndc.conf\n\ -@@ -85,24 +85,7 @@ Usage:\n\ +@@ -86,24 +86,7 @@ Usage:\n\ -s addr: the address to which rndc should connect\n\ -t chrootdir: write a keyfile in chrootdir as well (requires -a)\n\ -u user: set the keyfile owner to \"user\" (requires -a)\n", @@ -222,31 +224,27 @@ index 2925baf32f..d7d8418073 100644 exit (status); } -@@ -138,13 +121,14 @@ main(int argc, char **argv) { +@@ -139,11 +122,12 @@ main(int argc, char **argv) { progname = program; keyname = DEFAULT_KEYNAME; -#ifndef PK11_MD5_DISABLE - alg = DST_ALG_HMACMD5; -#else -- alg = DST_ALG_HMACSHA256; --#endif - serveraddr = DEFAULT_SERVER; - port = DEFAULT_PORT; -+ alg = DST_ALG_HMACSHA256; + alg = DST_ALG_HMACSHA256; +#ifndef PK11_MD5_DISABLE + if (isc_md5_available()) + alg = DST_ALG_HMACMD5; -+#endif + #endif + algdef = alg_totext(alg); - - isc_commandline_errprint = ISC_FALSE; + serveraddr = DEFAULT_SERVER; + port = DEFAULT_PORT; diff --git a/bin/dig/dig.c b/bin/dig/dig.c -index d4808ada67..9dff7c8ecd 100644 +index 39f74be..597e830 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c -@@ -17,6 +17,7 @@ +@@ -20,6 +20,7 @@ #include <ctype.h> #include <isc/app.h> @@ -254,7 +252,7 @@ index d4808ada67..9dff7c8ecd 100644 #include <isc/netaddr.h> #include <isc/parseint.h> #include <isc/platform.h> -@@ -1757,10 +1758,10 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, +@@ -1760,10 +1761,10 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, ptr = ptr2; ptr2 = ptr3; } else { @@ -269,10 +267,10 @@ index d4808ada67..9dff7c8ecd 100644 digestbits = 0; } diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c -index ecefc98453..94c428ed30 100644 +index 1fa711a..341ed80 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c -@@ -77,6 +77,7 @@ +@@ -80,6 +80,7 @@ #include <isc/hex.h> #include <isc/lang.h> #include <isc/log.h> @@ -280,7 +278,7 @@ index ecefc98453..94c428ed30 100644 #include <isc/netaddr.h> #include <isc/netdb.h> #include <isc/parseint.h> -@@ -1243,9 +1244,10 @@ parse_hmac(const char *hmac) { +@@ -1246,9 +1247,10 @@ parse_hmac(const char *hmac) { digestbits = 0; #ifndef PK11_MD5_DISABLE @@ -293,7 +291,7 @@ index ecefc98453..94c428ed30 100644 hmacname = DNS_TSIG_HMACMD5_NAME; digestbits = parse_bits(&buf[9], "digest-bits [0..128]", 128); } else -@@ -1365,7 +1367,13 @@ setup_file_key(void) { +@@ -1368,7 +1370,13 @@ setup_file_key(void) { switch (dst_key_alg(dstkey)) { #ifndef PK11_MD5_DISABLE case DST_ALG_HMACMD5: @@ -309,10 +307,10 @@ index ecefc98453..94c428ed30 100644 #endif case DST_ALG_HMACSHA1: diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c -index 6fc3ab0979..fc04356ed4 100644 +index 1476d0d..f5c9316 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c -@@ -34,6 +34,7 @@ +@@ -36,6 +36,7 @@ #include <isc/buffer.h> #include <isc/commandline.h> #include <isc/entropy.h> @@ -320,7 +318,7 @@ index 6fc3ab0979..fc04356ed4 100644 #include <isc/mem.h> #include <isc/print.h> #include <isc/region.h> -@@ -560,6 +561,19 @@ main(int argc, char **argv) { +@@ -562,6 +563,19 @@ main(int argc, char **argv) { "\"-a RSAMD5\"\n"); INSIST(freeit == NULL); return (1); @@ -333,7 +331,7 @@ index 6fc3ab0979..fc04356ed4 100644 + return (1); + } + } else if (strcasecmp(algname, "RSAMD5") == 0 && -+ isc_md5_available() == ISC_FALSE) { ++ !isc_md5_available()) { + fprintf(stderr, "The use of RSAMD5 was disabled\n"); + INSIST(freeit == NULL); + return (1); @@ -341,10 +339,10 @@ index 6fc3ab0979..fc04356ed4 100644 alg = DST_ALG_HMACMD5; #else diff --git a/bin/named/config.c b/bin/named/config.c -index 54bc37fff7..c50f759ddd 100644 +index 2732a8f..2c4c93c 100644 --- a/bin/named/config.c +++ b/bin/named/config.c -@@ -17,6 +17,7 @@ +@@ -18,6 +18,7 @@ #include <isc/buffer.h> #include <isc/log.h> @@ -352,14 +350,14 @@ index 54bc37fff7..c50f759ddd 100644 #include <isc/mem.h> #include <isc/parseint.h> #include <isc/region.h> -@@ -966,6 +967,21 @@ ns_config_getkeyalgorithm(const char *str, dns_name_t **name, +@@ -967,6 +968,21 @@ ns_config_getkeyalgorithm(const char *str, dns_name_t **name, return (ns_config_getkeyalgorithm2(str, name, NULL, digestbits)); } +static inline int +algorithms_start() { +#ifndef PK11_MD5_DISABLE -+ if (isc_md5_available() == ISC_FALSE) { ++ if (!isc_md5_available()) { + int i = 0; + while (algorithms[i].str != NULL && + algorithms[i].hmac == hmacmd5) { @@ -373,9 +371,9 @@ index 54bc37fff7..c50f759ddd 100644 + isc_result_t ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, - unsigned int *typep, isc_uint16_t *digestbits) -@@ -975,7 +991,7 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, - isc_uint16_t bits; + unsigned int *typep, uint16_t *digestbits) +@@ -976,7 +992,7 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, + uint16_t bits; isc_result_t result; - for (i = 0; algorithms[i].str != NULL; i++) { @@ -383,7 +381,7 @@ index 54bc37fff7..c50f759ddd 100644 len = strlen(algorithms[i].str); if (strncasecmp(algorithms[i].str, str, len) == 0 && (str[len] == '\0' || -@@ -998,7 +1014,12 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, +@@ -999,7 +1015,12 @@ ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, if (name != NULL) { switch (algorithms[i].hmac) { #ifndef PK11_MD5_DISABLE @@ -398,10 +396,10 @@ index 54bc37fff7..c50f759ddd 100644 case hmacsha1: *name = dns_tsig_hmacsha1_name; break; case hmacsha224: *name = dns_tsig_hmacsha224_name; break; diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c -index 6967b49754..bb5d50038f 100644 +index 8d1da3b..5eefc57 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c -@@ -29,6 +29,7 @@ +@@ -31,6 +31,7 @@ #include <isc/hash.h> #include <isc/lex.h> #include <isc/log.h> @@ -409,7 +407,7 @@ index 6967b49754..bb5d50038f 100644 #include <isc/mem.h> #include <isc/parseint.h> #include <isc/print.h> -@@ -474,9 +475,10 @@ parse_hmac(dns_name_t **hmac, const char *hmacstr, size_t len, +@@ -476,9 +477,10 @@ parse_hmac(dns_name_t **hmac, const char *hmacstr, size_t len, strlcpy(buf, hmacstr, ISC_MIN(len + 1, sizeof(buf))); #ifndef PK11_MD5_DISABLE @@ -422,7 +420,7 @@ index 6967b49754..bb5d50038f 100644 *hmac = DNS_TSIG_HMACMD5_NAME; result = isc_parse_uint16(&digestbits, &buf[9], 10); if (result != ISC_R_SUCCESS || digestbits > 128) { -@@ -589,10 +591,10 @@ setup_keystr(void) { +@@ -591,10 +593,10 @@ setup_keystr(void) { exit(1); } } else { @@ -436,7 +434,7 @@ index 6967b49754..bb5d50038f 100644 #endif name = keystr; n = s; -@@ -729,7 +731,8 @@ setup_keyfile(isc_mem_t *mctx, isc_log_t *lctx) { +@@ -731,7 +733,8 @@ setup_keyfile(isc_mem_t *mctx, isc_log_t *lctx) { switch (dst_key_alg(dstkey)) { #ifndef PK11_MD5_DISABLE case DST_ALG_HMACMD5: @@ -446,7 +444,7 @@ index 6967b49754..bb5d50038f 100644 break; #endif case DST_ALG_HMACSHA1: -@@ -1604,12 +1607,13 @@ evaluate_key(char *cmdline) { +@@ -1606,12 +1609,13 @@ evaluate_key(char *cmdline) { return (STATUS_SYNTAX); } namestr = n + 1; @@ -465,10 +463,10 @@ index 6967b49754..bb5d50038f 100644 isc_buffer_init(&b, namestr, strlen(namestr)); isc_buffer_add(&b, strlen(namestr)); diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c -index 5c29caf86b..617b06b4a1 100644 +index 9eb0ce0..8083654 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c -@@ -21,6 +21,7 @@ +@@ -23,6 +23,7 @@ #include <isc/file.h> #include <isc/log.h> #include <isc/net.h> @@ -476,7 +474,7 @@ index 5c29caf86b..617b06b4a1 100644 #include <isc/mem.h> #include <isc/print.h> #include <isc/random.h> -@@ -634,7 +635,7 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, +@@ -636,7 +637,7 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, algorithmstr = cfg_obj_asstring(algorithmobj); #ifndef PK11_MD5_DISABLE @@ -486,7 +484,7 @@ index 5c29caf86b..617b06b4a1 100644 else #endif diff --git a/bin/tests/optional/hash_test.c b/bin/tests/optional/hash_test.c -index bf2891ad4c..b5f0a1c5f5 100644 +index bf2891a..b5f0a1c 100644 --- a/bin/tests/optional/hash_test.c +++ b/bin/tests/optional/hash_test.c @@ -90,43 +90,47 @@ main(int argc, char **argv) { @@ -575,7 +573,7 @@ index bf2891ad4c..b5f0a1c5f5 100644 /* diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c -index 2a0ee94888..489f4390dc 100644 +index 5a00f86..653c951 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -20,6 +20,7 @@ @@ -590,30 +588,29 @@ index 2a0ee94888..489f4390dc 100644 static char keystr[] = "0123456789ab"; isc_event_free(&event); -+ if (isc_md5_available() == ISC_FALSE) ++ if (!isc_md5_available()) + CHECK("MD5 was disabled", ISC_R_NOTIMPLEMENTED); result = ISC_R_FAILURE; if (inet_pton(AF_INET, "10.53.0.1", &inaddr) != 1) diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c -index 7057c318e4..36ee6c7d21 100644 +index bde66a4..70a40c3 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c -@@ -225,12 +225,18 @@ main(int argc, char **argv) { +@@ -225,12 +225,17 @@ main(int argc, char **argv) { result = dst_key_fromnamedfile(keyname, NULL, type, mctx, &dstkey); CHECK("dst_key_fromnamedfile", result); #ifndef PK11_MD5_DISABLE - result = dns_tsigkey_createfromkey(dst_key_name(dstkey), - DNS_TSIG_HMACMD5_NAME, -- dstkey, ISC_TRUE, NULL, 0, 0, +- dstkey, true, NULL, 0, 0, - mctx, ring, &tsigkey); - dst_key_free(&dstkey); - CHECK("dns_tsigkey_createfromkey", result); + if (isc_md5_available()) { + result = dns_tsigkey_createfromkey(dst_key_name(dstkey), + DNS_TSIG_HMACMD5_NAME, -+ dstkey, ISC_TRUE, -+ NULL, 0, 0, ++ dstkey, true, NULL, 0, 0, + mctx, ring, &tsigkey); + dst_key_free(&dstkey); + CHECK("dns_tsigkey_createfromkey", result); @@ -625,10 +622,10 @@ index 7057c318e4..36ee6c7d21 100644 dst_key_free(&dstkey); CHECK("MD5 was disabled", ISC_R_NOTIMPLEMENTED); diff --git a/lib/bind9/check.c b/lib/bind9/check.c -index 3da83a7ae2..1a3d534799 100644 +index d32a5a1..c749c27 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c -@@ -21,6 +21,7 @@ +@@ -23,6 +23,7 @@ #include <isc/file.h> #include <isc/hex.h> #include <isc/log.h> @@ -636,13 +633,13 @@ index 3da83a7ae2..1a3d534799 100644 #include <isc/mem.h> #include <isc/netaddr.h> #include <isc/parseint.h> -@@ -2572,6 +2573,15 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) { +@@ -2592,6 +2593,15 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) { } algorithm = cfg_obj_asstring(algobj); +#ifndef PK11_MD5_DISABLE + /* Skip hmac-md5* algorithms */ -+ if (isc_md5_available() == ISC_FALSE && ++ if (!isc_md5_available() && + strncasecmp(algorithm, "hmac-md5", 8) == 0) { + cfg_obj_log(algobj, logctx, ISC_LOG_ERROR, + "disabled algorithm '%s'", algorithm); @@ -653,10 +650,10 @@ index 3da83a7ae2..1a3d534799 100644 len = strlen(algorithms[i].name); if (strncasecmp(algorithms[i].name, algorithm, len) == 0 && diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c -index 4f3d6ac55c..dbece0ac56 100644 +index 97fee68..5703f9c 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c -@@ -190,6 +190,12 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, +@@ -192,6 +192,12 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, dst_result_register(); memset(dst_t_func, 0, sizeof(dst_t_func)); @@ -669,7 +666,7 @@ index 4f3d6ac55c..dbece0ac56 100644 #ifndef PK11_MD5_DISABLE RETERR(dst__hmacmd5_init(&dst_t_func[DST_ALG_HMACMD5])); #endif -@@ -199,7 +205,6 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, +@@ -201,7 +207,6 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, RETERR(dst__hmacsha384_init(&dst_t_func[DST_ALG_HMACSHA384])); RETERR(dst__hmacsha512_init(&dst_t_func[DST_ALG_HMACSHA512])); #ifdef OPENSSL @@ -677,7 +674,7 @@ index 4f3d6ac55c..dbece0ac56 100644 #ifndef PK11_MD5_DISABLE RETERR(dst__opensslrsa_init(&dst_t_func[DST_ALG_RSAMD5], DST_ALG_RSAMD5)); -@@ -233,14 +238,18 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, +@@ -235,14 +240,18 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, RETERR(dst__openssleddsa_init(&dst_t_func[DST_ALG_ED448])); #endif #elif PKCS11CRYPTO @@ -703,10 +700,10 @@ index 4f3d6ac55c..dbece0ac56 100644 RETERR(dst__pkcs11dsa_init(&dst_t_func[DST_ALG_DSA])); RETERR(dst__pkcs11dsa_init(&dst_t_func[DST_ALG_NSEC3DSA])); diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h -index 640519a5ba..deb7ed4e13 100644 +index 6ee796c..3e55d44 100644 --- a/lib/dns/dst_internal.h +++ b/lib/dns/dst_internal.h -@@ -245,7 +245,8 @@ isc_result_t dst__hmacsha384_init(struct dst_func **funcp); +@@ -250,7 +250,8 @@ isc_result_t dst__hmacsha384_init(struct dst_func **funcp); isc_result_t dst__hmacsha512_init(struct dst_func **funcp); isc_result_t dst__opensslrsa_init(struct dst_func **funcp, unsigned char algorithm); @@ -717,10 +714,10 @@ index 640519a5ba..deb7ed4e13 100644 isc_result_t dst__openssldsa_init(struct dst_func **funcp); isc_result_t dst__pkcs11dsa_init(struct dst_func **funcp); diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c -index b0e5c895c6..03f2b8ace8 100644 +index f31c33d..87023a6 100644 --- a/lib/dns/dst_parse.c +++ b/lib/dns/dst_parse.c -@@ -30,6 +30,7 @@ +@@ -33,6 +33,7 @@ #include <isc/file.h> #include <isc/fsaccess.h> #include <isc/lex.h> @@ -728,7 +725,7 @@ index b0e5c895c6..03f2b8ace8 100644 #include <isc/mem.h> #include <isc/print.h> #include <isc/stdtime.h> -@@ -393,6 +394,10 @@ check_data(const dst_private_t *priv, const unsigned int alg, +@@ -396,6 +397,10 @@ check_data(const dst_private_t *priv, const unsigned int alg, switch (alg) { #ifndef PK11_MD5_DISABLE case DST_ALG_RSAMD5: @@ -739,7 +736,7 @@ index b0e5c895c6..03f2b8ace8 100644 #endif case DST_ALG_RSASHA1: case DST_ALG_NSEC3RSASHA1: -@@ -418,7 +423,10 @@ check_data(const dst_private_t *priv, const unsigned int alg, +@@ -421,7 +426,10 @@ check_data(const dst_private_t *priv, const unsigned int alg, return (check_eddsa(priv, external)); #ifndef PK11_MD5_DISABLE case DST_ALG_HMACMD5: @@ -751,36 +748,35 @@ index b0e5c895c6..03f2b8ace8 100644 #endif case DST_ALG_HMACSHA1: return (check_hmac_sha(priv, HMACSHA1_NTAGS, alg)); -@@ -637,11 +645,13 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex, +@@ -640,11 +648,13 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex, } #ifdef PK11_MD5_DISABLE - check = check_data(priv, alg == DST_ALG_RSA ? DST_ALG_RSASHA1 : alg, -- ISC_TRUE, external); +- true, external); + if (alg == DST_ALG_RSA) + alg = DST_ALG_RSASHA1; #else -- check = check_data(priv, alg, ISC_TRUE, external); -+ if (isc_md5_available() == ISC_FALSE && alg == DST_ALG_RSA) +- check = check_data(priv, alg, true, external); ++ if (!isc_md5_available() && alg == DST_ALG_RSA) + alg = DST_ALG_RSASHA1; #endif -+ check = check_data(priv, alg, ISC_TRUE, external); ++ check = check_data(priv, alg, true, external); if (check < 0) { ret = DST_R_INVALIDPRIVATEKEY; goto fail; diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c -index 59aa4705e5..21bfa44450 100644 +index 94e73b1..d904075 100644 --- a/lib/dns/hmac_link.c +++ b/lib/dns/hmac_link.c -@@ -338,25 +338,17 @@ static dst_func_t hmacmd5_functions = { +@@ -340,20 +340,10 @@ static dst_func_t hmacmd5_functions = { isc_result_t dst__hmacmd5_init(dst_func_t **funcp) { -#ifdef HAVE_FIPS_MODE - /* +- /* - * Problems from OpenSSL are likely from FIPS mode -+ * Prevent use of incorrect crypto - */ +- */ - int fips_mode = FIPS_mode(); - - if (fips_mode != 0) { @@ -789,26 +785,20 @@ index 59aa4705e5..21bfa44450 100644 - "if the value is 0.\n" - "Please disable either FIPS mode or MD5.", - fips_mode); +- } +-#endif + -+#ifndef PK11_MD5_DISABLE -+ if (isc_md5_available() == ISC_FALSE) { -+ /* Intentionally skip initialization */ ++ /* Intentionally skip initialization */ ++ if (!isc_md5_available()) + return (ISC_R_SUCCESS); - } - #endif - -- /* -- * Prevent use of incorrect crypto -- */ -- - RUNTIME_CHECK(isc_md5_check(ISC_FALSE)); - RUNTIME_CHECK(isc_hmacmd5_check(0)); + /* + * Prevent use of incorrect crypto diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c -index f4847bbe74..126cebca19 100644 +index c03fd72..49b66fc 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c -@@ -1801,6 +1801,12 @@ dst__opensslrsa_init(dst_func_t **funcp, unsigned char algorithm) { +@@ -1802,6 +1802,12 @@ dst__opensslrsa_init(dst_func_t **funcp, unsigned char algorithm) { if (*funcp == NULL) { switch (algorithm) { @@ -822,10 +812,10 @@ index f4847bbe74..126cebca19 100644 #if defined(HAVE_EVP_SHA256) || !USE_EVP *funcp = &opensslrsa_functions; diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c -index 56955203e9..af6008d4dd 100644 +index eb782c8..46fd844 100644 --- a/lib/dns/pkcs11rsa_link.c +++ b/lib/dns/pkcs11rsa_link.c -@@ -94,10 +94,15 @@ pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) { +@@ -96,10 +96,15 @@ pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) { #endif /* @@ -835,44 +825,44 @@ index 56955203e9..af6008d4dd 100644 switch (dctx->key->key_alg) { case DST_ALG_RSAMD5: +#ifndef PK11_MD5_DISABLE -+ if (isc_md5_available() == ISC_FALSE) ++ if (!isc_md5_available()) + return (ISC_R_FAILURE); +#endif + /* FALLTHROUGH */ case DST_ALG_RSASHA1: case DST_ALG_NSEC3RSASHA1: /* From RFC 3110 */ -@@ -634,6 +639,9 @@ pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) { +@@ -636,6 +641,9 @@ pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) { switch (key->key_alg) { #ifndef PK11_MD5_DISABLE case DST_ALG_RSAMD5: -+ if (isc_md5_available() == ISC_FALSE) ++ if (!isc_md5_available()) + return (ISC_R_FAILURE); + mech.mechanism = CKM_MD5; break; #endif -@@ -790,6 +798,9 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { +@@ -792,6 +800,9 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { switch (key->key_alg) { #ifndef PK11_MD5_DISABLE case DST_ALG_RSAMD5: -+ if (isc_md5_available() == ISC_FALSE) ++ if (!isc_md5_available()) + return (ISC_R_FAILURE); + der = md5_der; derlen = sizeof(md5_der); hashlen = ISC_MD5_DIGESTLENGTH; -@@ -1014,6 +1025,9 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) { +@@ -1016,6 +1027,9 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) { switch (key->key_alg) { #ifndef PK11_MD5_DISABLE case DST_ALG_RSAMD5: -+ if (isc_md5_available() == ISC_FALSE) ++ if (!isc_md5_available()) + return (ISC_R_FAILURE); + der = md5_der; derlen = sizeof(md5_der); hashlen = ISC_MD5_DIGESTLENGTH; -@@ -2217,11 +2231,22 @@ static dst_func_t pkcs11rsa_functions = { +@@ -2219,11 +2233,22 @@ static dst_func_t pkcs11rsa_functions = { }; isc_result_t @@ -899,18 +889,18 @@ index 56955203e9..af6008d4dd 100644 } diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c -index 937d8fc1ec..d1fa8d5870 100644 +index 6a5948e..010dd1b 100644 --- a/lib/dns/rcode.c +++ b/lib/dns/rcode.c -@@ -14,6 +14,7 @@ - #include <ctype.h> +@@ -16,6 +16,7 @@ + #include <stdbool.h> #include <isc/buffer.h> +#include <isc/md5.h> #include <isc/parseint.h> #include <isc/print.h> #include <isc/region.h> -@@ -347,17 +348,33 @@ dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) { +@@ -349,17 +350,33 @@ dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) { return (dns_mnemonic_totext(cert, target, certs)); } @@ -919,7 +909,7 @@ index 937d8fc1ec..d1fa8d5870 100644 + struct tbl *algs = secalgs; + +#ifndef PK11_MD5_DISABLE -+ if (isc_md5_available() == ISC_FALSE) { ++ if (!isc_md5_available()) { + while (algs->name != NULL && + algs->value == DNS_KEYALG_RSAMD5) + ++algs; @@ -947,7 +937,7 @@ index 937d8fc1ec..d1fa8d5870 100644 void diff --git a/lib/dns/tests/rsa_test.c b/lib/dns/tests/rsa_test.c -index 224cf5b475..44040dd8b7 100644 +index fb207ef..3ef0a4e 100644 --- a/lib/dns/tests/rsa_test.c +++ b/lib/dns/tests/rsa_test.c @@ -19,6 +19,7 @@ @@ -967,10 +957,10 @@ index 224cf5b475..44040dd8b7 100644 + key->key_alg = DST_ALG_RSAMD5; - ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC, -- ISC_FALSE, &ctx); +- false, &ctx); - ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); + ret = dst_context_create3(key, mctx, DNS_LOGCATEGORY_DNSSEC, -+ ISC_FALSE, &ctx); ++ false, &ctx); + ATF_REQUIRE_EQ(ret, ISC_R_SUCCESS); - r.base = d; @@ -998,7 +988,7 @@ index 224cf5b475..44040dd8b7 100644 /* RSASHA256 */ diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c -index ee025c2387..c403d9954d 100644 +index 443fb36..f003ff3 100644 --- a/lib/dns/tests/tsig_test.c +++ b/lib/dns/tests/tsig_test.c @@ -14,6 +14,7 @@ @@ -1010,24 +1000,24 @@ index ee025c2387..c403d9954d 100644 #include <isc/print.h> diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c -index d9f68e50b1..a8edde47b5 100644 +index 5b4ffd9..cc3469d 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c -@@ -242,6 +242,9 @@ compute_secret(isc_buffer_t *shared, isc_region_t *queryrandomness, +@@ -245,6 +245,9 @@ compute_secret(isc_buffer_t *shared, isc_region_t *queryrandomness, unsigned char digests[32]; unsigned int i; -+ if (isc_md5_available() == ISC_FALSE) ++ if (!isc_md5_available()) + return (ISC_R_NOTIMPLEMENTED); + isc_buffer_usedregion(shared, &r); /* -@@ -318,6 +321,12 @@ process_dhtkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name, +@@ -321,6 +324,12 @@ process_dhtkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name, } #ifndef PK11_MD5_DISABLE -+ if (isc_md5_available() == ISC_FALSE) { ++ if (!isc_md5_available()) { + tkey_log("process_dhtkey: MD5 was disabled"); + tkeyout->error = dns_tsigerror_badalg; + return (ISC_R_SUCCESS); @@ -1037,7 +1027,7 @@ index d9f68e50b1..a8edde47b5 100644 tkey_log("process_dhtkey: algorithms other than " "hmac-md5 are not supported"); diff --git a/lib/dns/tsec.c b/lib/dns/tsec.c -index a367291f23..37baad7437 100644 +index c5eca0e..19b9002 100644 --- a/lib/dns/tsec.c +++ b/lib/dns/tsec.c @@ -11,6 +11,7 @@ @@ -1063,10 +1053,10 @@ index a367291f23..37baad7437 100644 #endif case DST_ALG_HMACSHA1: diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c -index bdcc581bc3..70805bb709 100644 +index a94ec69..f74c831 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c -@@ -270,7 +270,8 @@ dns_tsigkey_createfromkey(dns_name_t *name, dns_name_t *algorithm, +@@ -273,7 +273,8 @@ dns_tsigkey_createfromkey(dns_name_t *name, dns_name_t *algorithm, (void)dns_name_downcase(&tkey->name, &tkey->name, NULL); #ifndef PK11_MD5_DISABLE @@ -1076,7 +1066,7 @@ index bdcc581bc3..70805bb709 100644 tkey->algorithm = DNS_TSIG_HMACMD5_NAME; if (dstkey != NULL && dst_key_alg(dstkey) != DST_ALG_HMACMD5) { ret = DNS_R_BADALG; -@@ -496,7 +497,8 @@ destroyring(dns_tsig_keyring_t *ring) { +@@ -499,7 +500,8 @@ destroyring(dns_tsig_keyring_t *ring) { static unsigned int dst_alg_fromname(dns_name_t *algorithm) { #ifndef PK11_MD5_DISABLE @@ -1086,7 +1076,7 @@ index bdcc581bc3..70805bb709 100644 return (DST_ALG_HMACMD5); } else #endif -@@ -680,7 +682,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm, +@@ -683,7 +685,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm, REQUIRE(secret != NULL); #ifndef PK11_MD5_DISABLE @@ -1096,7 +1086,7 @@ index bdcc581bc3..70805bb709 100644 if (secret != NULL) { isc_buffer_t b; -@@ -1280,7 +1283,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, +@@ -1283,7 +1286,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, return (ret); if ( #ifndef PK11_MD5_DISABLE @@ -1105,7 +1095,7 @@ index bdcc581bc3..70805bb709 100644 #endif alg == DST_ALG_HMACSHA1 || alg == DST_ALG_HMACSHA224 || alg == DST_ALG_HMACSHA256 || -@@ -1449,7 +1452,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, +@@ -1452,7 +1455,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, if ( #ifndef PK11_MD5_DISABLE @@ -1114,7 +1104,7 @@ index bdcc581bc3..70805bb709 100644 #endif alg == DST_ALG_HMACSHA1 || alg == DST_ALG_HMACSHA224 || alg == DST_ALG_HMACSHA256 || -@@ -1590,7 +1593,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { +@@ -1593,7 +1596,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { goto cleanup_querystruct; if ( #ifndef PK11_MD5_DISABLE @@ -1123,7 +1113,7 @@ index bdcc581bc3..70805bb709 100644 #endif alg == DST_ALG_HMACSHA1 || alg == DST_ALG_HMACSHA224 || -@@ -1769,7 +1772,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { +@@ -1772,7 +1775,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { goto cleanup_context; if ( #ifndef PK11_MD5_DISABLE @@ -1133,24 +1123,24 @@ index bdcc581bc3..70805bb709 100644 alg == DST_ALG_HMACSHA1 || alg == DST_ALG_HMACSHA224 || diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h -index e5f46dd9c7..9d11f9f8b6 100644 +index 4d29398..e3f5cec 100644 --- a/lib/isc/include/isc/md5.h +++ b/lib/isc/include/isc/md5.h -@@ -89,6 +89,9 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest); - isc_boolean_t - isc_md5_check(isc_boolean_t testing); +@@ -91,6 +91,9 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest); + bool + isc_md5_check(bool testing); -+isc_boolean_t ++bool +isc_md5_available(void); + ISC_LANG_ENDDECLS #endif /* !PK11_MD5_DISABLE */ diff --git a/lib/isc/md5.c b/lib/isc/md5.c -index 740d863b1b..aefd16478f 100644 +index 25c71a2..934a70c 100644 --- a/lib/isc/md5.c +++ b/lib/isc/md5.c -@@ -35,6 +35,7 @@ +@@ -37,6 +37,7 @@ #include <isc/assertions.h> #include <isc/md5.h> @@ -1158,17 +1148,17 @@ index 740d863b1b..aefd16478f 100644 #include <isc/platform.h> #include <isc/safe.h> #include <isc/string.h> -@@ -53,6 +54,9 @@ +@@ -55,6 +56,9 @@ #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr) #endif +static isc_once_t available_once = ISC_ONCE_INIT; -+static isc_boolean_t available = ISC_FALSE; ++static bool available = false; + void isc_md5_init(isc_md5_t *ctx) { ctx->ctx = EVP_MD_CTX_new(); -@@ -84,8 +88,33 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) { +@@ -86,8 +90,33 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) { ctx->ctx = NULL; } @@ -1180,14 +1170,14 @@ index 740d863b1b..aefd16478f 100644 + + ctx->ctx = EVP_MD_CTX_new(); + RUNTIME_CHECK(ctx->ctx != NULL); -+ available = ISC_TF(EVP_DigestInit(ctx->ctx, EVP_md5()) == 1); ++ available = (EVP_DigestInit(ctx->ctx, EVP_md5()) == 1); + if (available) + (void)EVP_DigestFinal(ctx->ctx, digest, NULL); + EVP_MD_CTX_free(ctx->ctx); + ctx->ctx = NULL; +} + -+isc_boolean_t ++bool +isc_md5_available() { + RUNTIME_CHECK(isc_once_do(&available_once, do_detect_available) + == ISC_R_SUCCESS); @@ -1197,12 +1187,12 @@ index 740d863b1b..aefd16478f 100644 #elif PKCS11CRYPTO +static isc_once_t available_once = ISC_ONCE_INIT; -+static isc_boolean_t available = ISC_FALSE; ++static bool available = false; + void isc_md5_init(isc_md5_t *ctx) { CK_RV rv; -@@ -128,6 +157,31 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) { +@@ -130,6 +159,31 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) { pk11_return_session(ctx); } @@ -1213,18 +1203,18 @@ index 740d863b1b..aefd16478f 100644 + CK_RV rv; + CK_MECHANISM mech = { CKM_MD5, NULL, 0 }; + -+ if (pk11_get_session(ctx, OP_DIGEST, ISC_TRUE, ISC_FALSE, -+ ISC_FALSE, NULL, 0) == ISC_R_SUCCESS) ++ if (pk11_get_session(ctx, OP_DIGEST, true, false, ++ false, NULL, 0) == ISC_R_SUCCESS) + { + rv = pkcs_C_DigestInit(ctx->session, &mech); + isc_md5_invalidate(ctx); -+ available = (ISC_TF(rv == CKR_OK)); ++ available = (rv == CKR_OK); + } else { -+ available = ISC_FALSE; ++ available = false; + } +} + -+isc_boolean_t ++bool +isc_md5_available() { + RUNTIME_CHECK(isc_once_do(&available_once, do_detect_available) + == ISC_R_SUCCESS); @@ -1234,74 +1224,49 @@ index 740d863b1b..aefd16478f 100644 #else static void -@@ -337,6 +391,11 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) { +@@ -339,6 +393,11 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) { memmove(digest, ctx->buf, 16); isc_safe_memwipe(ctx, sizeof(*ctx)); /* In case it's sensitive */ } + -+isc_boolean_t ++bool +isc_md5_available() { -+ return ISC_TRUE; ++ return true; +} #endif /* diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c -index fc75a46154..48e1031974 100644 +index c5d2310..a01e698 100644 --- a/lib/isc/pk11.c +++ b/lib/isc/pk11.c -@@ -191,13 +191,12 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) { - LOCK(&alloclock); - if ((mctx != NULL) && (pk11_mctx == NULL) && (allocsize == 0)) - isc_mem_attach(mctx, &pk11_mctx); -+ UNLOCK(&alloclock); -+ -+ LOCK(&sessionlock); +@@ -197,8 +197,6 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) { + UNLOCK(&alloclock); if (initialized) { -- UNLOCK(&alloclock); -- return (ISC_R_SUCCESS); + goto unlock; - } else { -- LOCK(&sessionlock); -- initialized = ISC_TRUE; -- UNLOCK(&alloclock); -+ result = ISC_R_SUCCESS; -+ goto unlock; +- initialized = true; } ISC_LIST_INIT(tokens); -@@ -237,6 +236,7 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) { +@@ -236,6 +234,7 @@ pk11_initialize(isc_mem_t *mctx, const char *engine) { + result = PK11_R_NOAESSERVICE; + goto unlock; } ++ initialized = true; #endif #endif /* PKCS11CRYPTO */ -+ initialized = ISC_TRUE; - result = ISC_R_SUCCESS; unlock: - UNLOCK(&sessionlock); -@@ -273,9 +273,14 @@ pk11_finalize(void) { - pk11_mem_put(token, sizeof(*token)); - token = next; - } -+ LOCK(&alloclock); - if (pk11_mctx != NULL) - isc_mem_detach(&pk11_mctx); -+ UNLOCK(&alloclock); -+ -+ LOCK(&sessionlock); - initialized = ISC_FALSE; -+ UNLOCK(&sessionlock); - return (ret); - } - -@@ -589,6 +594,8 @@ scan_slots(void) { +@@ -589,6 +588,8 @@ scan_slots(void) { pk11_token_t *token; unsigned int i; - isc_boolean_t bad; + bool bad; + unsigned int best_rsa_algorithms = 0; + unsigned int best_digest_algorithms = 0; slotCount = 0; PK11_FATALCHECK(pkcs_C_GetSlotList, (CK_FALSE, NULL_PTR, &slotCount)); -@@ -601,6 +608,8 @@ scan_slots(void) { +@@ -601,6 +602,8 @@ scan_slots(void) { PK11_FATALCHECK(pkcs_C_GetSlotList, (CK_FALSE, slotList, &slotCount)); for (i = 0; i < slotCount; i++) { @@ -1310,12 +1275,12 @@ index fc75a46154..48e1031974 100644 slot = slotList[i]; PK11_TRACE2("slot#%u=0x%lx\n", i, slot); -@@ -640,11 +649,12 @@ scan_slots(void) { +@@ -640,11 +643,12 @@ scan_slots(void) { if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0) || ((mechInfo.flags & CKF_VERIFY) == 0)) { -#if !defined(PK11_MD5_DISABLE) && !defined(PK11_RSA_PKCS_REPLACE) -- bad = ISC_TRUE; +- bad = true; -#endif PK11_TRACEM(CKM_MD5_RSA_PKCS); } @@ -1326,28 +1291,28 @@ index fc75a46154..48e1031974 100644 rv = pkcs_C_GetMechanismInfo(slot, CKM_SHA1_RSA_PKCS, &mechInfo); if ((rv != CKR_OK) || -@@ -687,8 +697,14 @@ scan_slots(void) { +@@ -687,8 +691,14 @@ scan_slots(void) { if (bad) goto try_dsa; token->operations |= 1 << OP_RSA; - if (best_rsa_token == NULL) + if (best_rsa_token == NULL) { -+ best_rsa_token = token; + best_rsa_token = token; + best_rsa_algorithms = rsa_algorithms; + } else if (rsa_algorithms > best_rsa_algorithms) { + pk11_mem_put(best_rsa_token, sizeof(*best_rsa_token)); - best_rsa_token = token; ++ best_rsa_token = token; + best_rsa_algorithms = rsa_algorithms; + } try_dsa: - bad = ISC_FALSE; -@@ -756,11 +772,12 @@ scan_slots(void) { - bad = ISC_FALSE; + bad = false; +@@ -756,11 +766,12 @@ scan_slots(void) { + bad = false; rv = pkcs_C_GetMechanismInfo(slot, CKM_MD5, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_DIGEST) == 0)) { -#ifndef PK11_MD5_DISABLE -- bad = ISC_TRUE; +- bad = true; -#endif PK11_TRACEM(CKM_MD5); } @@ -1357,13 +1322,13 @@ index fc75a46154..48e1031974 100644 +#endif rv = pkcs_C_GetMechanismInfo(slot, CKM_SHA_1, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_DIGEST) == 0)) { - bad = ISC_TRUE; -@@ -788,11 +805,12 @@ scan_slots(void) { + bad = true; +@@ -788,11 +799,12 @@ scan_slots(void) { } rv = pkcs_C_GetMechanismInfo(slot, CKM_MD5_HMAC, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0)) { -#if !defined(PK11_MD5_DISABLE) && !defined(PK11_MD5_HMAC_REPLACE) -- bad = ISC_TRUE; +- bad = true; -#endif PK11_TRACEM(CKM_MD5_HMAC); } @@ -1374,27 +1339,27 @@ index fc75a46154..48e1031974 100644 rv = pkcs_C_GetMechanismInfo(slot, CKM_SHA_1_HMAC, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0)) { #ifndef PK11_SHA_1_HMAC_REPLACE -@@ -830,8 +848,14 @@ scan_slots(void) { +@@ -830,8 +842,14 @@ scan_slots(void) { } if (!bad) { token->operations |= 1 << OP_DIGEST; - if (digest_token == NULL) + if (digest_token == NULL) { -+ digest_token = token; + digest_token = token; + best_digest_algorithms = digest_algorithms; + } else if (digest_algorithms > best_digest_algorithms) { + pk11_mem_put(digest_token, sizeof(*digest_token)); - digest_token = token; ++ digest_token = token; + best_digest_algorithms = digest_algorithms; + } } /* ECDSA requires digest */ diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c -index 18759903be..6bc45b1ad3 100644 +index 8f12342..7eb1552 100644 --- a/lib/isc/tests/hash_test.c +++ b/lib/isc/tests/hash_test.c -@@ -2008,7 +2008,8 @@ ATF_TP_ADD_TCS(tp) { +@@ -2009,7 +2009,8 @@ ATF_TP_ADD_TCS(tp) { * various cryptographic hashes. */ #ifndef PK11_MD5_DISABLE @@ -1404,7 +1369,7 @@ index 18759903be..6bc45b1ad3 100644 #endif ATF_TP_ADD_TC(tp, sha1_check); -@@ -2016,7 +2017,8 @@ ATF_TP_ADD_TCS(tp) { +@@ -2017,7 +2018,8 @@ ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, isc_hash_function_reverse); ATF_TP_ADD_TC(tp, isc_hash_initializer); #ifndef PK11_MD5_DISABLE @@ -1414,7 +1379,7 @@ index 18759903be..6bc45b1ad3 100644 #endif ATF_TP_ADD_TC(tp, isc_hmacsha1); ATF_TP_ADD_TC(tp, isc_hmacsha224); -@@ -2024,7 +2026,8 @@ ATF_TP_ADD_TCS(tp) { +@@ -2025,7 +2027,8 @@ ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, isc_hmacsha384); ATF_TP_ADD_TC(tp, isc_hmacsha512); #ifndef PK11_MD5_DISABLE @@ -1425,10 +1390,10 @@ index 18759903be..6bc45b1ad3 100644 ATF_TP_ADD_TC(tp, isc_sha1); ATF_TP_ADD_TC(tp, isc_sha224); diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c -index 7225ab4a37..42b30466be 100644 +index c2740cb..c314d76 100644 --- a/lib/isccc/cc.c +++ b/lib/isccc/cc.c -@@ -270,11 +270,15 @@ sign(unsigned char *data, unsigned int length, unsigned char *hmac, +@@ -272,11 +272,15 @@ sign(unsigned char *data, unsigned int length, unsigned char *hmac, switch (algorithm) { #ifndef PK11_MD5_DISABLE case ISCCC_ALG_HMACMD5: @@ -1449,14 +1414,14 @@ index 7225ab4a37..42b30466be 100644 break; #endif -@@ -348,14 +352,18 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, +@@ -350,14 +354,18 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, { unsigned int hmac_base, signed_base; isc_result_t result; -+ const isc_boolean_t md5 = ISC_TF(algorithm == ISCCC_ALG_HMACMD5); ++ const bool md5 = (algorithm == ISCCC_ALG_HMACMD5); #ifndef PK11_MD5_DISABLE -+ if (md5 && isc_md5_available() == ISC_FALSE) ++ if (md5 && !isc_md5_available()) + return (ISC_R_NOTIMPLEMENTED); + result = isc_buffer_reserve(buffer, @@ -1470,7 +1435,7 @@ index 7225ab4a37..42b30466be 100644 return (ISC_R_NOTIMPLEMENTED); result = isc_buffer_reserve(buffer, 4 + sizeof(auth_hsha)); #endif -@@ -374,7 +382,7 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, +@@ -376,7 +384,7 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, * we know what it is. */ #ifndef PK11_MD5_DISABLE @@ -1479,7 +1444,7 @@ index 7225ab4a37..42b30466be 100644 hmac_base = (*buffer)->used + HMD5_OFFSET; isc_buffer_putmem(*buffer, auth_hmd5, sizeof(auth_hmd5)); -@@ -440,7 +448,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, +@@ -442,7 +450,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, if (!isccc_alist_alistp(_auth)) return (ISC_R_FAILURE); #ifndef PK11_MD5_DISABLE @@ -1488,7 +1453,7 @@ index 7225ab4a37..42b30466be 100644 hmac = isccc_alist_lookup(_auth, "hmd5"); else #endif -@@ -455,12 +463,16 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, +@@ -457,12 +465,16 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, switch (algorithm) { #ifndef PK11_MD5_DISABLE case ISCCC_ALG_HMACMD5: diff --git a/bind-9.11-fips-tests.patch b/bind-9.11-fips-tests.patch index f7a998d..16d3b33 100644 --- a/bind-9.11-fips-tests.patch +++ b/bind-9.11-fips-tests.patch @@ -1,11 +1,13 @@ -From 35b53607724ec4b5d4060385218c39ccd0d78a4d Mon Sep 17 00:00:00 2001 +From 07876a60a9c2537f536901b214349d67f6b25666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Thu, 2 Aug 2018 23:46:45 +0200 -Subject: [PATCH 2/2] Squashed commit of the following: +Subject: [PATCH] FIPS tests changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Squashed commit of the following: + commit 09e5eb48698d4fef2fc1031870de86c553b6bfaa Author: Petr Menk <pemensik(a)redhat.com> Date: Wed Mar 7 20:35:13 2018 +0100 @@ -108,7 +110,7 @@ Date: Wed Mar 7 10:44:23 2018 +0100 create mode 100644 bin/tests/system/tsig/ns1/rndc5.conf.in diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in -index 0ea6502708..026db3f134 100644 +index 0ea6502..026db3f 100644 --- a/bin/tests/system/acl/ns2/named1.conf.in +++ b/bin/tests/system/acl/ns2/named1.conf.in @@ -33,12 +33,12 @@ options { @@ -127,7 +129,7 @@ index 0ea6502708..026db3f134 100644 }; diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.in -index b877880554..d8f50be255 100644 +index b877880..d8f50be 100644 --- a/bin/tests/system/acl/ns2/named2.conf.in +++ b/bin/tests/system/acl/ns2/named2.conf.in @@ -33,12 +33,12 @@ options { @@ -146,7 +148,7 @@ index b877880554..d8f50be255 100644 }; diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.in -index 0a950622a2..aa54088138 100644 +index 0a95062..aa54088 100644 --- a/bin/tests/system/acl/ns2/named3.conf.in +++ b/bin/tests/system/acl/ns2/named3.conf.in @@ -33,17 +33,17 @@ options { @@ -171,7 +173,7 @@ index 0a950622a2..aa54088138 100644 }; diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.in -index 7cdcb6e341..606a3452d8 100644 +index 7cdcb6e..606a345 100644 --- a/bin/tests/system/acl/ns2/named4.conf.in +++ b/bin/tests/system/acl/ns2/named4.conf.in @@ -33,12 +33,12 @@ options { @@ -190,7 +192,7 @@ index 7cdcb6e341..606a3452d8 100644 }; diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in -index 4b4e05027a..0e679a821d 100644 +index 4b4e050..0e679a8 100644 --- a/bin/tests/system/acl/ns2/named5.conf.in +++ b/bin/tests/system/acl/ns2/named5.conf.in @@ -34,12 +34,12 @@ options { @@ -209,7 +211,7 @@ index 4b4e05027a..0e679a821d 100644 }; diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh -index 09f31f2bb9..f88f0d4430 100644 +index 09f31f2..f88f0d4 100644 --- a/bin/tests/system/acl/tests.sh +++ b/bin/tests/system/acl/tests.sh @@ -22,14 +22,14 @@ echo_i "testing basic ACL processing" @@ -335,7 +337,7 @@ index 09f31f2bb9..f88f0d4430 100644 echo_i "testing allow-query-on ACL processing" diff --git a/bin/tests/system/allow-query/ns2/named10.conf.in b/bin/tests/system/allow-query/ns2/named10.conf.in -index 1569913b37..e9c5c2d574 100644 +index 1569913..e9c5c2d 100644 --- a/bin/tests/system/allow-query/ns2/named10.conf.in +++ b/bin/tests/system/allow-query/ns2/named10.conf.in @@ -12,7 +12,7 @@ @@ -348,7 +350,7 @@ index 1569913b37..e9c5c2d574 100644 }; diff --git a/bin/tests/system/allow-query/ns2/named11.conf.in b/bin/tests/system/allow-query/ns2/named11.conf.in -index 18ac91c6e7..2b1c8739d8 100644 +index 18ac91c..2b1c873 100644 --- a/bin/tests/system/allow-query/ns2/named11.conf.in +++ b/bin/tests/system/allow-query/ns2/named11.conf.in @@ -12,12 +12,12 @@ @@ -367,7 +369,7 @@ index 18ac91c6e7..2b1c8739d8 100644 }; diff --git a/bin/tests/system/allow-query/ns2/named12.conf.in b/bin/tests/system/allow-query/ns2/named12.conf.in -index b8248444dd..dd48945bf8 100644 +index b824844..dd48945 100644 --- a/bin/tests/system/allow-query/ns2/named12.conf.in +++ b/bin/tests/system/allow-query/ns2/named12.conf.in @@ -12,7 +12,7 @@ @@ -380,7 +382,7 @@ index b8248444dd..dd48945bf8 100644 }; diff --git a/bin/tests/system/allow-query/ns2/named30.conf.in b/bin/tests/system/allow-query/ns2/named30.conf.in -index aeb1540e95..bfce58bddd 100644 +index aeb1540..bfce58b 100644 --- a/bin/tests/system/allow-query/ns2/named30.conf.in +++ b/bin/tests/system/allow-query/ns2/named30.conf.in @@ -12,7 +12,7 @@ @@ -393,7 +395,7 @@ index aeb1540e95..bfce58bddd 100644 }; diff --git a/bin/tests/system/allow-query/ns2/named31.conf.in b/bin/tests/system/allow-query/ns2/named31.conf.in -index d4b743281a..e0f52526ba 100644 +index d4b7432..e0f5252 100644 --- a/bin/tests/system/allow-query/ns2/named31.conf.in +++ b/bin/tests/system/allow-query/ns2/named31.conf.in @@ -12,12 +12,12 @@ @@ -412,7 +414,7 @@ index d4b743281a..e0f52526ba 100644 }; diff --git a/bin/tests/system/allow-query/ns2/named32.conf.in b/bin/tests/system/allow-query/ns2/named32.conf.in -index c0259387e7..87afb3fa3a 100644 +index c025938..87afb3f 100644 --- a/bin/tests/system/allow-query/ns2/named32.conf.in +++ b/bin/tests/system/allow-query/ns2/named32.conf.in @@ -12,7 +12,7 @@ @@ -425,7 +427,7 @@ index c0259387e7..87afb3fa3a 100644 }; diff --git a/bin/tests/system/allow-query/ns2/named40.conf.in b/bin/tests/system/allow-query/ns2/named40.conf.in -index d83b376cfd..d726b9480b 100644 +index d83b376..d726b94 100644 --- a/bin/tests/system/allow-query/ns2/named40.conf.in +++ b/bin/tests/system/allow-query/ns2/named40.conf.in @@ -16,12 +16,12 @@ acl accept { 10.53.0.2; }; @@ -444,7 +446,7 @@ index d83b376cfd..d726b9480b 100644 }; diff --git a/bin/tests/system/allow-query/tests.sh b/bin/tests/system/allow-query/tests.sh -index fb6059d5b8..f9601564a2 100644 +index fb6059d..f960156 100644 --- a/bin/tests/system/allow-query/tests.sh +++ b/bin/tests/system/allow-query/tests.sh @@ -190,7 +190,7 @@ rndc_reload @@ -529,7 +531,7 @@ index fb6059d5b8..f9601564a2 100644 grep '^a.keydisallow.example' dig.out.ns2.$n > /dev/null && ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi diff --git a/bin/tests/system/catz/ns1/named.conf.in b/bin/tests/system/catz/ns1/named.conf.in -index 74b7d371b7..c35376640d 100644 +index 74b7d37..c353766 100644 --- a/bin/tests/system/catz/ns1/named.conf.in +++ b/bin/tests/system/catz/ns1/named.conf.in @@ -61,5 +61,5 @@ zone "catalog4.example" { @@ -540,7 +542,7 @@ index 74b7d371b7..c35376640d 100644 + algorithm hmac-sha256; }; diff --git a/bin/tests/system/catz/ns2/named.conf.in b/bin/tests/system/catz/ns2/named.conf.in -index ee83efbee4..35ced08842 100644 +index ee83efb..35ced08 100644 --- a/bin/tests/system/catz/ns2/named.conf.in +++ b/bin/tests/system/catz/ns2/named.conf.in @@ -70,5 +70,5 @@ zone "catalog4.example" { @@ -551,7 +553,7 @@ index ee83efbee4..35ced08842 100644 + algorithm hmac-sha256; }; diff --git a/bin/tests/system/checkconf/bad-tsig.conf b/bin/tests/system/checkconf/bad-tsig.conf -index 21be03e9d2..e57c30875c 100644 +index 21be03e..e57c308 100644 --- a/bin/tests/system/checkconf/bad-tsig.conf +++ b/bin/tests/system/checkconf/bad-tsig.conf @@ -11,7 +11,7 @@ @@ -564,7 +566,7 @@ index 21be03e9d2..e57c30875c 100644 }; diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf -index 9ab35b38a5..486551ae64 100644 +index 9ab35b3..486551a 100644 --- a/bin/tests/system/checkconf/good.conf +++ b/bin/tests/system/checkconf/good.conf @@ -153,6 +153,6 @@ dyndb "name" "library.so" { @@ -576,7 +578,7 @@ index 9ab35b38a5..486551ae64 100644 secret "qwertyuiopasdfgh"; }; diff --git a/bin/tests/system/digdelv/ns2/example.db b/bin/tests/system/digdelv/ns2/example.db -index f4e30f51e5..9f53e31c97 100644 +index f4e30f5..9f53e31 100644 --- a/bin/tests/system/digdelv/ns2/example.db +++ b/bin/tests/system/digdelv/ns2/example.db @@ -38,12 +38,15 @@ foo SSHFP 2 1 123456789abcdef67890123456789abcdef67890 @@ -602,10 +604,10 @@ index f4e30f51e5..9f53e31c97 100644 ; TTL of 3 weeks weeks 1814400 A 10.53.0.2 diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh -index 1b25c4ddfc..5dbf20a3e1 100644 +index 95bd074..b566ecb 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh -@@ -62,7 +62,7 @@ if [ -x ${DIG} ] ; then +@@ -61,7 +61,7 @@ if [ -x ${DIG} ] ; then echo_i "checking dig +multi +norrcomments works for dnskey (when default is rrcomments)($n)" ret=0 $DIG $DIGOPTS +tcp @10.53.0.3 +multi +norrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1 @@ -614,7 +616,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -70,7 +70,7 @@ if [ -x ${DIG} ] ; then +@@ -69,7 +69,7 @@ if [ -x ${DIG} ] ; then echo_i "checking dig +multi +norrcomments works for soa (when default is rrcomments)($n)" ret=0 $DIG $DIGOPTS +tcp @10.53.0.3 +multi +norrcomments SOA example > dig.out.test$n || ret=1 @@ -623,7 +625,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -78,7 +78,7 @@ if [ -x ${DIG} ] ; then +@@ -77,7 +77,7 @@ if [ -x ${DIG} ] ; then echo_i "checking dig +rrcomments works for DNSKEY($n)" ret=0 $DIG $DIGOPTS +tcp @10.53.0.3 +rrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1 @@ -632,7 +634,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -86,7 +86,7 @@ if [ -x ${DIG} ] ; then +@@ -85,7 +85,7 @@ if [ -x ${DIG} ] ; then echo_i "checking dig +short +rrcomments works for DNSKEY ($n)" ret=0 $DIG $DIGOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1 @@ -641,7 +643,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -94,7 +94,7 @@ if [ -x ${DIG} ] ; then +@@ -93,7 +93,7 @@ if [ -x ${DIG} ] ; then echo_i "checking dig +short +nosplit works($n)" ret=0 $DIG $DIGOPTS +tcp @10.53.0.3 +short +nosplit DNSKEY dnskey.example > dig.out.test$n || ret=1 @@ -650,7 +652,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -102,7 +102,7 @@ if [ -x ${DIG} ] ; then +@@ -101,7 +101,7 @@ if [ -x ${DIG} ] ; then echo_i "checking dig +short +rrcomments works($n)" ret=0 $DIG $DIGOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1 @@ -659,7 +661,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -118,7 +118,7 @@ if [ -x ${DIG} ] ; then +@@ -117,7 +117,7 @@ if [ -x ${DIG} ] ; then echo_i "checking dig +short +rrcomments works($n)" ret=0 $DIG $DIGOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > dig.out.test$n || ret=1 @@ -668,7 +670,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -543,7 +543,7 @@ if [ -x ${DELV} ] ; then +@@ -555,7 +555,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +multi +norrcomments works for dnskey (when default is rrcomments)($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +multi +norrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -677,7 +679,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -551,7 +551,7 @@ if [ -x ${DELV} ] ; then +@@ -563,7 +563,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +multi +norrcomments works for soa (when default is rrcomments)($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +multi +norrcomments SOA example > delv.out.test$n || ret=1 @@ -686,7 +688,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -559,7 +559,7 @@ if [ -x ${DELV} ] ; then +@@ -571,7 +571,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +rrcomments works for DNSKEY($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -695,7 +697,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -567,7 +567,7 @@ if [ -x ${DELV} ] ; then +@@ -579,7 +579,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +short +rrcomments works for DNSKEY ($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -704,7 +706,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -575,7 +575,7 @@ if [ -x ${DELV} ] ; then +@@ -587,7 +587,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +short +rrcomments works ($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +short +rrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -713,7 +715,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -@@ -583,7 +583,7 @@ if [ -x ${DELV} ] ; then +@@ -595,7 +595,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +short +nosplit works ($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +short +nosplit DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -722,7 +724,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 if test `wc -l < delv.out.test$n` != 1 ; then ret=1 ; fi f=`awk '{print NF}' < delv.out.test$n` test "${f:-0}" -eq 14 || ret=1 -@@ -594,7 +594,7 @@ if [ -x ${DELV} ] ; then +@@ -606,7 +606,7 @@ if [ -x ${DELV} ] ; then echo_i "checking delv +short +nosplit +norrcomments works ($n)" ret=0 $DELV $DELVOPTS +tcp @10.53.0.3 +short +nosplit +norrcomments DNSKEY dnskey.example > delv.out.test$n || ret=1 @@ -732,7 +734,7 @@ index 1b25c4ddfc..5dbf20a3e1 100644 f=`awk '{print NF}' < delv.out.test$n` test "${f:-0}" -eq 4 || ret=1 diff --git a/bin/tests/system/dlv/ns1/sign.sh b/bin/tests/system/dlv/ns1/sign.sh -index b8151620cc..2a62e583b8 100755 +index b815162..2a62e58 100755 --- a/bin/tests/system/dlv/ns1/sign.sh +++ b/bin/tests/system/dlv/ns1/sign.sh @@ -23,8 +23,8 @@ infile=root.db.in @@ -747,7 +749,7 @@ index b8151620cc..2a62e583b8 100755 cat $infile $keyname1.key $keyname2.key >$zonefile diff --git a/bin/tests/system/dlv/ns2/sign.sh b/bin/tests/system/dlv/ns2/sign.sh -index 6f84d7a525..e128303a22 100755 +index 6f84d7a..e128303 100755 --- a/bin/tests/system/dlv/ns2/sign.sh +++ b/bin/tests/system/dlv/ns2/sign.sh @@ -24,8 +24,8 @@ zonefile=druz.db @@ -762,7 +764,7 @@ index 6f84d7a525..e128303a22 100755 cat $infile $keyname1.key $keyname2.key >$zonefile diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh -index bcc9922e26..846dbcc0df 100755 +index bcc9922..846dbcc 100755 --- a/bin/tests/system/dlv/ns3/sign.sh +++ b/bin/tests/system/dlv/ns3/sign.sh @@ -19,6 +19,7 @@ echo_i "dlv/ns3/sign.sh" @@ -961,7 +963,7 @@ index bcc9922e26..846dbcc0df 100755 cat $infile $dlvsets $keyname1.key $keyname2.key >$zonefile diff --git a/bin/tests/system/dlv/ns6/sign.sh b/bin/tests/system/dlv/ns6/sign.sh -index 1e398625f1..4ed19acd1f 100755 +index 1e39862..4ed19ac 100755 --- a/bin/tests/system/dlv/ns6/sign.sh +++ b/bin/tests/system/dlv/ns6/sign.sh @@ -16,13 +16,15 @@ SYSTESTDIR=dlv @@ -1148,7 +1150,7 @@ index 1e398625f1..4ed19acd1f 100755 cat $infile $keyname1.key $keyname2.key >$zonefile diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh -index 198d60ae15..d89a539ffd 100644 +index 198d60a..d89a539 100644 --- a/bin/tests/system/dnssec/ns1/sign.sh +++ b/bin/tests/system/dnssec/ns1/sign.sh @@ -27,7 +27,7 @@ cp ../ns2/dsset-in-addr.arpa$TP . @@ -1169,7 +1171,7 @@ index 198d60ae15..d89a539ffd 100644 keyid=`expr $keyid + 0` echo "$keyid" > managed.key.id diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh -index 9078459ac8..9dcd028eb5 100644 +index 9078459..9dcd028 100644 --- a/bin/tests/system/dnssec/ns2/sign.sh +++ b/bin/tests/system/dnssec/ns2/sign.sh @@ -29,8 +29,8 @@ do @@ -1213,7 +1215,7 @@ index 9078459ac8..9dcd028eb5 100644 cat $dlvinfile $dlvkeyname.key $dlvsetfile > $dlvzonefile diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh -index 330abf7feb..f95a6b7ea8 100644 +index 330abf7..f95a6b7 100644 --- a/bin/tests/system/dnssec/ns3/sign.sh +++ b/bin/tests/system/dnssec/ns3/sign.sh @@ -28,7 +28,7 @@ zone=bogus.example. @@ -1300,7 +1302,7 @@ index 330abf7feb..f95a6b7ea8 100644 cat $infile $keyname.key >$zonefile diff --git a/bin/tests/system/dnssec/ns5/trusted.conf.bad b/bin/tests/system/dnssec/ns5/trusted.conf.bad -index ed30460bda..e6b112630e 100644 +index ed30460..e6b1126 100644 --- a/bin/tests/system/dnssec/ns5/trusted.conf.bad +++ b/bin/tests/system/dnssec/ns5/trusted.conf.bad @@ -10,5 +10,5 @@ @@ -1311,7 +1313,7 @@ index ed30460bda..e6b112630e 100644 + "." 256 3 8 "AwEAAarwAdjV4gIhpBCjXVAScRFEx3co7k8smJdxrnqoGsl5NB7EZ9jRdgvCXbJn6v8y9jlNWVHvaC8ilhfhLh0A1vLWiWv4ijd/12xcnrY7xpG7Cu3YkxUxaXJ7Jdg/Iw1+9mGgXF1v4UbCIcw/3U3cxyk7OxYg+VSb5KBAQSR0upxV"; }; diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh -index bb2315fbf3..315666825e 100644 +index bb2315f..3156668 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -1690,7 +1690,7 @@ ret=0 @@ -1344,7 +1346,7 @@ index bb2315fbf3..315666825e 100644 8) size="-b 512";; 10) size="-b 1024";; diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c -index 9612450ab4..5eee6aa4f8 100644 +index 9612450..5eee6aa 100644 --- a/bin/tests/system/feature-test.c +++ b/bin/tests/system/feature-test.c @@ -19,6 +19,7 @@ @@ -1383,7 +1385,7 @@ index 9612450ab4..5eee6aa4f8 100644 #ifdef ENABLE_RPZ_NSIP return (0); diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filter-aaaa/ns1/sign.sh -index f7555810a0..4a7d89004a 100755 +index f755581..4a7d890 100755 --- a/bin/tests/system/filter-aaaa/ns1/sign.sh +++ b/bin/tests/system/filter-aaaa/ns1/sign.sh @@ -21,8 +21,8 @@ infile=signed.db.in @@ -1398,7 +1400,7 @@ index f7555810a0..4a7d89004a 100755 cat $infile $keyname1.key $keyname2.key >$zonefile diff --git a/bin/tests/system/filter-aaaa/ns4/sign.sh b/bin/tests/system/filter-aaaa/ns4/sign.sh -index f7555810a0..4a7d89004a 100755 +index f755581..4a7d890 100755 --- a/bin/tests/system/filter-aaaa/ns4/sign.sh +++ b/bin/tests/system/filter-aaaa/ns4/sign.sh @@ -21,8 +21,8 @@ infile=signed.db.in @@ -1413,7 +1415,7 @@ index f7555810a0..4a7d89004a 100755 cat $infile $keyname1.key $keyname2.key >$zonefile diff --git a/bin/tests/system/notify/ns5/named.conf.in b/bin/tests/system/notify/ns5/named.conf.in -index cfcfe8fa2f..0a1614d527 100644 +index cfcfe8f..0a1614d 100644 --- a/bin/tests/system/notify/ns5/named.conf.in +++ b/bin/tests/system/notify/ns5/named.conf.in @@ -10,17 +10,17 @@ @@ -1438,7 +1440,7 @@ index cfcfe8fa2f..0a1614d527 100644 }; diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh -index ad20e3eaca..5a9ce4688a 100644 +index ad20e3e..5a9ce46 100644 --- a/bin/tests/system/notify/tests.sh +++ b/bin/tests/system/notify/tests.sh @@ -186,16 +186,16 @@ ret=0 @@ -1462,7 +1464,7 @@ index ad20e3eaca..5a9ce4688a 100644 grep "test string" dig.out.b.ns5.test$n > /dev/null && grep "test string" dig.out.c.ns5.test$n > /dev/null && diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in -index 1d999adc39..26b6b7c9ab 100644 +index 1d999ad..26b6b7c 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf.in +++ b/bin/tests/system/nsupdate/ns1/named.conf.in @@ -32,7 +32,7 @@ controls { @@ -1475,7 +1477,7 @@ index 1d999adc39..26b6b7c9ab 100644 }; diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in -index b4ecf96668..1adb33eb0b 100644 +index b4ecf96..1adb33e 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf.in +++ b/bin/tests/system/nsupdate/ns2/named.conf.in @@ -24,7 +24,7 @@ options { @@ -1488,10 +1490,10 @@ index b4ecf96668..1adb33eb0b 100644 }; diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh -index 32674eb382..2331b30b00 100644 +index d6647fa..715314b 100644 --- a/bin/tests/system/nsupdate/setup.sh +++ b/bin/tests/system/nsupdate/setup.sh -@@ -59,7 +59,12 @@ EOF +@@ -63,7 +63,12 @@ EOF $DDNSCONFGEN -q -r $RANDFILE -z example.nil > ns1/ddns.key @@ -1506,10 +1508,10 @@ index 32674eb382..2331b30b00 100644 $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha224 -k sha224-key -z keytests.nil > ns1/sha224.key $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha256 -k sha256-key -z keytests.nil > ns1/sha256.key diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh -index 2a01d1e46d..e8659587c3 100755 +index 9f26572..fd0383f 100755 --- a/bin/tests/system/nsupdate/tests.sh +++ b/bin/tests/system/nsupdate/tests.sh -@@ -680,7 +680,14 @@ fi +@@ -700,7 +700,14 @@ fi n=`expr $n + 1` ret=0 echo_i "check TSIG key algorithms ($n)" @@ -1525,7 +1527,7 @@ index 2a01d1e46d..e8659587c3 100755 $NSUPDATE -k ns1/${alg}.key <<END > /dev/null || ret=1 server 10.53.0.1 ${PORT} update add ${alg}.keytests.nil. 600 A 10.10.10.3 -@@ -688,7 +695,7 @@ send +@@ -708,7 +715,7 @@ send END done sleep 2 @@ -1535,7 +1537,7 @@ index 2a01d1e46d..e8659587c3 100755 done if [ $ret -ne 0 ]; then diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh -index 850c4d2744..09a3e0f9ad 100644 +index 850c4d2..09a3e0f 100644 --- a/bin/tests/system/rndc/setup.sh +++ b/bin/tests/system/rndc/setup.sh @@ -37,7 +37,7 @@ make_key () { @@ -1548,7 +1550,7 @@ index 850c4d2744..09a3e0f9ad 100644 make_key 3 ${EXTRAPORT3} hmac-sha224 make_key 4 ${EXTRAPORT4} hmac-sha256 diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh -index d364e6fea0..dbf3bc6780 100644 +index 647730e..7df752d 100644 --- a/bin/tests/system/rndc/tests.sh +++ b/bin/tests/system/rndc/tests.sh @@ -356,15 +356,20 @@ if [ $ret != 0 ]; then echo_i "failed"; fi @@ -1582,7 +1584,7 @@ index d364e6fea0..dbf3bc6780 100644 n=`expr $n + 1` echo_i "testing rndc with hmac-sha1 ($n)" diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh -index 576ec70f76..cb7a852189 100644 +index 576ec70..cb7a852 100644 --- a/bin/tests/system/tsig/clean.sh +++ b/bin/tests/system/tsig/clean.sh @@ -20,3 +20,4 @@ rm -f */named.run @@ -1591,7 +1593,7 @@ index 576ec70f76..cb7a852189 100644 rm -f keygen.out? +rm -f ns1/named.conf diff --git a/bin/tests/system/tsig/ns1/named.conf.in b/bin/tests/system/tsig/ns1/named.conf.in -index fbf30c6dc4..f61657d7cf 100644 +index fbf30c6..f61657d 100644 --- a/bin/tests/system/tsig/ns1/named.conf.in +++ b/bin/tests/system/tsig/ns1/named.conf.in @@ -21,10 +21,7 @@ options { @@ -1620,7 +1622,7 @@ index fbf30c6dc4..f61657d7cf 100644 secret "FrSt77yPTFx6hTs4i2tKLB9LmE0="; diff --git a/bin/tests/system/tsig/ns1/rndc5.conf.in b/bin/tests/system/tsig/ns1/rndc5.conf.in new file mode 100644 -index 0000000000..4117830adb +index 0000000..4117830 --- /dev/null +++ b/bin/tests/system/tsig/ns1/rndc5.conf.in @@ -0,0 +1,11 @@ @@ -1636,7 +1638,7 @@ index 0000000000..4117830adb +}; + diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh -index 656e9bbcd8..628c5bbac1 100644 +index 656e9bb..628c5bb 100644 --- a/bin/tests/system/tsig/setup.sh +++ b/bin/tests/system/tsig/setup.sh @@ -17,3 +17,7 @@ $SHELL clean.sh @@ -1648,7 +1650,7 @@ index 656e9bbcd8..628c5bbac1 100644 + cat ns1/rndc5.conf.in >> ns1/named.conf +fi diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh -index f731fa604c..cade35bc1d 100644 +index f731fa6..cade35b 100644 --- a/bin/tests/system/tsig/tests.sh +++ b/bin/tests/system/tsig/tests.sh @@ -26,20 +26,25 @@ sha512="jI/Pa4qRu96t76Pns5Z/Ndxbn3QCkwcxLOgt9vgvnJw5wqTRvNyk3FtD6yIMd1dWVlqZ+Y4f @@ -1740,7 +1742,7 @@ index f731fa604c..cade35bc1d 100644 echo_i "fetching using hmac-sha1-80 (BADTRUNC)" diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh -index 5da33cfde0..fb108b02bd 100644 +index 5da33cf..fb108b0 100644 --- a/bin/tests/system/tsiggss/setup.sh +++ b/bin/tests/system/tsiggss/setup.sh @@ -18,5 +18,5 @@ test -r $RANDFILE || $GENRANDOM 400 $RANDFILE @@ -1751,7 +1753,7 @@ index 5da33cfde0..fb108b02bd 100644 +key=`$KEYGEN -Cq -K ns1 -a DSA -b 1024 -r $RANDFILE -n HOST -T KEY key.example.nil.` cat ns1/example.nil.db.in ns1/${key}.key > ns1/example.nil.db diff --git a/bin/tests/system/upforwd/ns1/named.conf.in b/bin/tests/system/upforwd/ns1/named.conf.in -index e0a30cda15..6a77b1ce52 100644 +index e0a30cd..6a77b1c 100644 --- a/bin/tests/system/upforwd/ns1/named.conf.in +++ b/bin/tests/system/upforwd/ns1/named.conf.in @@ -10,7 +10,7 @@ @@ -1764,7 +1766,7 @@ index e0a30cda15..6a77b1ce52 100644 }; diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh -index b0694bbd5c..9adae8228e 100644 +index b0694bb..9adae82 100644 --- a/bin/tests/system/upforwd/tests.sh +++ b/bin/tests/system/upforwd/tests.sh @@ -68,7 +68,7 @@ if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi diff --git a/bind-9.11-host-idn-disable.patch b/bind-9.11-host-idn-disable.patch index 434c596..7d52964 100644 --- a/bind-9.11-host-idn-disable.patch +++ b/bind-9.11-host-idn-disable.patch @@ -1,4 +1,4 @@ -From 145fac914bf47128307aea702fed7eb74b65cadd Mon Sep 17 00:00:00 2001 +From ed26f0f0eb4242706d2012e4abe0152071bb305b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Tue, 25 Sep 2018 18:08:46 +0200 Subject: [PATCH] Disable IDN from environment as documented @@ -18,7 +18,7 @@ RH patch since RHEL 5. 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook -index fedd288..d5dba72 100644 +index bd7510e..5cc696f 100644 --- a/bin/dig/dig.docbook +++ b/bin/dig/dig.docbook @@ -1288,7 +1288,9 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr @@ -33,28 +33,28 @@ index fedd288..d5dba72 100644 </refsection> diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c -index 7408193..d46379d 100644 +index 341ed80..bb8702c 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c -@@ -822,12 +822,17 @@ make_empty_lookup(void) { - looknew->seenbadcookie = ISC_FALSE; - looknew->badcookie = ISC_TRUE; +@@ -825,12 +825,17 @@ make_empty_lookup(void) { + looknew->seenbadcookie = false; + looknew->badcookie = true; #ifdef WITH_IDN_SUPPORT -- looknew->idnin = ISC_TRUE; +- looknew->idnin = true; + looknew->idnin = (getenv("IDN_DISABLE") == NULL); + if (looknew->idnin) { + const char *charset = getenv("CHARSET"); + if (charset && !strcmp(charset, "ASCII")) -+ looknew->idnin = ISC_FALSE; ++ looknew->idnin = false; + } #else - looknew->idnin = ISC_FALSE; + looknew->idnin = false; #endif #ifdef WITH_IDN_OUT_SUPPORT -- looknew->idnout = ISC_TRUE; +- looknew->idnout = true; + looknew->idnout = looknew->idnin; #else - looknew->idnout = ISC_FALSE; + looknew->idnout = false; #endif diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook index 9c3aeaa..42cbbf9 100644 diff --git a/bind-9.11-kyua-pkcs11.patch b/bind-9.11-kyua-pkcs11.patch index ab21828..1b83800 100644 --- a/bind-9.11-kyua-pkcs11.patch +++ b/bind-9.11-kyua-pkcs11.patch @@ -1,4 +1,4 @@ -From d0433a314534e104f52acf2a0a96a68dd84305ae Mon Sep 17 00:00:00 2001 +From 3474d13bbf08c441783bd72afbc8cec8857baf46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Tue, 2 Jan 2018 18:13:07 +0100 Subject: [PATCH] Fix pkcs11 variants atf tests @@ -17,10 +17,10 @@ Add pkcs11 Kyuafile, fix dh_test to pass in pkcs11 mode 7 files changed, 40 insertions(+), 16 deletions(-) diff --git a/configure.in b/configure.in -index 67b3aab..4767eeb 100644 +index 1edafd1..5466de1 100644 --- a/configure.in +++ b/configure.in -@@ -5579,6 +5579,7 @@ AC_CONFIG_FILES([ +@@ -5489,6 +5489,7 @@ AC_CONFIG_FILES([ lib/dns-pkcs11/include/Makefile lib/dns-pkcs11/include/dns/Makefile lib/dns-pkcs11/include/dst/Makefile @@ -57,10 +57,10 @@ index ff9fc56..eaaf0dc 100644 include('isccfg/Kyuafile') include('lwres/Kyuafile') diff --git a/lib/dns-pkcs11/tests/Makefile.in b/lib/dns-pkcs11/tests/Makefile.in -index 2a6571b..f25a784 100644 +index 625e809..6fd4e36 100644 --- a/lib/dns-pkcs11/tests/Makefile.in +++ b/lib/dns-pkcs11/tests/Makefile.in -@@ -20,12 +20,12 @@ VERSION=@BIND9_VERSION@ +@@ -21,12 +21,12 @@ VERSION=@BIND9_VERSION@ CINCLUDES = -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \ @DST_OPENSSL_INC@ @@ -79,10 +79,10 @@ index 2a6571b..f25a784 100644 LIBS = @LIBS@ @ATFLIBS@ diff --git a/lib/dns-pkcs11/tests/dh_test.c b/lib/dns-pkcs11/tests/dh_test.c -index 036d27a..eb6554f 100644 +index 6216b4e..dd74e58 100644 --- a/lib/dns-pkcs11/tests/dh_test.c +++ b/lib/dns-pkcs11/tests/dh_test.c -@@ -63,7 +63,8 @@ ATF_TC_BODY(isc_dh_computesecret, tc) { +@@ -64,7 +64,8 @@ ATF_TC_BODY(isc_dh_computesecret, tc) { ret = dst_key_computesecret(key, key, &buf); ATF_REQUIRE_EQ(ret, DST_R_NOTPRIVATEKEY); ret = key->func->computesecret(key, key, &buf); @@ -93,10 +93,10 @@ index 036d27a..eb6554f 100644 dst_key_free(&key); dns_test_end(); diff --git a/lib/isc-pkcs11/tests/Makefile.in b/lib/isc-pkcs11/tests/Makefile.in -index f7fa538..818dae4 100644 +index add8068..a928dcf 100644 --- a/lib/isc-pkcs11/tests/Makefile.in +++ b/lib/isc-pkcs11/tests/Makefile.in -@@ -17,10 +17,10 @@ VERSION=@BIND9_VERSION@ +@@ -20,10 +20,10 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @ISC_OPENSSL_INC@ @@ -111,10 +111,10 @@ index f7fa538..818dae4 100644 LIBS = @LIBS@ @ATFLIBS@ diff --git a/lib/isc-pkcs11/tests/hash_test.c b/lib/isc-pkcs11/tests/hash_test.c -index 5b8a374..c1891c2 100644 +index 7eb1552..048ae9d 100644 --- a/lib/isc-pkcs11/tests/hash_test.c +++ b/lib/isc-pkcs11/tests/hash_test.c -@@ -74,7 +74,7 @@ typedef struct hash_testcase { +@@ -78,7 +78,7 @@ typedef struct hash_testcase { typedef struct hash_test_key { const char *key; @@ -123,7 +123,7 @@ index 5b8a374..c1891c2 100644 } hash_test_key_t; /* non-hmac tests */ -@@ -957,8 +957,11 @@ ATF_TC_BODY(isc_hmacsha1, tc) { +@@ -961,8 +961,11 @@ ATF_TC_BODY(isc_hmacsha1, tc) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -134,9 +134,9 @@ index 5b8a374..c1891c2 100644 - isc_hmacsha1_init(&hmacsha1, buffer, test_key->len); + isc_hmacsha1_init(&hmacsha1, buffer, len); isc_hmacsha1_update(&hmacsha1, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); -@@ -1120,8 +1123,11 @@ ATF_TC_BODY(isc_hmacsha224, tc) { +@@ -1124,8 +1127,11 @@ ATF_TC_BODY(isc_hmacsha224, tc) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -147,9 +147,9 @@ index 5b8a374..c1891c2 100644 - isc_hmacsha224_init(&hmacsha224, buffer, test_key->len); + isc_hmacsha224_init(&hmacsha224, buffer, len); isc_hmacsha224_update(&hmacsha224, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); -@@ -1283,8 +1289,11 @@ ATF_TC_BODY(isc_hmacsha256, tc) { +@@ -1287,8 +1293,11 @@ ATF_TC_BODY(isc_hmacsha256, tc) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -160,9 +160,9 @@ index 5b8a374..c1891c2 100644 - isc_hmacsha256_init(&hmacsha256, buffer, test_key->len); + isc_hmacsha256_init(&hmacsha256, buffer, len); isc_hmacsha256_update(&hmacsha256, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); -@@ -1452,8 +1461,11 @@ ATF_TC_BODY(isc_hmacsha384, tc) { +@@ -1456,8 +1465,11 @@ ATF_TC_BODY(isc_hmacsha384, tc) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -173,9 +173,9 @@ index 5b8a374..c1891c2 100644 - isc_hmacsha384_init(&hmacsha384, buffer, test_key->len); + isc_hmacsha384_init(&hmacsha384, buffer, len); isc_hmacsha384_update(&hmacsha384, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); -@@ -1621,8 +1633,11 @@ ATF_TC_BODY(isc_hmacsha512, tc) { +@@ -1625,8 +1637,11 @@ ATF_TC_BODY(isc_hmacsha512, tc) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -186,9 +186,9 @@ index 5b8a374..c1891c2 100644 - isc_hmacsha512_init(&hmacsha512, buffer, test_key->len); + isc_hmacsha512_init(&hmacsha512, buffer, len); isc_hmacsha512_update(&hmacsha512, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); -@@ -1765,8 +1780,11 @@ ATF_TC_BODY(isc_hmacmd5, tc) { +@@ -1769,8 +1784,11 @@ ATF_TC_BODY(isc_hmacmd5, tc) { hash_test_key_t *test_key = test_keys; while (testcase->input != NULL && testcase->result != NULL) { @@ -199,8 +199,8 @@ index 5b8a374..c1891c2 100644 - isc_hmacmd5_init(&hmacmd5, buffer, test_key->len); + isc_hmacmd5_init(&hmacmd5, buffer, len); isc_hmacmd5_update(&hmacmd5, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); -- -2.14.3 +2.14.4 diff --git a/bind-9.11-oot-manual.patch b/bind-9.11-oot-manual.patch index b090b9f..84e9d25 100644 --- a/bind-9.11-oot-manual.patch +++ b/bind-9.11-oot-manual.patch @@ -1,4 +1,4 @@ -From e462d022a9dc52c40aece6f8ba3123ff3ffa59ed Mon Sep 17 00:00:00 2001 +From 8ca95f47231822df2b9c171a4da1e93ca5b748eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com> Date: Wed, 25 Jul 2018 12:24:16 +0200 Subject: [PATCH] Use make automatic variables to install updated manuals @@ -19,7 +19,7 @@ Install all files in single command instead of iterating on each of them. 9 files changed, 54 insertions(+), 38 deletions(-) diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in -index 12f48d2d23..d8eac4c714 100644 +index c124e80..1174f8d 100644 --- a/bin/check/Makefile.in +++ b/bin/check/Makefile.in @@ -83,12 +83,14 @@ installdirs: @@ -35,13 +35,13 @@ index 12f48d2d23..d8eac4c714 100644 ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkconf@EXEEXT@ ${DESTDIR}${sbindir} ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkzone@EXEEXT@ ${DESTDIR}${sbindir} (cd ${DESTDIR}${sbindir}; rm -f named-compilezone@EXEEXT@; ${LINK_PROGRAM} named-checkzone@EXEEXT@ named-compilezone@EXEEXT@) -- for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done +- for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8 || exit 1; done - (cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8) uninstall:: rm -f ${DESTDIR}${mandir}/man8/named-compilezone.8 diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in -index 87f13dda4b..7865c0c73e 100644 +index 87f13dd..7865c0c 100644 --- a/bin/confgen/Makefile.in +++ b/bin/confgen/Makefile.in @@ -95,13 +95,14 @@ installdirs: @@ -64,7 +64,7 @@ index 87f13dda4b..7865c0c73e 100644 uninstall:: rm -f ${DESTDIR}${mandir}/man8/tsig-keygen.8 diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in -index e2d2802262..19361a83ea 100644 +index e2d2802..19361a8 100644 --- a/bin/delv/Makefile.in +++ b/bin/delv/Makefile.in @@ -63,10 +63,12 @@ installdirs: @@ -83,7 +83,7 @@ index e2d2802262..19361a83ea 100644 uninstall:: rm -f ${DESTDIR}${mandir}/man1/delv.1 diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in -index 773ac46395..3edd951e7e 100644 +index a9830a9..d7ac0b6 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -91,16 +91,16 @@ installdirs: @@ -102,13 +102,13 @@ index 773ac46395..3edd951e7e 100644 ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \ nslookup@EXEEXT@ ${DESTDIR}${bindir} - for m in ${MANPAGES}; do \ -- ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1; \ -- done +- ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1 || exit 1; \ +- done uninstall:: for m in ${MANPAGES}; do \ diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in -index 1be1d5ffc6..1d0c4ce5c1 100644 +index 2239ad1..ce0a177 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in @@ -110,9 +110,11 @@ installdirs: @@ -120,16 +120,16 @@ index 1be1d5ffc6..1d0c4ce5c1 100644 + ${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8 + +install:: ${TARGETS} installdirs install-man8 - for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir}; done -- for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done + for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir} || exit 1; done +- for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8 || exit 1; done uninstall:: - for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done + for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in -index 1c413973d0..03e4cb849b 100644 +index e1f85a9..d92bc9a 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in -@@ -172,12 +172,17 @@ installdirs: +@@ -176,12 +176,17 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5 $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8 @@ -152,7 +152,7 @@ index 1c413973d0..03e4cb849b 100644 uninstall:: rm -f ${DESTDIR}${mandir}/man5/named.conf.5 diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in -index ae9061626c..a058c91214 100644 +index ae90616..a058c91 100644 --- a/bin/pkcs11/Makefile.in +++ b/bin/pkcs11/Makefile.in @@ -71,7 +71,10 @@ installdirs: @@ -179,7 +179,7 @@ index ae9061626c..a058c91214 100644 uninstall:: rm -f ${DESTDIR}${mandir}/man8/pkcs11-tokens.8 diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in -index aa678d47ab..064c404e2f 100644 +index aa678d4..064c404 100644 --- a/bin/python/Makefile.in +++ b/bin/python/Makefile.in @@ -47,13 +47,13 @@ installdirs: @@ -201,7 +201,7 @@ index aa678d47ab..064c404e2f 100644 if test -n "${DESTDIR}" ; then \ ${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \ diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in -index 7bf2af4cea..c395bc7462 100644 +index 7bf2af4..c395bc7 100644 --- a/bin/tools/Makefile.in +++ b/bin/tools/Makefile.in @@ -119,17 +119,27 @@ installdirs: diff --git a/bind-9.11-rh1624100.patch b/bind-9.11-rh1624100.patch index 954661c..b17a6ca 100644 --- a/bind-9.11-rh1624100.patch +++ b/bind-9.11-rh1624100.patch @@ -1,4 +1,4 @@ -From 25ff8ab2b0772262d358272a3ed70a24fc6e4887 Mon Sep 17 00:00:00 2001 +From 4fc49ad102fd00343665273caf4349d4edb5e5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej(a)sury.org> Date: Wed, 25 Apr 2018 14:04:31 +0200 Subject: [PATCH] Replace isc_safe routines with their OpenSSL counter parts @@ -17,17 +17,17 @@ Fix the isc_safe_memwipe() usage with (NULL, >0) lib/dns/nsec3.c | 4 +-- lib/dns/spnego.c | 4 +-- lib/isc/Makefile.in | 8 ++--- - lib/isc/include/isc/safe.h | 18 ++++------ - lib/isc/safe.c | 81 -------------------------------------------- + lib/isc/include/isc/safe.h | 18 +++------- + lib/isc/safe.c | 83 -------------------------------------------- lib/isc/tests/safe_test.c | 20 ----------- - 7 files changed, 13 insertions(+), 124 deletions(-) + 7 files changed, 11 insertions(+), 128 deletions(-) delete mode 100644 lib/isc/safe.c diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c -index 53be1f5c60..351296a356 100644 +index 6ddaebe..d921870 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c -@@ -786,7 +786,7 @@ hashlist_add_dns_name(hashlist_t *l, /*const*/ dns_name_t *name, +@@ -787,7 +787,7 @@ hashlist_add_dns_name(hashlist_t *l, /*const*/ dns_name_t *name, static int hashlist_comp(const void *a, const void *b) { @@ -37,10 +37,10 @@ index 53be1f5c60..351296a356 100644 static void diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c -index d364308aaf..37b6a8a7fe 100644 +index e127893..895519e 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c -@@ -1950,7 +1950,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, +@@ -1953,7 +1953,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, * Work out what this NSEC3 covers. * Inside (<0) or outside (>=0). */ @@ -49,7 +49,7 @@ index d364308aaf..37b6a8a7fe 100644 /* * Prepare to compute all the hashes. -@@ -1974,7 +1974,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, +@@ -1977,7 +1977,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, return (ISC_R_IGNORE); } @@ -59,10 +59,10 @@ index d364308aaf..37b6a8a7fe 100644 /* * The hashes are the same. diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c -index ce3e42d650..079d4c1b4a 100644 +index ad77f24..670982a 100644 --- a/lib/dns/spnego.c +++ b/lib/dns/spnego.c -@@ -369,7 +369,7 @@ gssapi_spnego_decapsulate(OM_uint32 *, +@@ -371,7 +371,7 @@ gssapi_spnego_decapsulate(OM_uint32 *, /* mod_auth_kerb.c */ @@ -71,7 +71,7 @@ index ce3e42d650..079d4c1b4a 100644 cmp_gss_type(gss_buffer_t token, gss_OID gssoid) { unsigned char *p; -@@ -393,7 +393,7 @@ cmp_gss_type(gss_buffer_t token, gss_OID gssoid) +@@ -395,7 +395,7 @@ cmp_gss_type(gss_buffer_t token, gss_OID gssoid) if (((OM_uint32) *p++) != gssoid->length) return (GSS_S_DEFECTIVE_TOKEN); @@ -81,7 +81,7 @@ index ce3e42d650..079d4c1b4a 100644 /* accept_sec_context.c */ diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in -index ba53ef1091..98acffffc9 100644 +index ba53ef1..98acfff 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -60,7 +60,7 @@ OBJS = @ISC_EXTRA_OBJS@ @ISC_PK11_O@ @ISC_PK11_RESULT_O@ \ @@ -114,28 +114,28 @@ index ba53ef1091..98acffffc9 100644 ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \ -DVERSION=\"${VERSION}\" \ diff --git a/lib/isc/include/isc/safe.h b/lib/isc/include/isc/safe.h -index f29f00bac6..b8a0b2290c 100644 +index 66ed08b..88b8f47 100644 --- a/lib/isc/include/isc/safe.h +++ b/lib/isc/include/isc/safe.h -@@ -15,27 +15,21 @@ +@@ -15,29 +15,19 @@ /*! \file isc/safe.h */ +-#include <stdbool.h> +- -#include <isc/types.h> -#include <stdlib.h> -+#include <isc/boolean.h> +#include <isc/lang.h> -+ +#include <openssl/crypto.h> ISC_LANG_BEGINDECLS --isc_boolean_t +-bool -isc_safe_memequal(const void *s1, const void *s2, size_t n); -+#define isc_safe_memequal(s1, s2, n) ISC_TF(!CRYPTO_memcmp(s1, s2, n)) ++#define isc_safe_memequal(s1, s2, n) !CRYPTO_memcmp(s1, s2, n) /*%< - * Returns ISC_TRUE iff. two blocks of memory are equal, otherwise - * ISC_FALSE. + * Returns true iff. two blocks of memory are equal, otherwise + * false. * */ @@ -153,10 +153,10 @@ index f29f00bac6..b8a0b2290c 100644 * diff --git a/lib/isc/safe.c b/lib/isc/safe.c deleted file mode 100644 -index 5c9e1e2d13..0000000000 +index 7a464b6..0000000 --- a/lib/isc/safe.c +++ /dev/null -@@ -1,81 +0,0 @@ +@@ -1,83 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * @@ -172,6 +172,8 @@ index 5c9e1e2d13..0000000000 - -#include <config.h> - +-#include <stdbool.h> +- -#include <isc/safe.h> -#include <isc/string.h> -#include <isc/util.h> @@ -184,18 +186,18 @@ index 5c9e1e2d13..0000000000 -#pragma optimize("", off) -#endif - --isc_boolean_t +-bool -isc_safe_memequal(const void *s1, const void *s2, size_t n) { -- isc_uint8_t acc = 0; +- uint8_t acc = 0; - - if (n != 0U) { -- const isc_uint8_t *p1 = s1, *p2 = s2; +- const uint8_t *p1 = s1, *p2 = s2; - - do { - acc |= *p1++ ^ *p2++; - } while (--n != 0U); - } -- return (ISC_TF(acc == 0)); +- return (acc == 0); -} - - @@ -239,7 +241,7 @@ index 5c9e1e2d13..0000000000 -#endif -} diff --git a/lib/isc/tests/safe_test.c b/lib/isc/tests/safe_test.c -index f721cd1096..ea3e61f98d 100644 +index f721cd1..ea3e61f 100644 --- a/lib/isc/tests/safe_test.c +++ b/lib/isc/tests/safe_test.c @@ -39,24 +39,6 @@ ATF_TC_BODY(isc_safe_memequal, tc) { diff --git a/bind-9.11-rt31459.patch b/bind-9.11-rt31459.patch index 6208ef2..06847bf 100644 --- a/bind-9.11-rt31459.patch +++ b/bind-9.11-rt31459.patch @@ -1,4 +1,4 @@ -From ae9c9ef5a5ba06cf57b5a87b5f2bbc71649ba41b Mon Sep 17 00:00:00 2001 +From 45209f5153693339c4582795714b6859693673fc Mon Sep 17 00:00:00 2001 From: Evan Hunt <each(a)isc.org> Date: Tue, 12 Sep 2017 19:05:46 -0700 Subject: [PATCH] rebased rt31459c @@ -24,7 +24,7 @@ Include new unit test bin/named/server.c | 6 + bin/nsupdate/nsupdate.c | 18 ++- bin/tests/makejournal.c | 6 +- - bin/tests/system/pipelined/pipequeries.c | 20 ++- + bin/tests/system/pipelined/pipequeries.c | 21 ++- bin/tests/system/pipelined/tests.sh | 4 +- bin/tests/system/rsabigexponent/bigkey.c | 4 + bin/tests/system/tkey/keycreate.c | 26 +++- @@ -35,14 +35,14 @@ Include new unit test configure.in | 77 +++++++++- lib/dns/dst_api.c | 21 ++- lib/dns/include/dst/dst.h | 8 + - lib/dns/lib.c | 17 ++- + lib/dns/lib.c | 15 +- lib/dns/openssl_link.c | 72 ++++++++- lib/dns/pkcs11.c | 29 +++- lib/dns/tests/Atffile | 1 + lib/dns/tests/Kyuafile | 1 + lib/dns/tests/Makefile.in | 7 + lib/dns/tests/dnstest.c | 14 +- - lib/dns/tests/dstrandom_test.c | 105 +++++++++++++ + lib/dns/tests/dstrandom_test.c | 99 ++++++++++++ lib/dns/win32/libdns.def.in | 7 + lib/isc/entropy.c | 24 +++ lib/isc/include/isc/entropy.h | 12 ++ @@ -51,11 +51,11 @@ Include new unit test lib/isc/pk11.c | 12 +- lib/isc/win32/include/isc/platform.h.in | 5 + win32utils/Configure | 29 +++- - 38 files changed, 704 insertions(+), 184 deletions(-) + 38 files changed, 699 insertions(+), 182 deletions(-) create mode 100644 lib/dns/tests/dstrandom_test.c diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c -index 11cc54d..fa439cc 100644 +index 5015abb..295e16f 100644 --- a/bin/confgen/keygen.c +++ b/bin/confgen/keygen.c @@ -165,6 +165,13 @@ generate_key(isc_mem_t *mctx, const char *randomfile, dns_secalg_t alg, @@ -66,17 +66,17 @@ index 11cc54d..fa439cc 100644 + if (randomfile != NULL && + strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { + randomfile = NULL; -+ isc_entropy_usehook(ectx, ISC_TRUE); ++ isc_entropy_usehook(ectx, true); + } +#endif DO("start entropy source", isc_entropy_usebestsource(ectx, &entropy_source, randomfile, diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c -index 94a982c..897c497 100644 +index 65fdaaa..6612189 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c -@@ -495,14 +495,14 @@ main(int argc, char **argv) { +@@ -497,14 +497,14 @@ main(int argc, char **argv) { if (ectx == NULL) setup_entropy(mctx, NULL, &ectx); @@ -94,7 +94,7 @@ index 94a982c..897c497 100644 isc_entropy_stopcallbacksources(ectx); setup_logging(mctx, &log); -@@ -564,8 +564,8 @@ main(int argc, char **argv) { +@@ -566,8 +566,8 @@ main(int argc, char **argv) { if (dns_rdataset_isassociated(&rdataset)) dns_rdataset_disassociate(&rdataset); cleanup_logging(&log); @@ -105,10 +105,10 @@ index 94a982c..897c497 100644 dns_name_destroy(); if (verbose > 10) diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c -index 2edf614..840316c 100644 +index 0d1e7f8..79c4d74 100644 --- a/bin/dnssec/dnssec-importkey.c +++ b/bin/dnssec/dnssec-importkey.c -@@ -406,14 +406,14 @@ main(int argc, char **argv) { +@@ -407,14 +407,14 @@ main(int argc, char **argv) { if (ectx == NULL) setup_entropy(mctx, NULL, &ectx); @@ -126,7 +126,7 @@ index 2edf614..840316c 100644 isc_entropy_stopcallbacksources(ectx); setup_logging(mctx, &log); -@@ -457,8 +457,8 @@ main(int argc, char **argv) { +@@ -458,8 +458,8 @@ main(int argc, char **argv) { if (dns_rdataset_isassociated(&rdataset)) dns_rdataset_disassociate(&rdataset); cleanup_logging(&log); @@ -137,10 +137,10 @@ index 2edf614..840316c 100644 dns_name_destroy(); if (verbose > 10) diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c -index 10fad0b..0b68e99 100644 +index 1a2b545..e33cb8b 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c -@@ -182,14 +182,14 @@ main(int argc, char **argv) { +@@ -184,14 +184,14 @@ main(int argc, char **argv) { if (ectx == NULL) setup_entropy(mctx, NULL, &ectx); @@ -158,7 +158,7 @@ index 10fad0b..0b68e99 100644 isc_entropy_stopcallbacksources(ectx); result = dst_key_fromnamedfile(filename, dir, -@@ -271,8 +271,8 @@ main(int argc, char **argv) { +@@ -273,8 +273,8 @@ main(int argc, char **argv) { cleanup: dst_key_free(&key); @@ -169,10 +169,10 @@ index 10fad0b..0b68e99 100644 if (verbose > 10) isc_mem_stats(mctx, stdout); diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c -index 360cdb9..b7bf171 100644 +index f355903..6a2ca59 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c -@@ -380,14 +380,14 @@ main(int argc, char **argv) { +@@ -382,14 +382,14 @@ main(int argc, char **argv) { if (ectx == NULL) setup_entropy(mctx, NULL, &ectx); @@ -190,7 +190,7 @@ index 360cdb9..b7bf171 100644 isc_entropy_stopcallbacksources(ectx); if (predecessor != NULL) { -@@ -672,8 +672,8 @@ main(int argc, char **argv) { +@@ -674,8 +674,8 @@ main(int argc, char **argv) { if (prevkey != NULL) dst_key_free(&prevkey); dst_key_free(&key); @@ -201,10 +201,10 @@ index 360cdb9..b7bf171 100644 if (verbose > 10) isc_mem_stats(mctx, stdout); diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c -index 1bea357..53be1f5 100644 +index c6a0313..6ddaebe 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c -@@ -3459,14 +3459,15 @@ main(int argc, char *argv[]) { +@@ -3460,14 +3460,15 @@ main(int argc, char *argv[]) { if (!pseudorandom) eflags |= ISC_ENTROPY_GOODONLY; @@ -224,7 +224,7 @@ index 1bea357..53be1f5 100644 isc_stdtime_get(&now); if (startstr != NULL) { -@@ -3878,8 +3879,8 @@ main(int argc, char *argv[]) { +@@ -3879,8 +3880,8 @@ main(int argc, char *argv[]) { dns_master_styledestroy(&dsstyle, mctx); cleanup_logging(&log); @@ -235,10 +235,10 @@ index 1bea357..53be1f5 100644 dns_name_destroy(); if (verbose > 10) diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c -index 792510a..dc32765 100644 +index 4c293bf..3263cbc 100644 --- a/bin/dnssec/dnssec-verify.c +++ b/bin/dnssec/dnssec-verify.c -@@ -280,15 +280,15 @@ main(int argc, char *argv[]) { +@@ -281,15 +281,15 @@ main(int argc, char *argv[]) { if (ectx == NULL) setup_entropy(mctx, NULL, &ectx); @@ -259,10 +259,10 @@ index 792510a..dc32765 100644 rdclass = strtoclass(classname); diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c -index dc32c90..4ea9eaf 100644 +index fbc7ece..31a99e7 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c -@@ -32,6 +32,7 @@ +@@ -34,6 +34,7 @@ #include <isc/heap.h> #include <isc/list.h> #include <isc/mem.h> @@ -270,7 +270,7 @@ index dc32c90..4ea9eaf 100644 #include <isc/print.h> #include <isc/string.h> #include <isc/time.h> -@@ -233,7 +234,8 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { +@@ -235,7 +236,8 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { if (*ectx == NULL) { result = isc_entropy_create(mctx, ectx); if (result != ISC_R_SUCCESS) @@ -280,7 +280,7 @@ index dc32c90..4ea9eaf 100644 ISC_LIST_INIT(sources); } -@@ -242,6 +244,13 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { +@@ -244,6 +246,13 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { randomfile = NULL; } @@ -288,17 +288,17 @@ index dc32c90..4ea9eaf 100644 + if (randomfile != NULL && + strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { + randomfile = NULL; -+ isc_entropy_usehook(*ectx, ISC_TRUE); ++ isc_entropy_usehook(*ectx, true); + } +#endif result = isc_entropy_usebestsource(*ectx, &source, randomfile, usekeyboard); diff --git a/bin/named/server.c b/bin/named/server.c -index 59a8998..ee5186c 100644 +index 7f87ccf..9258e7f 100644 --- a/bin/named/server.c +++ b/bin/named/server.c -@@ -34,6 +34,7 @@ +@@ -36,6 +36,7 @@ #include <isc/lex.h> #include <isc/meminfo.h> #include <isc/parseint.h> @@ -306,18 +306,18 @@ index 59a8998..ee5186c 100644 #include <isc/portset.h> #include <isc/print.h> #include <isc/random.h> -@@ -8083,6 +8084,10 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8171,6 +8172,10 @@ load_configuration(const char *filename, ns_server_t *server, "no source of entropy found"); } else { const char *randomdev = cfg_obj_asstring(obj); +#ifdef ISC_PLATFORM_CRYPTORANDOM + if (strcmp(randomdev, ISC_PLATFORM_CRYPTORANDOM) == 0) -+ isc_entropy_usehook(ns_g_entropy, ISC_TRUE); ++ isc_entropy_usehook(ns_g_entropy, true); +#else int level = ISC_LOG_ERROR; result = isc_entropy_createfilesource(ns_g_entropy, randomdev); -@@ -8117,6 +8122,7 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8205,6 +8210,7 @@ load_configuration(const char *filename, ns_server_t *server, } isc_entropy_detach(&ns_g_fallbackentropy); } @@ -326,10 +326,10 @@ index 59a8998..ee5186c 100644 } } diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c -index bb5d500..46c7acf 100644 +index 5eefc57..1559a33 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c -@@ -33,6 +33,7 @@ +@@ -35,6 +35,7 @@ #include <isc/mem.h> #include <isc/parseint.h> #include <isc/print.h> @@ -337,7 +337,7 @@ index bb5d500..46c7acf 100644 #include <isc/random.h> #include <isc/region.h> #include <isc/sockaddr.h> -@@ -269,7 +270,8 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { +@@ -271,7 +272,8 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { if (*ectx == NULL) { result = isc_entropy_create(mctx, ectx); if (result != ISC_R_SUCCESS) @@ -347,7 +347,7 @@ index bb5d500..46c7acf 100644 ISC_LIST_INIT(sources); } -@@ -278,6 +280,13 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { +@@ -280,6 +282,13 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { randomfile = NULL; } @@ -355,13 +355,13 @@ index bb5d500..46c7acf 100644 + if (randomfile != NULL && + strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { + randomfile = NULL; -+ isc_entropy_usehook(*ectx, ISC_TRUE); ++ isc_entropy_usehook(*ectx, true); + } +#endif result = isc_entropy_usebestsource(*ectx, &source, randomfile, usekeyboard); -@@ -948,11 +957,11 @@ setup_system(void) { +@@ -950,11 +959,11 @@ setup_system(void) { } } @@ -375,9 +375,9 @@ index bb5d500..46c7acf 100644 result = dns_dispatchmgr_create(gmctx, entropy, &dispatchmgr); check_result(result, "dns_dispatchmgr_create"); -@@ -976,6 +985,9 @@ setup_system(void) { +@@ -978,6 +987,9 @@ setup_system(void) { check_result(result, "dst_lib_init"); - is_dst_up = ISC_TRUE; + is_dst_up = true; + /* moved after dst_lib_init() */ + isc_hash_init(); @@ -386,30 +386,30 @@ index bb5d500..46c7acf 100644 attrmask |= DNS_DISPATCHATTR_IPV4 | DNS_DISPATCHATTR_IPV6; diff --git a/bin/tests/makejournal.c b/bin/tests/makejournal.c -index fed59be..9f125da 100644 +index 61a41b0..acc71a1 100644 --- a/bin/tests/makejournal.c +++ b/bin/tests/makejournal.c -@@ -100,12 +100,12 @@ main(int argc, char **argv) { +@@ -102,12 +102,12 @@ main(int argc, char **argv) { CHECK(isc_mem_create(0, 0, &mctx)); CHECK(isc_entropy_create(mctx, &ectx)); - CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE)); -- hash_active = ISC_TRUE; +- hash_active = true; - CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING)); - dst_active = ISC_TRUE; + dst_active = true; + CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE)); -+ hash_active = ISC_TRUE; ++ hash_active = true; + CHECK(isc_log_create(mctx, &lctx, &logconfig)); isc_log_registercategories(lctx, categories); isc_log_setcontext(lctx); diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c -index 379b6a3..810d99e 100644 +index 2fcc064..7b4f617 100644 --- a/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c -@@ -202,6 +202,7 @@ sendqueries(isc_task_t *task, isc_event_t *event) { +@@ -204,6 +204,7 @@ sendqueries(isc_task_t *task, isc_event_t *event) { int main(int argc, char *argv[]) { @@ -417,16 +417,17 @@ index 379b6a3..810d99e 100644 isc_sockaddr_t bind_any; struct in_addr inaddr; isc_result_t result; -@@ -222,7 +223,7 @@ main(int argc, char *argv[]) { +@@ -224,7 +225,8 @@ main(int argc, char *argv[]) { UNUSED(argv); - isc_commandline_errprint = ISC_FALSE; + isc_commandline_errprint = false; - while ((c = isc_commandline_parse(argc, argv, "p:")) != -1) { -+ while ((c = isc_commandline_parse(argc, argv, "p:r:")) != -1) { ++ while ((c = isc_commandline_parse(argc, argv, "p:r:")) != -1) ++ { switch (c) { case 'p': result = isc_parse_uint16(&port, -@@ -233,6 +234,9 @@ main(int argc, char *argv[]) { +@@ -235,6 +237,9 @@ main(int argc, char *argv[]) { exit(1); } break; @@ -436,7 +437,7 @@ index 379b6a3..810d99e 100644 case '?': fprintf(stderr, "%s: invalid argument '%c'", argv[0], c); -@@ -274,10 +278,18 @@ main(int argc, char *argv[]) { +@@ -276,10 +281,18 @@ main(int argc, char *argv[]) { ectx = NULL; RUNCHECK(isc_entropy_create(mctx, &ectx)); @@ -446,7 +447,7 @@ index 379b6a3..810d99e 100644 + if (randomfile != NULL && + strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { + randomfile = NULL; -+ isc_entropy_usehook(ectx, ISC_TRUE); ++ isc_entropy_usehook(ectx, true); + } +#endif + if (randomfile != NULL) @@ -457,7 +458,7 @@ index 379b6a3..810d99e 100644 taskmgr = NULL; RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr)); -@@ -330,8 +342,8 @@ main(int argc, char *argv[]) { +@@ -332,8 +345,8 @@ main(int argc, char *argv[]) { isc_task_detach(&task); isc_taskmgr_destroy(&taskmgr); @@ -490,7 +491,7 @@ index a6720ce..9063b1f 100644 diff refb outputb || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c -index 4462f2e..f1230d8 100644 +index 4462f2e..f06268d 100644 --- a/bin/tests/system/rsabigexponent/bigkey.c +++ b/bin/tests/system/rsabigexponent/bigkey.c @@ -20,6 +20,7 @@ @@ -506,13 +507,13 @@ index 4462f2e..f1230d8 100644 CHECK(isc_mem_create(0, 0, &mctx), "isc_mem_create()"); CHECK(isc_entropy_create(mctx, &ectx), "isc_entropy_create()"); +#ifdef ISC_PLATFORM_CRYPTORANDOM -+ isc_entropy_usehook(ectx, ISC_TRUE); ++ isc_entropy_usehook(ectx, true); +#endif CHECK(isc_entropy_usebestsource(ectx, &source, "../random.data", ISC_ENTROPY_KEYBOARDNO), diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c -index 489f439..4f2f5b4 100644 +index 653c951..fe8698e 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -206,6 +206,7 @@ sendquery(isc_task_t *task, isc_event_t *event) { @@ -555,7 +556,7 @@ index 489f439..4f2f5b4 100644 + if (randomfile != NULL && + strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { + randomfile = NULL; -+ isc_entropy_usehook(ectx, ISC_TRUE); ++ isc_entropy_usehook(ectx, true); + } +#endif + if (randomfile != NULL) @@ -581,7 +582,7 @@ index 489f439..4f2f5b4 100644 isc_mem_destroy(&mctx); diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c -index 36ee6c7..0975bbe 100644 +index 70a40c3..2146f9b 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c @@ -136,6 +136,7 @@ sendquery(isc_task_t *task, isc_event_t *event) { @@ -624,7 +625,7 @@ index 36ee6c7..0975bbe 100644 + if (randomfile != NULL && + strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { + randomfile = NULL; -+ isc_entropy_usehook(ectx, ISC_TRUE); ++ isc_entropy_usehook(ectx, true); + } +#endif + if (randomfile != NULL) @@ -639,7 +640,7 @@ index 36ee6c7..0975bbe 100644 taskmgr = NULL; RUNCHECK(isc_taskmgr_create(mctx, 1, 0, &taskmgr)); -@@ -265,8 +285,8 @@ main(int argc, char **argv) { +@@ -264,8 +284,8 @@ main(int argc, char **argv) { isc_log_destroy(&log); @@ -690,10 +691,10 @@ index 9f90dd7..fad6c83 100644 echo "I:failed" status=`expr $status + $ret` diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c -index 1f5dd4c..4e3bfa5 100644 +index 4876875..e46653a 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c -@@ -1933,12 +1933,11 @@ main(int argc, char *argv[]) { +@@ -1955,12 +1955,11 @@ main(int argc, char *argv[]) { ectx = NULL; RUNCHECK(isc_entropy_create(mctx, &ectx)); @@ -705,10 +706,10 @@ index 1f5dd4c..4e3bfa5 100644 - RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY)); - ISC_LIST_INIT(queries); - parse_args(ISC_FALSE, argc, argv); + parse_args(false, argc, argv); if (server == NULL) diff --git a/configure b/configure -index c83773a..ac1ea3f 100755 +index 4394755..2e0af33 100755 --- a/configure +++ b/configure @@ -640,6 +640,7 @@ ac_includes_default="\ @@ -719,7 +720,7 @@ index c83773a..ac1ea3f 100755 BUILD_LIBS BUILD_LDFLAGS BUILD_CPPFLAGS -@@ -825,6 +826,7 @@ XMLSTATS +@@ -823,6 +824,7 @@ XMLSTATS NZDTARGETS NZDSRCS NZD_TOOLS @@ -727,7 +728,7 @@ index c83773a..ac1ea3f 100755 PKCS11_TEST PKCS11_ED25519 PKCS11_GOST -@@ -1037,6 +1039,7 @@ with_eddsa +@@ -1035,6 +1037,7 @@ with_eddsa with_aes enable_openssl_hash with_cc_alg @@ -735,7 +736,7 @@ index c83773a..ac1ea3f 100755 with_lmdb with_libxml2 with_libjson -@@ -1730,6 +1733,7 @@ Optional Features: +@@ -1728,6 +1731,7 @@ Optional Features: --enable-threads enable multithreading --enable-native-pkcs11 use native PKCS11 for all crypto [default=no] --enable-openssl-hash use OpenSSL for hash functions [default=no] @@ -743,7 +744,7 @@ index c83773a..ac1ea3f 100755 --enable-largefile 64-bit file support --enable-backtrace log stack backtrace on abort [default=yes] --enable-symtable use internal symbol table for backtrace -@@ -16486,6 +16490,7 @@ case "$use_openssl" in +@@ -16631,6 +16635,7 @@ case "$use_openssl" in $as_echo "disabled because of native PKCS11" >&6; } DST_OPENSSL_INC="" CRYPTO="-DPKCS11CRYPTO" @@ -751,7 +752,7 @@ index c83773a..ac1ea3f 100755 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -16500,6 +16505,7 @@ $as_echo "disabled because of native PKCS11" >&6; } +@@ -16645,6 +16650,7 @@ $as_echo "disabled because of native PKCS11" >&6; } $as_echo "no" >&6; } DST_OPENSSL_INC="" CRYPTO="" @@ -759,7 +760,7 @@ index c83773a..ac1ea3f 100755 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -16512,6 +16518,7 @@ $as_echo "no" >&6; } +@@ -16657,6 +16663,7 @@ $as_echo "no" >&6; } auto) DST_OPENSSL_INC="" CRYPTO="" @@ -767,7 +768,7 @@ index c83773a..ac1ea3f 100755 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -16521,7 +16528,7 @@ $as_echo "no" >&6; } +@@ -16666,7 +16673,7 @@ $as_echo "no" >&6; } OPENSSLLINKOBJS="" OPENSSLLINKSRCS="" as_fn_error $? "OpenSSL was not found in any of $openssldirs; use --with-openssl=/path @@ -776,7 +777,7 @@ index c83773a..ac1ea3f 100755 ;; *) if test "yes" = "$want_native_pkcs11" -@@ -16552,6 +16559,7 @@ $as_echo "not found" >&6; } +@@ -16697,6 +16704,7 @@ $as_echo "not found" >&6; } as_fn_error $? "\"$use_openssl/include/openssl/opensslv.h\" not found" "$LINENO" 5 fi CRYPTO='-DOPENSSL' @@ -784,7 +785,7 @@ index c83773a..ac1ea3f 100755 if test "/usr" = "$use_openssl" then DST_OPENSSL_INC="" -@@ -17213,8 +17221,6 @@ fi +@@ -17358,8 +17366,6 @@ fi # Use OpenSSL for hash functions # @@ -793,7 +794,7 @@ index c83773a..ac1ea3f 100755 ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH" case $want_openssl_hash in yes) -@@ -17583,6 +17589,86 @@ if test "rt" = "$have_clock_gt"; then +@@ -17728,6 +17734,86 @@ if test "rt" = "$have_clock_gt"; then LIBS="-lrt $LIBS" fi @@ -880,7 +881,7 @@ index c83773a..ac1ea3f 100755 # # was --with-lmdb specified? # -@@ -19665,9 +19751,12 @@ _ACEOF +@@ -19810,9 +19896,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: size_t for buflen; int for flags" >&5 $as_echo "size_t for buflen; int for flags" >&6; } @@ -895,7 +896,7 @@ index c83773a..ac1ea3f 100755 $as_echo "#define IRS_GETNAMEINFO_FLAGS_T int" >>confdefs.h -@@ -21032,12 +21121,7 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM" +@@ -21123,12 +21212,7 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM" ISC_PLATFORM_USESTDASM="#undef ISC_PLATFORM_USESTDASM" ISC_PLATFORM_USEMACASM="#undef ISC_PLATFORM_USEMACASM" if test "yes" = "$use_atomic"; then @@ -909,7 +910,7 @@ index c83773a..ac1ea3f 100755 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -@@ -21070,6 +21154,11 @@ cat >>confdefs.h <<_ACEOF +@@ -21161,6 +21245,11 @@ cat >>confdefs.h <<_ACEOF _ACEOF @@ -921,7 +922,7 @@ index c83773a..ac1ea3f 100755 if test $ac_cv_sizeof_void_p = 8; then arch=x86_64 have_xaddq=yes -@@ -21078,39 +21167,6 @@ _ACEOF +@@ -21169,39 +21258,6 @@ _ACEOF fi ;; x86_64-*|amd64-*) @@ -961,7 +962,7 @@ index c83773a..ac1ea3f 100755 if test $ac_cv_sizeof_void_p = 8; then arch=x86_64 have_xaddq=yes -@@ -21141,6 +21197,10 @@ $as_echo_n "checking architecture type for atomic operations... " >&6; } +@@ -21232,6 +21288,10 @@ $as_echo_n "checking architecture type for atomic operations... " >&6; } $as_echo "$arch" >&6; } fi @@ -972,7 +973,7 @@ index c83773a..ac1ea3f 100755 if test "yes" = "$have_atomic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for inline assembly code" >&5 $as_echo_n "checking compiler support for inline assembly code... " >&6; } -@@ -23428,6 +23488,30 @@ CFLAGS="$CFLAGS $SO_CFLAGS" +@@ -23519,6 +23579,30 @@ CFLAGS="$CFLAGS $SO_CFLAGS" # dlzdir='${DLZ_DRIVER_DIR}' @@ -1003,7 +1004,7 @@ index c83773a..ac1ea3f 100755 # # Private autoconf macro to simplify configuring drivers: # -@@ -23758,11 +23842,11 @@ $as_echo "no" >&6; } +@@ -23849,11 +23933,11 @@ $as_echo "no" >&6; } $as_echo "using mysql with libs ${mysql_lib} and includes ${mysql_include}" >&6; } ;; *) @@ -1018,7 +1019,7 @@ index c83773a..ac1ea3f 100755 fi CONTRIB_DLZ="$CONTRIB_DLZ -DDLZ_MYSQL" -@@ -23847,7 +23931,7 @@ $as_echo "" >&6; } +@@ -23938,7 +24022,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). @@ -1027,13 +1028,12 @@ index c83773a..ac1ea3f 100755 # include a blank element first for d in "" $bdb_incdirs do -@@ -23872,57 +23956,9 @@ $as_echo "" >&6; } +@@ -23963,57 +24047,9 @@ $as_echo "" >&6; } bdb_libnames="db53 db-5.3 db51 db-5.1 db48 db-4.8 db47 db-4.7 db46 db-4.6 db45 db-4.5 db44 db-4.4 db43 db-4.3 db42 db-4.2 db41 db-4.1 db" for d in $bdb_libnames do - if test "$dd" = "/usr" -+ if test -f "$dd/${target_lib}/lib${d}.so" - then +- then - as_ac_Lib=`$as_echo "ac_cv_lib_$d''_db_create" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -l$d" >&5 -$as_echo_n "checking for db_create in -l$d... " >&6; } @@ -1081,13 +1081,14 @@ index c83773a..ac1ea3f 100755 - break - fi - elif test -f "$dd/lib/lib${d}.so" -- then ++ if test -f "$dd/${target_lib}/lib${d}.so" + then - dlz_bdb_libs="-L${dd}/lib -l${d}" + dlz_bdb_libs="-L${dd}/${target_lib}/libdb -l${d}" break fi done -@@ -24081,10 +24117,10 @@ $as_echo "no" >&6; } +@@ -24172,10 +24208,10 @@ $as_echo "no" >&6; } DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES -I$use_dlz_ldap/include" DLZ_DRIVER_LDAP_INCLUDES="-I$use_dlz_ldap/include" fi @@ -1101,7 +1102,7 @@ index c83773a..ac1ea3f 100755 fi -@@ -24170,11 +24206,11 @@ fi +@@ -24261,11 +24297,11 @@ fi odbcdirs="/usr /usr/local /usr/pkg" for d in $odbcdirs do @@ -1115,7 +1116,7 @@ index c83773a..ac1ea3f 100755 break fi done -@@ -24449,6 +24485,8 @@ DNS_CRYPTO_LIBS="$NEWFLAGS" +@@ -24540,6 +24576,8 @@ DNS_CRYPTO_LIBS="$NEWFLAGS" @@ -1124,7 +1125,7 @@ index c83773a..ac1ea3f 100755 # # Commands to run at the end of config.status. # Don't just put these into configure, it won't work right if somebody -@@ -26839,6 +26877,8 @@ report() { +@@ -26930,6 +26968,8 @@ report() { echo " IPv6 support (--enable-ipv6)" test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \ echo " OpenSSL cryptography/DNSSEC (--with-openssl)" @@ -1133,7 +1134,7 @@ index c83773a..ac1ea3f 100755 test "X$PYTHON" = "X" || echo " Python tools (--with-python)" test "X$XMLSTATS" = "X" || echo " XML statistics (--with-libxml2)" test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)" -@@ -26879,6 +26919,8 @@ report() { +@@ -26970,6 +27010,8 @@ report() { echo " Very verbose query trace logging (--enable-querytrace)" test "no" = "$atf" || echo " Automated Testing Framework (--with-atf)" @@ -1142,7 +1143,7 @@ index c83773a..ac1ea3f 100755 echo " Dynamically loadable zone (DLZ) drivers:" test "no" = "$use_dlz_bdb" || \ echo " Berkeley DB (--with-dlz-bdb)" -@@ -26926,6 +26968,8 @@ report() { +@@ -27017,6 +27059,8 @@ report() { echo " ECDSA algorithm support (--with-ecdsa)" test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \ echo " EDDSA algorithm support (--with-eddsa)" @@ -1152,10 +1153,10 @@ index c83773a..ac1ea3f 100755 test "yes" = "$enable_seccomp" || \ echo " Use libseccomp system call filtering (--enable-seccomp)" diff --git a/configure.in b/configure.in -index 9a1d16d..849fa94 100644 +index b07895f..898b4ac 100644 --- a/configure.in +++ b/configure.in -@@ -1597,6 +1597,7 @@ case "$use_openssl" in +@@ -1542,6 +1542,7 @@ case "$use_openssl" in AC_MSG_RESULT(disabled because of native PKCS11) DST_OPENSSL_INC="" CRYPTO="-DPKCS11CRYPTO" @@ -1163,7 +1164,7 @@ index 9a1d16d..849fa94 100644 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -1610,6 +1611,7 @@ case "$use_openssl" in +@@ -1555,6 +1556,7 @@ case "$use_openssl" in AC_MSG_RESULT(no) DST_OPENSSL_INC="" CRYPTO="" @@ -1171,7 +1172,7 @@ index 9a1d16d..849fa94 100644 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -1622,6 +1624,7 @@ case "$use_openssl" in +@@ -1567,6 +1569,7 @@ case "$use_openssl" in auto) DST_OPENSSL_INC="" CRYPTO="" @@ -1179,7 +1180,7 @@ index 9a1d16d..849fa94 100644 OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKSRCS="" OPENSSLEDDSALINKOBJS="" -@@ -1632,7 +1635,7 @@ case "$use_openssl" in +@@ -1577,7 +1580,7 @@ case "$use_openssl" in OPENSSLLINKSRCS="" AC_MSG_ERROR( [OpenSSL was not found in any of $openssldirs; use --with-openssl=/path @@ -1188,7 +1189,7 @@ index 9a1d16d..849fa94 100644 ;; *) if test "yes" = "$want_native_pkcs11" -@@ -1662,6 +1665,7 @@ If you don't want OpenSSL, use --without-openssl]) +@@ -1607,6 +1610,7 @@ If you don't want OpenSSL, use --without-openssl]) AC_MSG_ERROR(["$use_openssl/include/openssl/opensslv.h" not found]) fi CRYPTO='-DOPENSSL' @@ -1196,7 +1197,7 @@ index 9a1d16d..849fa94 100644 if test "/usr" = "$use_openssl" then DST_OPENSSL_INC="" -@@ -2135,7 +2139,6 @@ fi +@@ -2080,7 +2084,6 @@ fi # Use OpenSSL for hash functions # @@ -1204,7 +1205,7 @@ index 9a1d16d..849fa94 100644 ISC_PLATFORM_OPENSSLHASH="#undef ISC_PLATFORM_OPENSSLHASH" case $want_openssl_hash in yes) -@@ -2402,6 +2405,67 @@ if test "rt" = "$have_clock_gt"; then +@@ -2347,6 +2350,67 @@ if test "rt" = "$have_clock_gt"; then LIBS="-lrt $LIBS" fi @@ -1272,7 +1273,7 @@ index 9a1d16d..849fa94 100644 # # was --with-lmdb specified? # -@@ -4235,12 +4299,12 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM" +@@ -4139,12 +4203,12 @@ ISC_PLATFORM_USEGCCASM="#undef ISC_PLATFORM_USEGCCASM" ISC_PLATFORM_USESTDASM="#undef ISC_PLATFORM_USESTDASM" ISC_PLATFORM_USEMACASM="#undef ISC_PLATFORM_USEMACASM" if test "yes" = "$use_atomic"; then @@ -1286,7 +1287,7 @@ index 9a1d16d..849fa94 100644 if test $ac_cv_sizeof_void_p = 8; then arch=x86_64 have_xaddq=yes -@@ -4249,7 +4313,6 @@ if test "yes" = "$use_atomic"; then +@@ -4153,7 +4217,6 @@ if test "yes" = "$use_atomic"; then fi ;; x86_64-*|amd64-*) @@ -1294,7 +1295,7 @@ index 9a1d16d..849fa94 100644 if test $ac_cv_sizeof_void_p = 8; then arch=x86_64 have_xaddq=yes -@@ -5613,6 +5676,8 @@ report() { +@@ -5517,6 +5580,8 @@ report() { echo " IPv6 support (--enable-ipv6)" test "X$CRYPTO" = "X" -o "yes" = "$want_native_pkcs11" || \ echo " OpenSSL cryptography/DNSSEC (--with-openssl)" @@ -1303,7 +1304,7 @@ index 9a1d16d..849fa94 100644 test "X$PYTHON" = "X" || echo " Python tools (--with-python)" test "X$XMLSTATS" = "X" || echo " XML statistics (--with-libxml2)" test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)" -@@ -5653,6 +5718,8 @@ report() { +@@ -5557,6 +5622,8 @@ report() { echo " Very verbose query trace logging (--enable-querytrace)" test "no" = "$atf" || echo " Automated Testing Framework (--with-atf)" @@ -1312,7 +1313,7 @@ index 9a1d16d..849fa94 100644 echo " Dynamically loadable zone (DLZ) drivers:" test "no" = "$use_dlz_bdb" || \ echo " Berkeley DB (--with-dlz-bdb)" -@@ -5700,6 +5767,8 @@ report() { +@@ -5604,6 +5671,8 @@ report() { echo " ECDSA algorithm support (--with-ecdsa)" test "X$CRYPTO" = "X" -o "yes" = "$OPENSSL_ED25519" -o "yes" = "$PKCS11_ED25519" || \ echo " EDDSA algorithm support (--with-eddsa)" @@ -1322,10 +1323,10 @@ index 9a1d16d..849fa94 100644 test "yes" = "$enable_seccomp" || \ echo " Use libseccomp system call filtering (--enable-seccomp)" diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c -index dbece0a..803e7b3 100644 +index 5703f9c..afb4d80 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c -@@ -274,6 +274,12 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, +@@ -276,6 +276,12 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, #ifdef GSSAPI RETERR(dst__gssapi_init(&dst_t_func[DST_ALG_GSSAPI])); #endif @@ -1335,17 +1336,17 @@ index dbece0a..803e7b3 100644 + isc_entropy_sethook(dst_random_getdata); +#endif +#endif /* defined(OPENSSL) || defined(PKCS11CRYPTO) */ - dst_initialized = ISC_TRUE; + dst_initialized = true; return (ISC_R_SUCCESS); -@@ -293,11 +299,19 @@ dst_lib_destroy(void) { +@@ -295,11 +301,19 @@ dst_lib_destroy(void) { for (i = 0; i < DST_MAX_ALGS; i++) if (dst_t_func[i] != NULL && dst_t_func[i]->cleanup != NULL) dst_t_func[i]->cleanup(); +#if defined(OPENSSL) || defined(PKCS11CRYPTO) +#ifdef ISC_PLATFORM_CRYPTORANDOM + if (dst_entropy_pool != NULL) { -+ isc_entropy_usehook(dst_entropy_pool, ISC_FALSE); ++ isc_entropy_usehook(dst_entropy_pool, false); + isc_entropy_sethook(NULL); + } +#endif @@ -1358,7 +1359,7 @@ index dbece0a..803e7b3 100644 if (dst__memory_pool != NULL) isc_mem_detach(&dst__memory_pool); if (dst_entropy_pool != NULL) -@@ -2000,13 +2014,17 @@ dst__entropy_getdata(void *buf, unsigned int len, isc_boolean_t pseudo) { +@@ -1998,13 +2012,17 @@ dst__entropy_getdata(void *buf, unsigned int len, bool pseudo) { flags &= ~ISC_ENTROPY_GOODONLY; else flags |= ISC_ENTROPY_BLOCKING; @@ -1377,7 +1378,7 @@ index dbece0a..803e7b3 100644 #ifdef GSSAPI unsigned int flags = dst_entropy_flags; isc_result_t ret; -@@ -2029,6 +2047,7 @@ dst__entropy_status(void) { +@@ -2027,6 +2045,7 @@ dst__entropy_status(void) { #endif return (isc_entropy_status(dst_entropy_pool)); #else @@ -1386,10 +1387,10 @@ index dbece0a..803e7b3 100644 #endif } diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h -index fcc7b47..d9b6ab6 100644 +index 32b0742..78e1277 100644 --- a/lib/dns/include/dst/dst.h +++ b/lib/dns/include/dst/dst.h -@@ -157,6 +157,14 @@ dst_lib_destroy(void); +@@ -160,6 +160,14 @@ dst_lib_destroy(void); * Releases all resources allocated by DST. */ @@ -1401,38 +1402,30 @@ index fcc7b47..d9b6ab6 100644 + * Specialization of isc_entropy_getdata(). + */ + - isc_boolean_t + bool dst_algorithm_supported(unsigned int alg); /*%< diff --git a/lib/dns/lib.c b/lib/dns/lib.c -index 53237d5..c6d83e9 100644 +index 304814b..60543c4 100644 --- a/lib/dns/lib.c +++ b/lib/dns/lib.c -@@ -9,14 +9,13 @@ - * information regarding copyright ownership. - */ - --/* $Id: lib.c,v 1.19 2009/09/03 00:12:23 each Exp $ */ -- - /*! \file */ - - #include <config.h> - +@@ -18,6 +18,7 @@ + #include <stdbool.h> #include <stddef.h> +#include <isc/entropy.h> #include <isc/hash.h> #include <isc/mem.h> #include <isc/msgcat.h> -@@ -77,6 +76,7 @@ static unsigned int references = 0; +@@ -78,6 +79,7 @@ static unsigned int references = 0; static void initialize(void) { isc_result_t result; + isc_entropy_t *ectx = NULL; - REQUIRE(initialize_done == ISC_FALSE); + REQUIRE(initialize_done == false); -@@ -87,11 +87,14 @@ initialize(void) { +@@ -88,11 +90,14 @@ initialize(void) { result = dns_ecdb_register(dns_g_mctx, &dbimp); if (result != ISC_R_SUCCESS) goto cleanup_mctx; @@ -1449,14 +1442,14 @@ index 53237d5..c6d83e9 100644 if (result != ISC_R_SUCCESS) goto cleanup_hash; -@@ -99,11 +102,17 @@ initialize(void) { +@@ -100,11 +105,17 @@ initialize(void) { if (result != ISC_R_SUCCESS) goto cleanup_dst; + isc_hash_init(); + isc_entropy_detach(&ectx); + - initialize_done = ISC_TRUE; + initialize_done = true; return; cleanup_dst: @@ -1468,7 +1461,7 @@ index 53237d5..c6d83e9 100644 isc_hash_destroy(); cleanup_db: diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c -index ec6dc7f..c1e1bde 100644 +index a30a2ab..d88d643 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -31,6 +31,7 @@ @@ -1764,68 +1757,61 @@ index 58fa872..625e809 100644 sh ${top_builddir}/unit/unittest.sh diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c -index fb9ef53..344a7c2 100644 +index 51bb90b..1b25b90 100644 --- a/lib/dns/tests/dnstest.c +++ b/lib/dns/tests/dnstest.c -@@ -120,12 +120,12 @@ dns_test_begin(FILE *logfile, isc_boolean_t start_managers) { +@@ -122,12 +122,12 @@ dns_test_begin(FILE *logfile, bool start_managers) { CHECK(isc_mem_create(0, 0, &mctx)); CHECK(isc_entropy_create(mctx, &ectx)); - CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE)); -- hash_active = ISC_TRUE; +- hash_active = true; - CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING)); - dst_active = ISC_TRUE; + dst_active = true; + CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE)); -+ hash_active = ISC_TRUE; ++ hash_active = true; + if (logfile != NULL) { isc_logdestination_t destination; isc_logconfig_t *logconfig = NULL; -@@ -169,14 +169,14 @@ dns_test_begin(FILE *logfile, isc_boolean_t start_managers) { +@@ -171,14 +171,14 @@ dns_test_begin(FILE *logfile, bool start_managers) { void dns_test_end(void) { - if (dst_active) { - dst_lib_destroy(); -- dst_active = ISC_FALSE; +- dst_active = false; - } if (hash_active) { isc_hash_destroy(); - hash_active = ISC_FALSE; + hash_active = false; } + if (dst_active) { + dst_lib_destroy(); -+ dst_active = ISC_FALSE; ++ dst_active = false; + } if (ectx != NULL) isc_entropy_detach(&ectx); diff --git a/lib/dns/tests/dstrandom_test.c b/lib/dns/tests/dstrandom_test.c new file mode 100644 -index 0000000..d2c72e7 +index 0000000..b980d8a --- /dev/null +++ b/lib/dns/tests/dstrandom_test.c -@@ -0,0 +1,105 @@ +@@ -0,0 +1,99 @@ +/* -+ * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") ++ * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * -+ * Permission to use, copy, modify, and/or distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. ++ * This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. ++ * See the COPYRIGHT file distributed with this work for additional ++ * information regarding copyright ownership. + */ + -+/* $Id$ */ -+ +/*! \file */ + +#include <config.h> @@ -1834,6 +1820,7 @@ index 0000000..d2c72e7 + +#include <stdio.h> +#include <string.h> ++#include <unistd.h> + +#include <isc/entropy.h> +#include <isc/mem.h> @@ -1868,7 +1855,7 @@ index 0000000..d2c72e7 + ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + +#ifdef ISC_PLATFORM_CRYPTORANDOM -+ isc_entropy_usehook(ectx, ISC_TRUE); ++ isc_entropy_usehook(ectx, true); + + returned = 0; + result = isc_entropy_getdata(ectx, buffer, sizeof(buffer), @@ -1879,7 +1866,7 @@ index 0000000..d2c72e7 + status = isc_entropy_status(ectx); + ATF_REQUIRE_EQ(status, 0); + -+ isc_entropy_usehook(ectx, ISC_FALSE); ++ isc_entropy_usehook(ectx, false); +#endif + + ret = chdir(TESTS); @@ -1914,10 +1901,10 @@ index 0000000..d2c72e7 +} + diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in -index d48eeb2..213e9d9 100644 +index 62a156c..bf83fe5 100644 --- a/lib/dns/win32/libdns.def.in +++ b/lib/dns/win32/libdns.def.in -@@ -1480,6 +1480,13 @@ dst_lib_destroy +@@ -1483,6 +1483,13 @@ dst_lib_destroy dst_lib_init dst_lib_init2 dst_lib_initmsgcat @@ -1932,14 +1919,14 @@ index d48eeb2..213e9d9 100644 dst_region_computerid dst_result_register diff --git a/lib/isc/entropy.c b/lib/isc/entropy.c -index 232094a..a85650b 100644 +index ab2f617..ed05ed6 100644 --- a/lib/isc/entropy.c +++ b/lib/isc/entropy.c -@@ -103,11 +103,15 @@ struct isc_entropy { - isc_uint32_t initialized; - isc_uint32_t initcount; +@@ -104,11 +104,15 @@ struct isc_entropy { + uint32_t initialized; + uint32_t initcount; isc_entropypool_t pool; -+ isc_boolean_t usehook; ++ bool usehook; unsigned int nsources; isc_entropysource_t *nextsource; ISC_LIST(isc_entropysource_t) sources; @@ -1950,8 +1937,8 @@ index 232094a..a85650b 100644 + /*% Sample Queue */ typedef struct { - isc_uint32_t last_time; /*%< last time recorded */ -@@ -556,6 +560,11 @@ isc_entropy_getdata(isc_entropy_t *ent, void *data, unsigned int length, + uint32_t last_time; /*%< last time recorded */ +@@ -557,6 +561,11 @@ isc_entropy_getdata(isc_entropy_t *ent, void *data, unsigned int length, LOCK(&ent->lock); @@ -1963,11 +1950,11 @@ index 232094a..a85650b 100644 remain = length; buf = data; total = 0; -@@ -707,6 +716,7 @@ isc_entropy_create(isc_mem_t *mctx, isc_entropy_t **entp) { +@@ -708,6 +717,7 @@ isc_entropy_create(isc_mem_t *mctx, isc_entropy_t **entp) { ent->refcnt = 1; ent->initialized = 0; ent->initcount = 0; -+ ent->usehook = ISC_FALSE; ++ ent->usehook = false; ent->magic = ENTROPY_MAGIC; isc_entropypool_init(&ent->pool); @@ -1977,7 +1964,7 @@ index 232094a..a85650b 100644 } + +void -+isc_entropy_usehook(isc_entropy_t *ectx, isc_boolean_t onoff) { ++isc_entropy_usehook(isc_entropy_t *ectx, bool onoff) { + REQUIRE(VALID_ENTROPY(ectx)); + + LOCK(&ectx->lock); @@ -1990,15 +1977,15 @@ index 232094a..a85650b 100644 + hook = myhook; +} diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h -index d52c43e..d9deb8a 100644 +index 4bba8e1..632166a 100644 --- a/lib/isc/include/isc/entropy.h +++ b/lib/isc/include/isc/entropy.h -@@ -303,6 +303,18 @@ isc_entropy_usebestsource(isc_entropy_t *ectx, isc_entropysource_t **source, +@@ -304,6 +304,18 @@ isc_entropy_usebestsource(isc_entropy_t *ectx, isc_entropysource_t **source, * isc_entropy_createcallbacksource(). */ +void -+isc_entropy_usehook(isc_entropy_t *ectx, isc_boolean_t onoff); ++isc_entropy_usehook(isc_entropy_t *ectx, bool onoff); +/*!< + * \brief Mark/unmark the given entropy structure as being hooked. + */ @@ -2013,10 +2000,10 @@ index d52c43e..d9deb8a 100644 #endif /* ISC_ENTROPY_H */ diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in -index d7a5bec..0166b79 100644 +index 9c7c342..ee8dc3e 100644 --- a/lib/isc/include/isc/platform.h.in +++ b/lib/isc/include/isc/platform.h.in -@@ -344,6 +344,11 @@ +@@ -341,6 +341,11 @@ */ @ISC_PLATFORM_HAVESTRINGSH@ @@ -2029,7 +2016,7 @@ index d7a5bec..0166b79 100644 * Define if the hash functions must be provided by OpenSSL. */ diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h -index f161faf..dec577e 100644 +index 42ff7e0..8d87c44 100644 --- a/lib/isc/include/isc/types.h +++ b/lib/isc/include/isc/types.h @@ -93,6 +93,8 @@ typedef struct isc_time isc_time_t; /*%< Time */ @@ -2042,10 +2029,10 @@ index f161faf..dec577e 100644 typedef int (*isc_sockfdwatch_t)(isc_task_t *, isc_socket_t *, void *, int); diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c -index 48e1031..74566c9 100644 +index a01e698..875c232 100644 --- a/lib/isc/pk11.c +++ b/lib/isc/pk11.c -@@ -327,14 +327,16 @@ pk11_rand_seed_fromfile(const char *randomfile) { +@@ -321,14 +321,16 @@ pk11_rand_seed_fromfile(const char *randomfile) { ret = isc_stdio_open(randomfile, "r", &stream); if (ret != ISC_R_SUCCESS) goto cleanup; @@ -2068,10 +2055,10 @@ index 48e1031..74566c9 100644 cleanup: if (stream != NULL) diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in -index de6a434..2c32782 100644 +index 5b8a2c9..913a2ce 100644 --- a/lib/isc/win32/include/isc/platform.h.in +++ b/lib/isc/win32/include/isc/platform.h.in -@@ -74,6 +74,11 @@ +@@ -69,6 +69,11 @@ #define ISC_PLATFORM_NORETURN_PRE __declspec(noreturn) #define ISC_PLATFORM_NORETURN_POST @@ -2084,7 +2071,7 @@ index de6a434..2c32782 100644 * Define if the hash functions must be provided by OpenSSL. */ diff --git a/win32utils/Configure b/win32utils/Configure -index e9f4680..79bb178 100644 +index ff596b7..09b476f 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -381,6 +381,7 @@ my @substdefh = ("AES_CC", @@ -2146,7 +2133,7 @@ index e9f4680..79bb178 100644 if ($enable_openssl_hash eq "yes") { print "openssl-hash: enabled\n"; } else { -@@ -1449,6 +1463,7 @@ if ($enable_intrinsics eq "yes") { +@@ -1454,6 +1468,7 @@ if ($enable_intrinsics eq "yes") { # enable-native-pkcs11 if ($enable_native_pkcs11 eq "yes") { @@ -2154,7 +2141,7 @@ index e9f4680..79bb178 100644 if ($use_openssl eq "auto") { $use_openssl = "no"; } -@@ -1658,6 +1673,7 @@ if ($use_openssl eq "yes") { +@@ -1663,6 +1678,7 @@ if ($use_openssl eq "yes") { $openssl_dll = File::Spec->catdir($openssl_path, "@dirlist[0]"); } @@ -2162,7 +2149,7 @@ index e9f4680..79bb178 100644 $configcond{"OPENSSL"} = 1; $configdefd{"CRYPTO"} = "OPENSSL"; $configvar{"OPENSSL_PATH"} = "$openssl_path"; -@@ -2209,6 +2225,15 @@ if ($cookie_algorithm eq "sha1") { +@@ -2214,6 +2230,15 @@ if ($cookie_algorithm eq "sha1") { die "Unrecognized cookie algorithm: $cookie_algorithm\n"; } @@ -2178,7 +2165,7 @@ index e9f4680..79bb178 100644 # enable-openssl-hash if ($enable_openssl_hash eq "yes") { if ($use_openssl eq "no") { -@@ -3531,6 +3556,7 @@ exit 0; +@@ -3536,6 +3561,7 @@ exit 0; # --enable-developer partially supported # --enable-newstats (9.9/9.9sub only) # --enable-native-pkcs11 supported @@ -2186,7 +2173,7 @@ index e9f4680..79bb178 100644 # --enable-openssl-version-check included without a way to disable it # --enable-openssl-hash supported # --enable-threads included without a way to disable it -@@ -3556,6 +3582,7 @@ exit 0; +@@ -3561,6 +3587,7 @@ exit 0; # --with-gost supported # --with-aes supported # --with-cc-alg supported diff --git a/bind-9.11-rt46047.patch b/bind-9.11-rt46047.patch index 915b0ab..5030c06 100644 --- a/bind-9.11-rt46047.patch +++ b/bind-9.11-rt46047.patch @@ -1,4 +1,4 @@ -From 1ab1aabcf9b2b8de144bab7a3ff5d9f7e6ec9ad4 Mon Sep 17 00:00:00 2001 +From 9a074d5cd6c6276d95bc1cce3a14afaabc88c6c5 Mon Sep 17 00:00:00 2001 From: Evan Hunt <each(a)isc.org> Date: Thu, 28 Sep 2017 10:09:22 -0700 Subject: [PATCH] completed and corrected the crypto-random change @@ -39,17 +39,17 @@ Subject: [PATCH] completed and corrected the crypto-random change bin/tests/system/tkey/keycreate.c | 4 +-- bin/tests/system/tkey/keydelete.c | 4 +-- doc/arm/Bv9ARM-book.xml | 55 ++++++++++++++++++++++---------- - doc/arm/notes.xml | 23 ++++++++++++- - lib/dns/dst_api.c | 7 ++-- + doc/arm/notes.xml | 26 +++++++++++++++ + lib/dns/dst_api.c | 4 ++- lib/dns/include/dst/dst.h | 14 ++++++-- lib/dns/openssl_link.c | 3 +- lib/isc/include/isc/entropy.h | 50 +++++++++++++++++++++-------- lib/isc/include/isc/random.h | 28 ++++++++++------ lib/isccfg/namedconf.c | 2 +- - 22 files changed, 219 insertions(+), 110 deletions(-) + 22 files changed, 221 insertions(+), 108 deletions(-) diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c -index fa439cc..a7ad417 100644 +index 295e16f..0f79aa8 100644 --- a/bin/confgen/keygen.c +++ b/bin/confgen/keygen.c @@ -161,17 +161,15 @@ generate_key(isc_mem_t *mctx, const char *randomfile, dns_secalg_t alg, @@ -65,7 +65,7 @@ index fa439cc..a7ad417 100644 - strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { - randomfile = NULL; + if (randomfile == NULL) { - isc_entropy_usehook(ectx, ISC_TRUE); + isc_entropy_usehook(ectx, true); } #endif + if (randomfile != NULL && strcmp(randomfile, "keyboard") == 0) { @@ -112,16 +112,16 @@ index 96dfef6..1c84b06 100644 </listitem> </varlistentry> diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c -index 4ea9eaf..5dd9475 100644 +index 31a99e7..38c83ed 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c -@@ -239,18 +239,16 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { +@@ -241,18 +241,16 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { ISC_LIST_INIT(sources); } +#ifdef ISC_PLATFORM_CRYPTORANDOM + if (randomfile == NULL) { -+ isc_entropy_usehook(*ectx, ISC_TRUE); ++ isc_entropy_usehook(*ectx, true); + } +#endif if (randomfile != NULL && strcmp(randomfile, "keyboard") == 0) { @@ -133,17 +133,17 @@ index 4ea9eaf..5dd9475 100644 - if (randomfile != NULL && - strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { - randomfile = NULL; -- isc_entropy_usehook(*ectx, ISC_TRUE); +- isc_entropy_usehook(*ectx, true); - } -#endif result = isc_entropy_usebestsource(*ectx, &source, randomfile, usekeyboard); diff --git a/bin/named/client.c b/bin/named/client.c -index b9ebc93..20e5f39 100644 +index 0f6e162..5e39b82 100644 --- a/bin/named/client.c +++ b/bin/named/client.c -@@ -1605,7 +1605,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, +@@ -1608,7 +1608,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, isc_buffer_init(&buf, cookie, sizeof(cookie)); isc_stdtime_get(&now); @@ -154,10 +154,10 @@ index b9ebc93..20e5f39 100644 compute_cookie(client, now, nonce, ns_g_server->secret, &buf); diff --git a/bin/named/config.c b/bin/named/config.c -index c50f759..c1e72ef 100644 +index 2c4c93c..16ed248 100644 --- a/bin/named/config.c +++ b/bin/named/config.c -@@ -92,7 +92,9 @@ options {\n\ +@@ -93,7 +93,9 @@ options {\n\ # pid-file \"" NS_LOCALSTATEDIR "/run/named/named.pid\"; /* or /lwresd.pid */\n\ port 53;\n\ prefetch 2 9;\n" @@ -169,10 +169,10 @@ index c50f759..c1e72ef 100644 #endif " recursing-file \"named.recursing\";\n\ diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c -index 237e8dc..b905475 100644 +index d955c2f..40621f2 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c -@@ -322,9 +322,10 @@ log_invalid(isccc_ccmsg_t *ccmsg, isc_result_t result) { +@@ -325,9 +325,10 @@ log_invalid(isccc_ccmsg_t *ccmsg, isc_result_t result) { static void control_recvmessage(isc_task_t *task, isc_event_t *event) { @@ -185,8 +185,8 @@ index 237e8dc..b905475 100644 + controlkey_t *key = NULL; isccc_sexpr_t *request = NULL; isccc_sexpr_t *response = NULL; - isc_uint32_t algorithm; -@@ -335,16 +336,17 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) { + uint32_t algorithm; +@@ -338,16 +339,17 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) { isc_buffer_t *text; isc_result_t result; isc_result_t eresult; @@ -194,7 +194,7 @@ index 237e8dc..b905475 100644 + isccc_sexpr_t *_ctrl = NULL; isccc_time_t sent; isccc_time_t exp; - isc_uint32_t nonce; + uint32_t nonce; - isccc_sexpr_t *data; + isccc_sexpr_t *data = NULL; @@ -206,25 +206,25 @@ index 237e8dc..b905475 100644 algorithm = DST_ALG_UNKNOWN; secret.rstart = NULL; text = NULL; -@@ -455,8 +457,11 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) { +@@ -458,8 +460,11 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) { * Establish nonce. */ if (conn->nonce == 0) { - while (conn->nonce == 0) - isc_random_get(&conn->nonce); + while (conn->nonce == 0) { -+ isc_uint16_t r1 = isc_rng_random(server->rngctx); -+ isc_uint16_t r2 = isc_rng_random(server->rngctx); ++ uint16_t r1 = isc_rng_random(server->rngctx); ++ uint16_t r2 = isc_rng_random(server->rngctx); + conn->nonce = (r1 << 16) | r2; + } eresult = ISC_R_SUCCESS; } else eresult = ns_control_docommand(request, listener->readonly, &text); diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h -index d8179a6..e03d24d 100644 +index f5ed2b7..b2c1d05 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h -@@ -17,6 +17,7 @@ +@@ -20,6 +20,7 @@ #include <isc/log.h> #include <isc/magic.h> #include <isc/quota.h> @@ -232,19 +232,19 @@ index d8179a6..e03d24d 100644 #include <isc/sockaddr.h> #include <isc/types.h> #include <isc/xml.h> -@@ -131,6 +132,7 @@ struct ns_server { +@@ -134,6 +135,7 @@ struct ns_server { char * lockfile; - isc_uint16_t transfer_tcp_message_size; + uint16_t transfer_tcp_message_size; + isc_rng_t * rngctx; }; struct ns_altsecret { diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c -index d8c7188..50f924e 100644 +index 419927b..d721f47 100644 --- a/bin/named/interfacemgr.c +++ b/bin/named/interfacemgr.c -@@ -15,6 +15,7 @@ +@@ -17,6 +17,7 @@ #include <isc/interfaceiter.h> #include <isc/os.h> @@ -253,10 +253,10 @@ index d8c7188..50f924e 100644 #include <isc/task.h> #include <isc/util.h> diff --git a/bin/named/query.c b/bin/named/query.c -index accbf3b..d89622d 100644 +index f8dbef2..2f3c0ca 100644 --- a/bin/named/query.c +++ b/bin/named/query.c -@@ -18,6 +18,7 @@ +@@ -19,6 +19,7 @@ #include <isc/hex.h> #include <isc/mem.h> #include <isc/print.h> @@ -265,10 +265,10 @@ index accbf3b..d89622d 100644 #include <isc/serial.h> #include <isc/stats.h> diff --git a/bin/named/server.c b/bin/named/server.c -index ca789e5..1413e85 100644 +index 9258e7f..f4320df 100644 --- a/bin/named/server.c +++ b/bin/named/server.c -@@ -8076,21 +8076,30 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8164,21 +8164,30 @@ load_configuration(const char *filename, ns_server_t *server, * Open the source of entropy. */ if (first_time) { @@ -291,8 +291,8 @@ index ca789e5..1413e85 100644 + if (randomdev == NULL) { #ifdef ISC_PLATFORM_CRYPTORANDOM - if (strcmp(randomdev, ISC_PLATFORM_CRYPTORANDOM) == 0) -- isc_entropy_usehook(ns_g_entropy, ISC_TRUE); -+ isc_entropy_usehook(ns_g_entropy, ISC_TRUE); +- isc_entropy_usehook(ns_g_entropy, true); ++ isc_entropy_usehook(ns_g_entropy, true); #else - int level = ISC_LOG_ERROR; - result = isc_entropy_createfilesource(ns_g_entropy, @@ -310,7 +310,7 @@ index ca789e5..1413e85 100644 #ifdef PATH_RANDOMDEV if (ns_g_fallbackentropy != NULL) { level = ISC_LOG_INFO; -@@ -8101,8 +8110,8 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8189,8 +8198,8 @@ load_configuration(const char *filename, ns_server_t *server, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, level, @@ -321,7 +321,7 @@ index ca789e5..1413e85 100644 randomdev, isc_result_totext(result)); } -@@ -8122,7 +8131,6 @@ load_configuration(const char *filename, ns_server_t *server, +@@ -8210,7 +8219,6 @@ load_configuration(const char *filename, ns_server_t *server, } isc_entropy_detach(&ns_g_fallbackentropy); } @@ -329,7 +329,7 @@ index ca789e5..1413e85 100644 #endif } } -@@ -8911,6 +8919,9 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { +@@ -8998,6 +9006,9 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { CHECKFATAL(dns_tkeyctx_create(ns_g_mctx, ns_g_entropy, &server->tkeyctx), "creating TKEY context"); @@ -339,7 +339,7 @@ index ca789e5..1413e85 100644 /* * Setup the server task, which is responsible for coordinating -@@ -9117,7 +9128,8 @@ ns_server_destroy(ns_server_t **serverp) { +@@ -9204,7 +9215,8 @@ ns_server_destroy(ns_server_t **serverp) { if (server->zonemgr != NULL) dns_zonemgr_detach(&server->zonemgr); @@ -349,7 +349,7 @@ index ca789e5..1413e85 100644 if (server->tkeyctx != NULL) dns_tkeyctx_destroy(&server->tkeyctx); -@@ -13018,10 +13030,10 @@ newzone_cfgctx_destroy(void **cfgp) { +@@ -13105,10 +13117,10 @@ newzone_cfgctx_destroy(void **cfgp) { static isc_result_t generate_salt(unsigned char *salt, size_t saltlen) { @@ -357,19 +357,19 @@ index ca789e5..1413e85 100644 + size_t i, n; union { unsigned char rnd[256]; -- isc_uint32_t rnd32[64]; -+ isc_uint16_t rnd16[128]; +- uint32_t rnd32[64]; ++ uint16_t rnd16[128]; } rnd; unsigned char text[512 + 1]; isc_region_t r; -@@ -13031,9 +13043,10 @@ generate_salt(unsigned char *salt, size_t saltlen) { +@@ -13118,9 +13130,10 @@ generate_salt(unsigned char *salt, size_t saltlen) { if (saltlen > 256U) return (ISC_R_RANGE); -- n = (int) (saltlen + sizeof(isc_uint32_t) - 1) / sizeof(isc_uint32_t); +- n = (int) (saltlen + sizeof(uint32_t) - 1) / sizeof(uint32_t); - for (i = 0; i < n; i++) - isc_random_get(&rnd.rnd32[i]); -+ n = (saltlen + sizeof(isc_uint16_t) - 1) / sizeof(isc_uint16_t); ++ n = (saltlen + sizeof(uint16_t) - 1) / sizeof(uint16_t); + for (i = 0; i < n; i++) { + rnd.rnd16[i] = isc_rng_random(ns_g_server->rngctx); + } @@ -377,10 +377,10 @@ index ca789e5..1413e85 100644 memmove(salt, rnd.rnd, saltlen); diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c -index 46c7acf..a0d0278 100644 +index 1559a33..68b9a99 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c -@@ -281,9 +281,7 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { +@@ -283,9 +283,7 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) { } #ifdef ISC_PLATFORM_CRYPTORANDOM @@ -388,14 +388,14 @@ index 46c7acf..a0d0278 100644 - strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { - randomfile = NULL; + if (randomfile == NULL) { - isc_entropy_usehook(*ectx, ISC_TRUE); + isc_entropy_usehook(*ectx, true); } #endif diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c -index 810d99e..d7d10e2 100644 +index 7b4f617..507bf0a 100644 --- a/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c -@@ -279,9 +279,7 @@ main(int argc, char *argv[]) { +@@ -282,9 +282,7 @@ main(int argc, char *argv[]) { ectx = NULL; RUNCHECK(isc_entropy_create(mctx, &ectx)); #ifdef ISC_PLATFORM_CRYPTORANDOM @@ -403,11 +403,11 @@ index 810d99e..d7d10e2 100644 - strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { - randomfile = NULL; + if (randomfile == NULL) { - isc_entropy_usehook(ectx, ISC_TRUE); + isc_entropy_usehook(ectx, true); } #endif diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c -index 4f2f5b4..0894db7 100644 +index fe8698e..937fcc3 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -255,9 +255,7 @@ main(int argc, char *argv[]) { @@ -418,11 +418,11 @@ index 4f2f5b4..0894db7 100644 - strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { - randomfile = NULL; + if (randomfile == NULL) { - isc_entropy_usehook(ectx, ISC_TRUE); + isc_entropy_usehook(ectx, true); } #endif diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c -index 0975bbe..5b8a470 100644 +index 2146f9b..ac2c311 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c @@ -182,9 +182,7 @@ main(int argc, char **argv) { @@ -433,11 +433,11 @@ index 0975bbe..5b8a470 100644 - strcmp(randomfile, ISC_PLATFORM_CRYPTORANDOM) == 0) { - randomfile = NULL; + if (randomfile == NULL) { - isc_entropy_usehook(ectx, ISC_TRUE); + isc_entropy_usehook(ectx, true); } #endif diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml -index a5d9e2e..2a96f71 100644 +index baff8d3..00a50e4 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -5070,22 +5070,45 @@ badresp:1,adberr:0,findfail:0,valfail:0] @@ -503,14 +503,15 @@ index a5d9e2e..2a96f71 100644 </listitem> </varlistentry> diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml -index d3fdb5e..a8ad92d 100644 +index d9537a3..5c2cc13 100644 --- a/doc/arm/notes.xml +++ b/doc/arm/notes.xml -@@ -105,7 +105,28 @@ - <itemizedlist> - <listitem> - <para> -- None. +@@ -180,6 +180,32 @@ + option. [GL #105] + </para> + </listitem> ++ <listitem> ++ <para> + By default, BIND now uses the random number generation functions + in the cryptographic library (i.e., OpenSSL or a PKCS#11 + provider) as a source of high-quality randomness rather than @@ -533,25 +534,16 @@ index d3fdb5e..a8ad92d 100644 + <command>configure --disable-crypto-rand</command>, in which + case <filename>/dev/random</filename> will be the default + entropy source. [RT #31459] [RT #46047] - </para> - </listitem> ++ </para> ++ </listitem> </itemizedlist> + </section> + diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c -index 803e7b3..29a4fef 100644 +index afb4d80..4e62a97 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c -@@ -276,8 +276,9 @@ dst_lib_init2(isc_mem_t *mctx, isc_entropy_t *ectx, - #endif - #if defined(OPENSSL) || defined(PKCS11CRYPTO) - #ifdef ISC_PLATFORM_CRYPTORANDOM -- if (dst_entropy_pool != NULL) -+ if (dst_entropy_pool != NULL) { - isc_entropy_sethook(dst_random_getdata); -+ } - #endif - #endif /* defined(OPENSSL) || defined(PKCS11CRYPTO) */ - dst_initialized = ISC_TRUE; -@@ -2015,10 +2016,12 @@ dst__entropy_getdata(void *buf, unsigned int len, isc_boolean_t pseudo) { +@@ -2013,10 +2013,12 @@ dst__entropy_getdata(void *buf, unsigned int len, bool pseudo) { else flags |= ISC_ENTROPY_BLOCKING; #ifdef ISC_PLATFORM_CRYPTORANDOM @@ -566,10 +558,10 @@ index 803e7b3..29a4fef 100644 } diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h -index d9b6ab6..e8c1a3c 100644 +index 78e1277..10293d0 100644 --- a/lib/dns/include/dst/dst.h +++ b/lib/dns/include/dst/dst.h -@@ -161,8 +161,18 @@ isc_result_t +@@ -164,8 +164,18 @@ isc_result_t dst_random_getdata(void *data, unsigned int length, unsigned int *returned, unsigned int flags); /*%< @@ -589,9 +581,9 @@ index d9b6ab6..e8c1a3c 100644 + * \li DST_R_OPENSSLFAILURE, DST_R_CRYPTOFAILURE, or other codes on error */ - isc_boolean_t + bool diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c -index c1e1bde..91e87d0 100644 +index d88d643..7a233dd 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -482,7 +482,8 @@ dst__openssl_getengine(const char *engine) { @@ -605,7 +597,7 @@ index c1e1bde..91e87d0 100644 #ifndef DONT_REQUIRE_DST_LIB_INIT INSIST(dst__memory_pool != NULL); diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h -index d9deb8a..2d37363 100644 +index 632166a..c7cb17d 100644 --- a/lib/isc/include/isc/entropy.h +++ b/lib/isc/include/isc/entropy.h @@ -9,8 +9,6 @@ @@ -617,7 +609,7 @@ index d9deb8a..2d37363 100644 #ifndef ISC_ENTROPY_H #define ISC_ENTROPY_H 1 -@@ -190,9 +188,8 @@ isc_entropy_createcallbacksource(isc_entropy_t *ent, +@@ -191,9 +189,8 @@ isc_entropy_createcallbacksource(isc_entropy_t *ent, /*!< * \brief Create an entropy source that is polled via a callback. * @@ -629,7 +621,7 @@ index d9deb8a..2d37363 100644 * * Samples are added via isc_entropy_addcallbacksample(), below. * _addcallbacksample() is the only function which may be called from -@@ -233,15 +230,32 @@ isc_result_t +@@ -234,15 +231,32 @@ isc_result_t isc_entropy_getdata(isc_entropy_t *ent, void *data, unsigned int length, unsigned int *returned, unsigned int flags); /*!< @@ -669,9 +661,9 @@ index d9deb8a..2d37363 100644 */ void -@@ -306,13 +320,21 @@ isc_entropy_usebestsource(isc_entropy_t *ectx, isc_entropysource_t **source, +@@ -307,13 +321,21 @@ isc_entropy_usebestsource(isc_entropy_t *ectx, isc_entropysource_t **source, void - isc_entropy_usehook(isc_entropy_t *ectx, isc_boolean_t onoff); + isc_entropy_usehook(isc_entropy_t *ectx, bool onoff); /*!< - * \brief Mark/unmark the given entropy structure as being hooked. + * \brief Configure entropy context 'ectx' to use the hook function @@ -694,7 +686,7 @@ index d9deb8a..2d37363 100644 ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/random.h b/lib/isc/include/isc/random.h -index ba53ebf..b575728 100644 +index f8aed34..17c551b 100644 --- a/lib/isc/include/isc/random.h +++ b/lib/isc/include/isc/random.h @@ -9,8 +9,6 @@ @@ -737,8 +729,8 @@ index ba53ebf..b575728 100644 ISC_LANG_BEGINDECLS @@ -115,8 +123,8 @@ isc_rng_random(isc_rng_t *rngctx); - isc_uint16_t - isc_rng_uniformrandom(isc_rng_t *rngctx, isc_uint16_t upper_bound); + uint16_t + isc_rng_uniformrandom(isc_rng_t *rngctx, uint16_t upper_bound); /*%< - * Returns a uniformly distributed pseudo random 16-bit unsigned - * integer. @@ -748,10 +740,10 @@ index ba53ebf..b575728 100644 ISC_LANG_ENDDECLS diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c -index 8d496ff..dd08187 100644 +index cd797a6..589da07 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c -@@ -1106,7 +1106,7 @@ options_clauses[] = { +@@ -1109,7 +1109,7 @@ options_clauses[] = { { "pid-file", &cfg_type_qstringornone, 0 }, { "port", &cfg_type_uint32, 0 }, { "querylog", &cfg_type_boolean, 0 }, diff --git a/bind-95-rh452060.patch b/bind-95-rh452060.patch index dac3a8d..c57ccab 100644 --- a/bind-95-rh452060.patch +++ b/bind-95-rh452060.patch @@ -1,34 +1,34 @@ diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c -index f657c30..ff9a2d2 100644 +index aa5315d..1fa711a 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c -@@ -1694,6 +1694,13 @@ clear_query(dig_query_t *query) { +@@ -1814,6 +1814,13 @@ clear_query(dig_query_t *query) { if (query->timer != NULL) isc_timer_detach(&query->timer); + + if (query->waiting_senddone) { + debug("send_done not yet called"); -+ query->pending_free = ISC_TRUE; ++ query->pending_free = true; + return; + } + lookup = query->lookup; if (lookup->current_query == query) -@@ -1719,10 +1726,7 @@ clear_query(dig_query_t *query) { +@@ -1839,10 +1846,7 @@ clear_query(dig_query_t *query) { isc_mempool_put(commctx, query->recvspace); isc_buffer_invalidate(&query->recvbuf); isc_buffer_invalidate(&query->lengthbuf); - if (query->waiting_senddone) -- query->pending_free = ISC_TRUE; +- query->pending_free = true; - else - isc_mem_free(mctx, query); + isc_mem_free(mctx, query); } /*% -@@ -2811,9 +2815,9 @@ send_done(isc_task_t *_task, isc_event_t *event) { +@@ -2892,9 +2896,9 @@ send_done(isc_task_t *_task, isc_event_t *event) { isc_event_free(&event); if (query->pending_free) diff --git a/bind.spec b/bind.spec index 2b22c57..b557e44 100644 --- a/bind.spec +++ b/bind.spec @@ -2,7 +2,7 @@ # Red Hat BIND package .spec file # -%global PATCHVER P2 +#%%global PATCHVER P2 #%%global PREVER rc1 %global BINDVERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}} @@ -43,16 +43,16 @@ # # lib*.so.X versions of selected libraries -%global sover_dns 1102 -%global sover_isc 169 -%global sover_irs 160 -%global sover_isccfg 160 +%global sover_dns 1104 +%global sover_isc 1100 +%global sover_irs 161 +%global sover_isccfg 163 Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server Name: bind License: MPLv2.0 -Version: 9.11.4 -Release: 12%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Version: 9.11.5 +Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ # @@ -452,7 +452,7 @@ are used for building ISC DHCP. %patch72 -p1 -b .64bit %endif %patch102 -p1 -b .rh452060 -%patch106 -p0 -b .rh490837 +%patch106 -p1 -b .rh490837 %patch109 -p1 -b .rh478718 %patch112 -p1 -b .rh645544 %patch130 -p1 -b .libdb @@ -1193,9 +1193,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %files libs -%{_libdir}/libbind9.so.160* -%{_libdir}/libisccc.so.160* -%{_libdir}/liblwres.so.160* +%{_libdir}/libbind9.so.161* +%{_libdir}/libisccc.so.161* +%{_libdir}/liblwres.so.161* %files libs-lite %{_libdir}/libdns.so.%{sover_dns}* @@ -1446,6 +1446,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Oct 24 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.5-1 +- Update to 9.11.5 + * Tue Oct 02 2018 Petr Menk <pemensik(a)redhat.com> - 32:9.11.4-12.P2 - Add Requires to devel packages referenced by bind-devel diff --git a/bind93-rh490837.patch b/bind93-rh490837.patch index 230d7a7..6ea55ba 100644 --- a/bind93-rh490837.patch +++ b/bind93-rh490837.patch @@ -1,13 +1,22 @@ -? patch -? lib/isc/lex.c.rh490837 -Index: lib/isc/lex.c -=================================================================== -RCS file: /var/snap/bind9/lib/isc/lex.c,v -retrieving revision 1.86 -diff -p -u -r1.86 lex.c ---- lib/isc/lex.c 17 Sep 2007 09:56:29 -0000 1.86 -+++ lib/isc/lex.c 6 Apr 2009 13:24:15 -0000 -@@ -425,17 +425,14 @@ isc_lex_gettoken(isc_lex_t *lex, unsigne +diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h +index 1f44b5a..a3625f9 100644 +--- a/lib/isc/include/isc/stdio.h ++++ b/lib/isc/include/isc/stdio.h +@@ -69,6 +69,9 @@ isc_stdio_sync(FILE *f); + * direct counterpart in the stdio library. + */ + ++isc_result_t ++isc_stdio_fgetc(FILE *f, int *ret); ++ + ISC_LANG_ENDDECLS + + #endif /* ISC_STDIO_H */ +diff --git a/lib/isc/lex.c b/lib/isc/lex.c +index a8955bc..fc6103b 100644 +--- a/lib/isc/lex.c ++++ b/lib/isc/lex.c +@@ -434,17 +434,14 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { if (source->is_file) { stream = source->input; @@ -28,34 +37,14 @@ diff -p -u -r1.86 lex.c goto done; } + - source->at_eof = ISC_TRUE; + source->at_eof = true; } } else { -Index: lib/isc/include/isc/stdio.h -=================================================================== -RCS file: /var/snap/bind9/lib/isc/include/isc/stdio.h,v -retrieving revision 1.13 -diff -p -u -r1.13 stdio.h ---- lib/isc/include/isc/stdio.h 19 Jun 2007 23:47:18 -0000 1.13 -+++ lib/isc/include/isc/stdio.h 6 Apr 2009 13:24:15 -0000 -@@ -72,6 +72,9 @@ isc_stdio_sync(FILE *f); - * direct counterpart in the stdio library. - */ - -+isc_result_t -+isc_stdio_fgetc(FILE *f, int *ret); -+ - ISC_LANG_ENDDECLS - - #endif /* ISC_STDIO_H */ -Index: lib/isc/unix/errno2result.c -=================================================================== -RCS file: /var/snap/bind9/lib/isc/unix/errno2result.c,v -retrieving revision 1.17 -diff -p -u -r1.17 errno2result.c ---- lib/isc/unix/errno2result.c 19 Jun 2007 23:47:18 -0000 1.17 -+++ lib/isc/unix/errno2result.c 6 Apr 2009 13:24:15 -0000 -@@ -43,6 +43,7 @@ isc__errno2result(int posixerrno) { +diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c +index 2f12bcc..5bfd648 100644 +--- a/lib/isc/unix/errno2result.c ++++ b/lib/isc/unix/errno2result.c +@@ -40,6 +40,7 @@ isc___errno2result(int posixerrno, bool dolog, case EINVAL: /* XXX sometimes this is not for files */ case ENAMETOOLONG: case EBADF: @@ -63,14 +52,11 @@ diff -p -u -r1.17 errno2result.c return (ISC_R_INVALIDFILE); case ENOENT: return (ISC_R_FILENOTFOUND); -Index: lib/isc/unix/stdio.c -=================================================================== -RCS file: /var/snap/bind9/lib/isc/unix/stdio.c,v -retrieving revision 1.8 -diff -p -u -r1.8 stdio.c ---- lib/isc/unix/stdio.c 19 Jun 2007 23:47:18 -0000 1.8 -+++ lib/isc/unix/stdio.c 6 Apr 2009 13:24:15 -0000 -@@ -115,3 +115,22 @@ isc_stdio_sync(FILE *f) { +diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c +index e60fa65..77f0b13 100644 +--- a/lib/isc/unix/stdio.c ++++ b/lib/isc/unix/stdio.c +@@ -149,3 +149,22 @@ isc_stdio_sync(FILE *f) { return (isc__errno2result(errno)); } diff --git a/sources b/sources index 43558ac..f7e1978 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bind-9.11.4-P2.tar.gz) = 6c01810526fc40485a6c0403d1ddc3b76d2e59b3426b5789436bd671f158d2fa0ea7c0aef2de81998ec715dabd06683fed7b17224d5c794c61e7100a69d4cb60 +SHA512 (bind-9.11.5.tar.gz) = 7e34c8033dabaed232479b1dc2849d1247c0137bcb2b63f08f8f72ff2cca0f73e0f05d0b9b8959f8c4db8ee36a700af30fe869be186c7bab7c81a25843384b8d SHA512 (config-18.tar.bz2) = c0a0a1fd58a7e2c09fe69915b9a4c682d1b6c96e78583f63ce5355f663c9509d28facfd3aa078b228b69954d0af4bfa484ef661a9568aaafe6eade97dda3c3d9

1 0

Architecture specific change in rpms/gcc.git
by githook-noreply＠fedoraproject.org 03 May '19

03 May '19

The package rpms/gcc.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gcc.git/commit/?id=28742415b7ce578a…. Change: +%ifarch %{ix86} x86_64 Thanks. Full change: ============ commit 672c273c6d3d662c93934ea3b26b23cecfd4a89f Author: Jakub Jelinek <jakub(a)redhat.com> Date: Fri May 3 14:30:20 2019 +0200 9.1.1-1 diff --git a/gcc9-pr90303.patch b/gcc9-pr90303.patch new file mode 100644 index 0000000..f67c9dd --- /dev/null +++ b/gcc9-pr90303.patch @@ -0,0 +1,39 @@ +2019-05-03 Jakub Jelinek <jakub(a)redhat.com> + + PR tree-optimization/90303 + * ipa-devirt.c (obj_type_ref_class, get_odr_type): Don't use + TYPE_CANONICAL for TYPE_STRUCTURAL_EQUALITY_P types in !in_lto_p mode. + + * g++.target/i386/pr90303.C: New test. + +--- gcc/ipa-devirt.c (revision 270834) ++++ gcc/ipa-devirt.c (revision 270835) +@@ -2020,7 +2020,7 @@ obj_type_ref_class (const_tree ref) + ref = TREE_VALUE (TYPE_ARG_TYPES (ref)); + gcc_checking_assert (TREE_CODE (ref) == POINTER_TYPE); + tree ret = TREE_TYPE (ref); +- if (!in_lto_p) ++ if (!in_lto_p && !TYPE_STRUCTURAL_EQUALITY_P (ret)) + ret = TYPE_CANONICAL (ret); + else + ret = get_odr_type (ret)->type; +@@ -2042,7 +2042,7 @@ get_odr_type (tree type, bool insert) + int base_id = -1; + + type = TYPE_MAIN_VARIANT (type); +- if (!in_lto_p) ++ if (!in_lto_p && !TYPE_STRUCTURAL_EQUALITY_P (type)) + type = TYPE_CANONICAL (type); + + gcc_checking_assert (can_be_name_hashed_p (type) +--- gcc/testsuite/g++.target/i386/pr90303.C (nonexistent) ++++ gcc/testsuite/g++.target/i386/pr90303.C (revision 270835) +@@ -0,0 +1,8 @@ ++// PR tree-optimization/90303 ++// { dg-do compile { target ia32 } } ++// { dg-additional-options "-O2" } ++ ++struct A { virtual void foo (); }; ++template <class> class B : A {}; ++typedef void (__attribute__((fastcall)) F) (); ++B<F> e; commit 94498d71044821d912bb6fb1d413a929038ad0fd Author: Jakub Jelinek <jakub(a)redhat.com> Date: Fri May 3 14:30:03 2019 +0200 9.1.1-1 diff --git a/.gitignore b/.gitignore index 21519f5..da7cf68 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ /gcc-9.0.1-20190418.tar.xz /gcc-9.0.1-20190426.tar.xz /gcc-9.0.1-20190430.tar.xz +/gcc-9.1.1-20190503.tar.xz diff --git a/gcc.spec b/gcc.spec index 474460d..92f0ebb 100644 --- a/gcc.spec +++ b/gcc.spec @@ -2963,7 +2963,7 @@ end - PR tree-optimization/90316 - fix up devirtualization ICE with fastcall attribute (#1705081, PR tree-optimization/90303) -- move Obsoletes for libcilkrts and libmpx from gcc to libgcc subpackage +- move Obsoletes for lib{cilkrts,mpx}{,-static} from gcc to libgcc subpackage * Tue Apr 30 2019 Jakub Jelinek <jakub(a)redhat.com> 9.0.1-0.16 - update from 9 branch diff --git a/sources b/sources index 2ba8128..f5e38f1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (gcc-9.0.1-20190430.tar.xz) = c1b6cfa8be2478aa6df3d7be247fcd5098f8d402e4c70ff65c6a439533dc327fd3249a48b357dd9e242afd67a1b4ea60b71baa709802716952a22677320fae9f +SHA512 (gcc-9.1.1-20190503.tar.xz) = 9787c7f4bc6a2e918cafa5ef0bc21dd29eb88541297168049cffea150d08f50023e6b639bc24fe53daf6f603db286a7a8dd17357d139f0d0cfb3cee2850fee8b SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) = 94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04 SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) = a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1 commit 28742415b7ce578ab1389777f532c966dfea7c69 Author: Jakub Jelinek <jakub(a)redhat.com> Date: Fri May 3 14:24:04 2019 +0200 9.1.1-1 diff --git a/gcc.spec b/gcc.spec index 4e50fd5..474460d 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,10 +1,10 @@ -%global DATE 20190430 -%global SVNREV 270701 -%global gcc_version 9.0.1 +%global DATE 20190503 +%global SVNREV 270850 +%global gcc_version 9.1.1 %global gcc_major 9 # Note, gcc_release must be integer, if you want to add suffixes to # %%{release}, append them after %%{gcc_release} on Release: line. -%global gcc_release 0.16 +%global gcc_release 1 %global nvptx_tools_gitrev c28050f60193b3b95a18866a96f03334e874e78f %global nvptx_newlib_gitrev aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24 %global _unpackaged_files_terminate_build 0 @@ -232,12 +232,6 @@ Requires: libgomp = %{version}-%{release} Obsoletes: gcc-gnat < %{version}-%{release} %endif Obsoletes: gcc-java < %{version}-%{release} -%ifarch %{ix86} x86_64 -Obsoletes: libcilkrts -Obsoletes: libcilkrts-static -Obsoletes: libmpx -Obsoletes: libmpx-static -%endif AutoReq: true Provides: bundled(libiberty) Provides: gcc(major) = %{gcc_major} @@ -254,6 +248,7 @@ Patch8: gcc9-foffload-default.patch Patch9: gcc9-Wno-format-security.patch Patch10: gcc9-rh1574936.patch Patch11: gcc9-d-shared-libphobos.patch +Patch12: gcc9-pr90303.patch Patch1000: nvptx-tools-no-ptxas.patch Patch1001: nvptx-tools-build.patch @@ -314,6 +309,12 @@ Obsoletes: libmudflap-static Obsoletes: libgcj < %{version}-%{release} Obsoletes: libgcj-devel < %{version}-%{release} Obsoletes: libgcj-src < %{version}-%{release} +%ifarch %{ix86} x86_64 +Obsoletes: libcilkrts +Obsoletes: libcilkrts-static +Obsoletes: libmpx +Obsoletes: libmpx-static +%endif %description -n libgcc This package contains GCC shared support library which is needed @@ -764,6 +765,7 @@ to NVidia PTX capable devices if available. %patch10 -p0 -b .rh1574936~ %endif %patch11 -p0 -b .d-shared-libphobos~ +%patch12 -p0 -b .pr90303~ cd nvptx-tools-%{nvptx_tools_gitrev} %patch1000 -p1 -b .nvptx-tools-no-ptxas~ @@ -2955,6 +2957,14 @@ end %endif %changelog +* Fri May 3 2019 Jakub Jelinek <jakub(a)redhat.com> 9.1.1-1 +- update from 9 branch + - GCC 9.1 release + - PR tree-optimization/90316 +- fix up devirtualization ICE with fastcall attribute (#1705081, + PR tree-optimization/90303) +- move Obsoletes for libcilkrts and libmpx from gcc to libgcc subpackage + * Tue Apr 30 2019 Jakub Jelinek <jakub(a)redhat.com> 9.0.1-0.16 - update from 9 branch - gcc 9.1-rc2 diff --git a/gcc9-libstdc++-docs.patch b/gcc9-libstdc++-docs.patch index be98558..4656a79 100644 --- a/gcc9-libstdc++-docs.patch +++ b/gcc9-libstdc++-docs.patch @@ -4,7 +4,7 @@ <a class="link" href="https://www.fsf.org" target="_top">FSF </a> </p><p> -+ Release 9.0.1 ++ Release 9.1.1 + </p><p> Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation @@ -17,7 +17,7 @@ </p><p> - The API documentation, rendered into HTML, can be viewed online + The API documentation, rendered into HTML, can be viewed locally -+ <a class="link" href="api/index.html" target="_top">for the 9.0.1 release</a>, ++ <a class="link" href="api/index.html" target="_top">for the 9.1.1 release</a>, + online <a class="link" href="http://gcc.gnu.org/onlinedocs/" target="_top">for each GCC release</a> and

1 0

Architecture specific change in rpms/gcc.git
by githook-noreply＠fedoraproject.org 03 May '19

03 May '19

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes May 2019