September 2019 - Arch-excludes - Fedora mailing-lists

Architecture specific change in rpms/ignition.git
by githook-noreply＠fedoraproject.org 25 Sep '19

25 Sep '19

The package rpms/ignition.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/ignition.git/commit/?id=eb718b540d9…. Change: -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} Thanks. Full change: ============ commit 3b622206f61756da9b60e3be679e7da006e5fc48 Author: Colin Walters <walters(a)verbum.org> Date: Wed Sep 25 20:38:39 2019 +0000 Bump to latest in prep for rootfs redeploy work diff --git a/.gitignore b/.gitignore index 1a1934a..85cd434 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /ignition-0c1da80.tar.gz /ignition-e75cf24.tar.gz /ignition-dracut-343b886.tar.gz +/ignition-dracut-d63f76f.tar.gz +/ignition-641ec6a.tar.gz diff --git a/ignition.spec b/ignition.spec index 0964b64..3f804ac 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit e75cf24183d7ebb86babf517e69fda6f3ca8f13d +%global commit 641ec6a44062f956bf1d46cf10824032a1996590 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 343b886954fe8be02755d3690f627920e6123afd +%global dracutcommit d63f76f958fabe44474f207c41ca8da1e8ffcf2d %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.0.1 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -503,6 +503,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Sep 25 2019 Colin Walters <walters(a)verbum.org> - 2.0.1-4.git641ec6a +- Bump to latest in prep for rootfs redeploy work + * Sat Sep 21 2019 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.0.1-3.gite75cf24 - Fix up arch dependencies for new golang specs diff --git a/sources b/sources index 99ceb2e..70648f5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-e75cf24.tar.gz) = 218359576953b886c87035ec3421c37b272ee68ecc2f210c5fb8e5b3a1bfb2dabafdeae9cf6259c064ed538d99ca3dbdfbc6f6a39df600dbe1844c02e9a69430 -SHA512 (ignition-dracut-343b886.tar.gz) = d6bdf7c8cacd8cc20d82a4b0c50996bbe9821bce69ce1bd05433c5c470a7422aac4d4664446a39df654e14c915262e987b17031dae9150d5bd1eadf81fa5ad64 +SHA512 (ignition-dracut-d63f76f.tar.gz) = db0956f4cb5d18083e773a3762a05439da8f641616ba8a311bcaa75f35744caf068039d9190851aa7081ef6683a878f8e2d59e727f760203fb645576454add5d +SHA512 (ignition-641ec6a.tar.gz) = e5fb7e4f0977ea5c40f721401951c35753b03f7b076435b2ff56f6dd16c1cecfd874872294967d8a2b61ff934e46fd363b27d90d4aa143519d717262e43f16bd commit eb718b540d9b917592eb80dae9d412facb2b4e6d Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Sat Sep 21 11:47:00 2019 +0100 fix up arch deps for latest golang specs so all the right arches get built diff --git a/ignition.spec b/ignition.spec index 1180c75..0964b64 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,27 +73,16 @@ Name: ignition Version: 2.0.1 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz -# For RHEL7 we'll want to specify gopath and list of arches since there is no -# gopath or go_arches macro. We'll also want to make sure we pull in golang -# 1.10 require golang >= 1.10 -%if 0%{?rhel} <= 7 && 0%{?centos} == 0 %define gopath %{_datadir}/gocode -ExclusiveArch: x86_64 ppc64le aarch64 s390x +ExcludeArch: ppc64 BuildRequires: golang >= 1.10 -%else -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -%endif - # add non golang BuildRequires that weren't detected BuildRequires: libblkid-devel @@ -514,6 +503,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Sep 21 2019 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.0.1-3.gite75cf24 +- Fix up arch dependencies for new golang specs + * Fri Aug 16 2019 Colin Walters <walters(a)verbum.org> - 2.0.1-2.gite75cf24 - Update dracut for gpt fixes

1 0

Architecture specific change in rpms/clang8.0.git
by githook-noreply＠fedoraproject.org 25 Sep '19

25 Sep '19

The package rpms/clang8.0.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/clang8.0.git/commit/?id=ce4d405379f…. Change: +%ifarch s390x i686 ppc64le %{arm} Thanks. Full change: ============ commit 4ad0d57ff674d85c9059e6fb3e5af555edb1a9aa Author: Tom Stellard <tstellar(a)redhat.com> Date: Mon Sep 23 16:55:03 2019 +0000 Rebuild with fc32 dist tag diff --git a/clang.spec b/clang.spec index 87b7d5c..34a0906 100644 --- a/clang.spec +++ b/clang.spec @@ -4,7 +4,7 @@ %global min_ver 0 %global patch_ver 0 #%%global rc_ver 4 -%global baserelease 3 +%global baserelease 4 %global clang_tools_binaries \ %{_bindir}/clangd \ @@ -429,6 +429,9 @@ false %endif %changelog +* Mon Sep 23 2019 Tom Stellard <tstellar(a)redhat.com> - 8.0.0-4 +- Rebuild with fc32 dist tag + * Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.0.0-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild commit ce4d405379f71e7cbf51091ff6e47bf179707d2e Author: Tom Stellard <tstellar(a)redhat.com> Date: Thu Aug 15 03:08:13 2019 +0000 Add missing spec file diff --git a/clang.spec b/clang.spec new file mode 100644 index 0000000..87b7d5c --- /dev/null +++ b/clang.spec @@ -0,0 +1,729 @@ +%global compat_build 1 + +%global maj_ver 8 +%global min_ver 0 +%global patch_ver 0 +#%%global rc_ver 4 +%global baserelease 3 + +%global clang_tools_binaries \ + %{_bindir}/clangd \ + %{_bindir}/clang-apply-replacements \ + %{_bindir}/clang-change-namespace \ + %{_bindir}/clang-include-fixer \ + %{_bindir}/clang-query \ + %{_bindir}/clang-refactor \ + %{_bindir}/clang-reorder-fields \ + %{_bindir}/clang-rename \ + %{_bindir}/clang-tidy + +%global clang_binaries \ + %{_bindir}/clang \ + %{_bindir}/clang++ \ + %{_bindir}/clang-%{maj_ver} \ + %{_bindir}/clang++-%{maj_ver} \ + %{_bindir}/clang-check \ + %{_bindir}/clang-cl \ + %{_bindir}/clang-cpp \ + %{_bindir}/clang-extdef-mapping \ + %{_bindir}/clang-format \ + %{_bindir}/clang-import-test \ + %{_bindir}/clang-offload-bundler \ + %{_bindir}/diagtool \ + %{_bindir}/hmaptool + +%if 0%{?compat_build} +%global pkg_name clang%{maj_ver}.%{min_ver} +# Install clang to same prefix as llvm, so that apps that use llvm-config +# will also be able to find clang libs. +%global install_prefix %{_libdir}/llvm%{maj_ver}.%{min_ver} +%global install_bindir %{install_prefix}/bin +%global install_includedir %{install_prefix}/include +%global install_libdir %{install_prefix}/lib + +%global pkg_bindir %{install_bindir} +%global pkg_includedir %{_includedir}/llvm%{maj_ver}.%{min_ver} +%global pkg_libdir %{install_libdir} +%else +%global pkg_name clang +%global install_prefix /usr +%endif + +%if 0%{?fedora} || 0%{?rhel} > 7 +%bcond_without python3 +%else +%bcond_with python3 +%endif + +%global build_install_prefix %{buildroot}%{install_prefix} + +%global clang_srcdir cfe-%{version}%{?rc_ver:rc%{rc_ver}}.src +%global clang_tools_srcdir clang-tools-extra-%{version}%{?rc_ver:rc%{rc_ver}}.src + +Name: %pkg_name +Version: %{maj_ver}.%{min_ver}.%{patch_ver} +Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} +Summary: A C language family front-end for LLVM + +License: NCSA +URL: http://llvm.org +Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{clang_srcdir}.tar.xz +%if !0%{?compat_build} +Source1: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz +%endif + +Patch4: 0002-gtest-reorg.patch +Patch9: 0001-Fix-uninitialized-value-in-ABIArgInfo.patch +Patch11: 0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch +Patch12: 0001-Fix-isInSystemMacro-to-handle-pasted-macros.patch +Patch13: 0002-Format-isInSystemMacro-after-D55782.patch +Patch14: 0003-Fix-isInSystemMacro-in-presence-of-macro-and-pasted-.patch + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: ninja-build +%if 0%{?compat_build} +BuildRequires: llvm%{maj_ver}.%{min_ver}-devel = %{version} +BuildRequires: llvm%{maj_ver}.%{min_ver}-static = %{version} +%else +BuildRequires: llvm-devel = %{version} +BuildRequires: llvm-test = %{version} +# llvm-static is required, because clang-tablegen needs libLLVMTableGen, which +# is not included in libLLVM.so. +BuildRequires: llvm-static = %{version} +BuildRequires: llvm-googletest = %{version} +%endif + +BuildRequires: libxml2-devel +BuildRequires: perl-generators +BuildRequires: ncurses-devel +# According to https://fedoraproject.org/wiki/Packaging:Emacs a package +# should BuildRequires: emacs if it packages emacs integration files. +BuildRequires: emacs + +# These build dependencies are required for the test suite. +%if %with python3 +# The testsuite uses /usr/bin/lit which is part of the python3-lit package. +BuildRequires: python3-lit +%endif + +BuildRequires: python3-sphinx +BuildRequires: libatomic + +# We need python3-devel for pathfix.py. +BuildRequires: python3-devel + +# Needed for %%multilib_fix_c_header +BuildRequires: multilib-rpm-config +BuildRequires: chrpath + +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +# clang requires gcc, clang++ requires libstdc++-devel +# - https://bugzilla.redhat.com/show_bug.cgi?id=1021645 +# - https://bugzilla.redhat.com/show_bug.cgi?id=1158594 +Requires: libstdc++-devel +Requires: gcc-c++ + +Requires: emacs-filesystem + +Provides: clang(major) = %{maj_ver} + +%description +clang: noun + 1. A loud, resonant, metallic sound. + 2. The strident call of a crane or goose. + 3. C-language family front-end toolkit. + +The goal of the Clang project is to create a new C, C++, Objective C +and Objective C++ front-end for the LLVM compiler. Its tools are built +as libraries and designed to be loosely-coupled and extensible. + +%package libs +Summary: Runtime library for clang +Recommends: compiler-rt%{?_isa} = %{version} +Recommends: libomp%{_isa} = %{version} + +%description libs +Runtime library for clang. + +%package devel +Summary: Development header files for clang +%if !0%{?compat_build} +Requires: %{name}%{?_isa} = %{version}-%{release} +# The clang CMake files reference tools from clang-tools-extra. +Requires: %{name}-tools-extra%{?_isa} = %{version}-%{release} +%endif + +%description devel +Development header files for clang. + +%if !0%{?compat_build} +%package analyzer +Summary: A source code analysis framework +License: NCSA and MIT +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description analyzer +The Clang Static Analyzer consists of both a source code analysis +framework and a standalone tool that finds bugs in C and Objective-C +programs. The standalone tool is invoked from the command-line, and is +intended to run in tandem with a build of a project or code base. + +%package tools-extra +Summary: Extra tools for clang +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: emacs-filesystem + +%description tools-extra +A set of extra tools built using Clang's tooling API. + +# Put git-clang-format in its own package, because it Requires git +# and we don't want to force users to install all those dependenices if they +# just want clang. +%package -n git-clang-format +Summary: Integration of clang-format for git +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: git +Requires: python3 + +%description -n git-clang-format +clang-format integration for git. + + +%package -n python3-clang +Summary: Python3 bindings for clang +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: python3 +%description -n python3-clang +%{summary}. + + +%endif + + +%prep +%if 0%{?compat_build} +%autosetup -n %{clang_srcdir} -p1 +%else +%setup -T -q -b 1 -n %{clang_tools_srcdir} + + +pathfix.py -i %{__python3} -pn \ + clang-tidy/tool/*.py \ + include-fixer/find-all-symbols/tool/run-find-all-symbols.py + +%setup -q -n %{clang_srcdir} + +%patch4 -p1 -b .gtest +%patch9 -p1 -b .abi-arginfo +%patch11 -p1 -b .libcxx-fix +%patch12 -p1 -b .double-promotion-0 +%patch13 -p1 -b .double-promotion-1 +%patch14 -p1 -b .double-promotion-2 + +mv ../%{clang_tools_srcdir} tools/extra + +pathfix.py -i %{__python3} -pn \ + tools/clang-format/*.py \ + tools/clang-format/git-clang-format \ + utils/hmaptool/hmaptool \ + tools/scan-view/bin/scan-view +%endif + +%build + +%if 0%{?__isa_bits} == 64 +sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py +%else +sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py +%endif + +mkdir -p _build +cd _build + +%ifarch s390 s390x %{arm} %ix86 +# Decrease debuginfo verbosity to reduce memory consumption during final library linking +%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') +%endif + +%cmake .. -G Ninja \ + -DLLVM_PARALLEL_LINK_JOBS=1 \ + -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DPYTHON_EXECUTABLE=%{__python3} \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DCMAKE_INSTALL_RPATH:BOOL=OFF \ +%if 0%{?compat_build} + -DLLVM_CONFIG:FILEPATH=%{_bindir}/llvm-config-%{maj_ver}.%{min_ver}-%{__isa_bits} \ + -DCMAKE_INSTALL_PREFIX=%{install_prefix} \ + -DCLANG_INCLUDE_TESTS:BOOL=OFF \ +%else + -DCLANG_INCLUDE_TESTS:BOOL=ON \ + -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ + -DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \ +%if 0%{?__isa_bits} == 64 + -DLLVM_LIBDIR_SUFFIX=64 \ +%else + -DLLVM_LIBDIR_SUFFIX= \ +%endif +%endif + \ +%if !0%{compat_build} + -DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \ +%else + -DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen-%{maj_ver}.%{min_ver} \ +%endif + -DCLANG_ENABLE_ARCMT:BOOL=ON \ + -DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \ + -DCLANG_INCLUDE_DOCS:BOOL=ON \ + -DCLANG_PLUGIN_SUPPORT:BOOL=ON \ + -DENABLE_LINKER_BUILD_ID:BOOL=ON \ + -DLLVM_ENABLE_EH=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_BUILD_DOCS=ON \ + -DLLVM_ENABLE_SPHINX=ON \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF \ + \ + -DCLANG_BUILD_EXAMPLES:BOOL=OFF \ + -DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" + +ninja -v + +%install +DESTDIR=%{buildroot} ninja install -C _build + +%if 0%{?compat_build} + +# Remove binaries/other files +rm -Rf %{buildroot}%{install_bindir} +rm -Rf %{buildroot}%{install_prefix}/share +rm -Rf %{buildroot}%{install_prefix}/libexec + +# Move include files +mkdir -p %{buildroot}%{pkg_includedir} +mv %{buildroot}/%{install_includedir}/clang %{buildroot}/%{pkg_includedir}/ +mv %{buildroot}/%{install_includedir}/clang-c %{buildroot}/%{pkg_includedir}/ + +%else + +# install clang python bindings +mkdir -p %{buildroot}%{python3_sitelib}/clang/ +install -p -m644 bindings/python/clang/* %{buildroot}%{python3_sitelib}/clang/ +%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/clang + +# multilib fix +%multilib_fix_c_header --file %{_includedir}/clang/Config/config.h + +# Move emacs integration files to the correct directory +mkdir -p %{buildroot}%{_emacs_sitestartdir} +for f in clang-format.el clang-rename.el clang-include-fixer.el; do +mv %{buildroot}{%{_datadir}/clang,%{_emacs_sitestartdir}}/$f +done + +# remove editor integrations (bbedit, sublime, emacs, vim) +rm -vf %{buildroot}%{_datadir}/clang/clang-format-bbedit.applescript +rm -vf %{buildroot}%{_datadir}/clang/clang-format-sublime.py* + +# TODO: Package html docs +rm -Rvf %{buildroot}%{_pkgdocdir} + +# TODO: What are the Fedora guidelines for packaging bash autocomplete files? +rm -vf %{buildroot}%{_datadir}/clang/bash-autocomplete.sh + +# Create Manpage symlinks +ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++.1.gz +ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang-%{maj_ver}.1.gz +ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++-%{maj_ver}.1.gz + +# Add clang++-{version} symlink +ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver} + + +# Fix permission +chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1* + +%endif + +%check +%if !0%{?compat_build} +# requires lit.py from LLVM utilities +# FIXME: Fix failing ARM tests, s390x i686 and ppc64le tests +LD_LIBRARY_PATH=%{buildroot}%{_libdir} ninja check-all -C _build || \ +%ifarch s390x i686 ppc64le %{arm} +: +%else +false +%endif + +%endif + + +%if !0%{?compat_build} +%files +%{clang_binaries} +%{_bindir}/c-index-test +%{_mandir}/man1/clang.1.gz +%{_mandir}/man1/clang++.1.gz +%{_mandir}/man1/clang-%{maj_ver}.1.gz +%{_mandir}/man1/clang++-%{maj_ver}.1.gz +%{_mandir}/man1/diagtool.1.gz +%{_emacs_sitestartdir}/clang-format.el +%{_datadir}/clang/clang-format.py* +%{_datadir}/clang/clang-format-diff.py* +%endif + +%files libs +%if !0%{?compat_build} +%{_libdir}/clang/ +%{_libdir}/*.so.* +%else +%{pkg_libdir}/*.so.* +%{pkg_libdir}/clang/%{version} +%endif + +%files devel +%if !0%{?compat_build} +%{_libdir}/*.so +%{_includedir}/clang/ +%{_includedir}/clang-c/ +%{_libdir}/cmake/* +%dir %{_datadir}/clang/ +%else +%{pkg_libdir}/*.so +%{pkg_includedir}/clang/ +%{pkg_includedir}/clang-c/ +%{pkg_libdir}/cmake/ +%endif + +%if !0%{?compat_build} +%files analyzer +%{_bindir}/scan-view +%{_bindir}/scan-build +%{_libexecdir}/ccc-analyzer +%{_libexecdir}/c++-analyzer +%{_datadir}/scan-view/ +%{_datadir}/scan-build/ +%{_mandir}/man1/scan-build.1.* + +%files tools-extra +%{clang_tools_binaries} +%{_bindir}/find-all-symbols +%{_bindir}/modularize +%{_emacs_sitestartdir}/clang-rename.el +%{_emacs_sitestartdir}/clang-include-fixer.el +%{_datadir}/clang/clang-include-fixer.py* +%{_datadir}/clang/clang-tidy-diff.py* +%{_datadir}/clang/run-clang-tidy.py* +%{_datadir}/clang/run-find-all-symbols.py* +%{_datadir}/clang/clang-rename.py* + +%files -n git-clang-format +%{_bindir}/git-clang-format + +%files -n python3-clang +%{python3_sitelib}/clang/ + + +%endif +%changelog +* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.0.0-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 16 2019 sguelton(a)redhat.com - 8.0.0-3 +- Fix for rhbz#1674031 + +* Fri Apr 12 2019 sguelton(a)redhat.com - 8.0.0-2 +- Remove useless patch thanks to GCC upgrade + +* Wed Mar 20 2019 sguelton(a)redhat.com - 8.0.0-1 +- 8.0.0 final + +* Tue Mar 12 2019 sguelton(a)redhat.com - 8.0.0-0.6.rc4 +- 8.0.0 Release candidate 4 + +* Mon Mar 4 2019 sguelton(a)redhat.com - 8.0.0-0.5.rc3 +- Cleanup specfile after llvm dependency update + +* Mon Mar 4 2019 sguelton(a)redhat.com - 8.0.0-0.4.rc3 +- 8.0.0 Release candidate 3 + +* Mon Feb 25 2019 tstellar(a)redhat.com - 8.0.0-0.3.rc2 +- Fix compiling with -stdlib=libc++ + +* Thu Feb 21 2019 sguelton(a)redhat.com - 8.0.0-0.2.rc2 +- 8.0.0 Release candidate 2 + +* Sat Feb 09 2019 sguelton(a)redhat.com - 8.0.0-0.1.rc1 +- 8.0.0 Release candidate 1 + +* Tue Feb 05 2019 sguelton(a)redhat.com - 7.0.1-6 +- Update patch for Python3 port of scan-view + +* Tue Feb 05 2019 sguelton(a)redhat.com - 7.0.1-5 +- Working CI test suite + +* Mon Feb 04 2019 sguelton(a)redhat.com - 7.0.1-4 +- Workaround gcc-9 bug when compiling bitfields + +* Fri Feb 01 2019 sguelton(a)redhat.com - 7.0.1-3 +- Fix uninitialized error detected by gcc-9 + +* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.0.1-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Dec 19 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.1-2 +- Fix for rhbz#1657544 + +* Tue Dec 18 2018 sguelton(a)redhat.com - 7.0.1-1 +- 7.0.1 + +* Tue Dec 18 2018 sguelton(a)redhat.com - 7.0.0-10 +- Install proper manpage symlinks for clang/clang++ versions + +* Fri Dec 14 2018 sguelton(a)redhat.com - 7.0.0-9 +- No longer Ignore -fstack-clash-protection option + +* Tue Dec 04 2018 sguelton(a)redhat.com - 7.0.0-8 +- Ensure rpmlint passes on specfile + +* Fri Nov 30 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-7 +- Drop python2 dependency from clang-tools-extra + +* Wed Nov 21 2018 sguelton(a)redhat.com - 7.0.0-6 +- Prune unneeded reference to llvm-test-suite sub-package + +* Mon Nov 19 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-5 +- Run 'make check-all' instead of 'make check-clang' + +* Mon Nov 19 2018 sergesanspaille <sguelton(a)redhat.com> - 7.0.0-4 +- Avoid Python2 + Python3 dependency for clang-analyzer + +* Mon Nov 05 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-3 +- User helper macro to fixup config.h for multilib + +* Tue Oct 02 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-2 +- Use correct shebang substitution for python scripts + +* Mon Sep 24 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-1 +- 7.0.0 Release + +* Wed Sep 19 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.16.rc3 +- Move builtin headers into clang-libs sub-package + +* Wed Sep 19 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.15.rc3 +- Remove ambiguous python shebangs + +* Thu Sep 13 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.14.rc3 +- Move unversioned shared objects to devel package + +* Thu Sep 13 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.13.rc3 +- Rebuild with new llvm-devel that disables rpath on install + +* Thu Sep 13 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.12.rc3 +- Fix clang++-7 symlink + +* Wed Sep 12 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.11.rc3 +- 7.0.0-rc3 Release + +* Mon Sep 10 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.10.rc2 +- Drop siod from llvm-test-suite + +* Fri Sep 07 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.9.rc2 +- Drop python2 dependency from clang package + +* Thu Sep 06 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.8.rc2 +- Drop all uses of python2 from lit tests + +* Sat Sep 01 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.7.rc2 +- Add Fedora specific version string + +* Tue Aug 28 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.6.rc2 +- 7.0.0-rc2 Release + +* Tue Aug 28 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.5.rc1 +- Enable unit tests + +* Fri Aug 17 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.4.rc1 +- Move llvm-test-suite into a sub-package + +* Fri Aug 17 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.3.rc1 +- Recommend the same version of compiler-rt + +* Wed Aug 15 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.2.rc1 +- Rebuild for f30 + +* Mon Aug 13 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.1.rc1 +- 7.0.0-rc1 Release + +* Mon Jul 23 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.1-3 +- Sync spec file with the clang6.0 package + +* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 26 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.1-1 +- 6.0.1 Release + +* Wed Jun 13 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.1-0.2.rc2 +- 6.0.1-rc2 + +* Fri May 11 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.1-0.1.rc1 +- 6.0.1-rc1 Release + +* Fri Mar 23 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-5 +- Add a clang++-{version} symlink rhbz#1534098 + +* Thu Mar 22 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-4 +- Use correct script for running lit tests + +* Wed Mar 21 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-3 +- Fix toolchain detection so we don't default to using cross-compilers: + rhbz#1482491 + +* Mon Mar 12 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-2 +- Add Provides: clang(major) rhbz#1547444 + +* Fri Mar 09 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-1 +- 6.0.0 Release + +* Mon Feb 12 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-0.6.rc2 +- 6.0.0-rc2 Release + +* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.0-0.5.rc1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Feb 01 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-0.4.rc1 +- Package python helper scripts for tools + +* Fri Jan 26 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-0.3.rc1 +- Ignore -fstack-clash-protection option instead of giving an error + +* Fri Jan 26 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-0.2.rc1 +- Package emacs integration files + +* Wed Jan 24 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-0.1.rc1 +- 6.0.0-rc1 Release + +* Wed Jan 24 2018 Tom Stellard <tstellar(a)redhat.com> - 5.0.1-3 +- Rebuild against llvm5.0 compatibility package +- rhbz#1538231 + +* Wed Jan 03 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 5.0.1-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Dec 20 2017 Tom Stellard <tstellar(a)redhat.com> - 5.0.1-1 +- 5.0.1 Release + +* Wed Dec 13 2017 Tom Stellard <tstellar(a)redhat.com> - 5.0.0-3 +- Make compiler-rt a weak dependency and add a weak dependency on libomp + +* Mon Nov 06 2017 Merlin Mathesius <mmathesi(a)redhat.com> - 5.0.0-2 +- Cleanup spec file conditionals + +* Mon Oct 16 2017 Tom Stellard <tstellar(a)redhat.com> - 5.0.0-1 +- 5.0.0 Release + +* Wed Oct 04 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 4.0.1-6 +- python2-clang subpkg (#1490997) +- tools-extras: tighten (internal) -libs dep +- %%install: avoid cd + +* Wed Aug 30 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.1-5 +- Add Requires: python for git-clang-format + +* Sun Aug 06 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 4.0.1-4 +- Rebuilt for AutoReq cmake-filesystem + +* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jun 23 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.1-1 +- 4.0.1 Release. + +* Fri Jun 16 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-8 +- Enable make check-clang + +* Mon Jun 12 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-7 +- Package git-clang-format + +* Thu Jun 08 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-6 +- Generate man pages + +* Thu Jun 08 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-5 +- Ignore test-suite failures until all arches are fixed. + +* Mon Apr 03 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-4 +- Run llvm test-suite + +* Mon Mar 27 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-3 +- Enable eh/rtti, which are required by lldb. + +* Fri Mar 24 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-2 +- Fix clang-tools-extra build +- Fix install + +* Thu Mar 23 2017 Tom Stellard <tstellar(a)redhat.com> - 4.0.0-1 +- clang 4.0.0 final release + +* Mon Mar 20 2017 David Goerger <david.goerger(a)yale.edu> - 3.9.1-3 +- add clang-tools-extra rhbz#1328091 + +* Thu Mar 16 2017 Tom Stellard <tstellar(a)redhat.com> - 3.9.1-2 +- Enable build-id by default rhbz#1432403 + +* Thu Mar 02 2017 Dave Airlie <airlied(a)redhat.com> - 3.9.1-1 +- clang 3.9.1 final release + +* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Nov 14 2016 Nathaniel McCallum <npmccallum(a)redhat.com> - 3.9.0-3 +- Add Requires: compiler-rt to clang-libs. +- Without this, compiling with certain CFLAGS breaks. + +* Tue Nov 1 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.9.0-2 +- Rebuild for new arches + +* Fri Oct 14 2016 Dave Airlie <airlied(a)redhat.com> - 3.9.0-1 +- clang 3.9.0 final release + +* Fri Jul 01 2016 Stephan Bergmann <sbergman(a)redhat.com> - 3.8.0-2 +- Resolves: rhbz#1282645 add GCC abi_tag support + +* Thu Mar 10 2016 Dave Airlie <airlied(a)redhat.com> 3.8.0-1 +- clang 3.8.0 final release + +* Thu Mar 03 2016 Dave Airlie <airlied(a)redhat.com> 3.8.0-0.4 +- clang 3.8.0rc3 + +* Wed Feb 24 2016 Dave Airlie <airlied(a)redhat.com> - 3.8.0-0.3 +- package all libs into clang-libs. + +* Wed Feb 24 2016 Dave Airlie <airlied(a)redhat.com> 3.8.0-0.2 +- enable dynamic linking of clang against llvm + +* Thu Feb 18 2016 Dave Airlie <airlied(a)redhat.com> - 3.8.0-0.1 +- clang 3.8.0rc2 + +* Fri Feb 12 2016 Dave Airlie <airlied(a)redhat.com> 3.7.1-4 +- rebuild against latest llvm packages +- add BuildRequires llvm-static + +* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 28 2016 Dave Airlie <airlied(a)redhat.com> 3.7.1-2 +- just accept clang includes moving to /usr/lib64, upstream don't let much else happen + +* Thu Jan 28 2016 Dave Airlie <airlied(a)redhat.com> 3.7.1-1 +- initial build in Fedora. + +* Tue Oct 06 2015 Jan Vcelak <jvcelak(a)fedoraproject.org> 3.7.0-100 +- initial version using cmake build system commit 0e26e50d38d48f6ea9a01837b60449ba333f4a55 Author: Tom Stellard <tstellar(a)redhat.com> Date: Wed Aug 14 21:43:42 2019 +0000 Pull spec file from clang package diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..526f1ad --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/cfe-8.0.0.src.tar.xz diff --git a/0001-Fix-isInSystemMacro-to-handle-pasted-macros.patch b/0001-Fix-isInSystemMacro-to-handle-pasted-macros.patch new file mode 100644 index 0000000..9480f42 --- /dev/null +++ b/0001-Fix-isInSystemMacro-to-handle-pasted-macros.patch @@ -0,0 +1,137 @@ +From cb7fd3caeee52fe94461b717294c4db4056853e3 Mon Sep 17 00:00:00 2001 +From: Serge Guelton <sguelton(a)redhat.com> +Date: Fri, 1 Feb 2019 06:11:44 +0000 +Subject: [PATCH 1/3] Fix isInSystemMacro to handle pasted macros + +Token pasted by the preprocessor (through ##) have a Spelling pointing to scratch buffer. +As a result they are not recognized at system macro, even though the pasting happened in +a system macro. Fix that by looking into the parent macro if the original lookup finds a +scratch buffer. + +Differential Revision: https://reviews.llvm.org/D55782 + +This effectively fixes https://bugs.llvm.org/show_bug.cgi?id=35268, + +git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@352838 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + include/clang/Basic/SourceManager.h | 18 +++++++++++++++++- + test/Misc/no-warn-in-system-macro.c | 13 +++++++++++++ + test/Misc/no-warn-in-system-macro.c.inc | 9 +++++++++ + test/Misc/warn-in-system-macro-def.c | 21 +++++++++++++++++++++ + test/Misc/warn-in-system-macro-def.c.inc | 4 ++++ + 5 files changed, 64 insertions(+), 1 deletion(-) + create mode 100644 test/Misc/no-warn-in-system-macro.c + create mode 100644 test/Misc/no-warn-in-system-macro.c.inc + create mode 100644 test/Misc/warn-in-system-macro-def.c + create mode 100644 test/Misc/warn-in-system-macro-def.c.inc + +diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h +index dcc4a37e23..c6b92f9000 100644 +--- a/include/clang/Basic/SourceManager.h ++++ b/include/clang/Basic/SourceManager.h +@@ -1441,6 +1441,12 @@ public: + return Filename.equals("<command line>"); + } + ++ /// Returns whether \p Loc is located in a <scratch space> file. ++ bool isWrittenInScratchSpace(SourceLocation Loc) const { ++ StringRef Filename(getPresumedLoc(Loc).getFilename()); ++ return Filename.equals("<scratch space>"); ++ } ++ + /// Returns if a SourceLocation is in a system header. + bool isInSystemHeader(SourceLocation Loc) const { + return isSystem(getFileCharacteristic(Loc)); +@@ -1453,7 +1459,17 @@ public: + + /// Returns whether \p Loc is expanded from a macro in a system header. + bool isInSystemMacro(SourceLocation loc) const { +- return loc.isMacroID() && isInSystemHeader(getSpellingLoc(loc)); ++ if(!loc.isMacroID()) ++ return false; ++ ++ // This happens when the macro is the result of a paste, in that case ++ // its spelling is the scratch memory, so we take the parent context. ++ if (isWrittenInScratchSpace(getSpellingLoc(loc))) { ++ return isInSystemHeader(getSpellingLoc(getImmediateMacroCallerLoc(loc))); ++ } ++ else { ++ return isInSystemHeader(getSpellingLoc(loc)); ++ } + } + + /// The size of the SLocEntry that \p FID represents. +diff --git a/test/Misc/no-warn-in-system-macro.c b/test/Misc/no-warn-in-system-macro.c +new file mode 100644 +index 0000000000..a319b14c9c +--- /dev/null ++++ b/test/Misc/no-warn-in-system-macro.c +@@ -0,0 +1,13 @@ ++// RUN: %clang_cc1 -isystem %S -Wdouble-promotion -fsyntax-only %s 2>&1 | FileCheck -allow-empty %s ++// CHECK-NOT: warning: ++ ++#include <no-warn-in-system-macro.c.inc> ++ ++int main(void) ++{ ++ double foo = 1.0; ++ ++ if (isnan(foo)) ++ return 1; ++ return 0; ++} +diff --git a/test/Misc/no-warn-in-system-macro.c.inc b/test/Misc/no-warn-in-system-macro.c.inc +new file mode 100644 +index 0000000000..3cbe7dfc16 +--- /dev/null ++++ b/test/Misc/no-warn-in-system-macro.c.inc +@@ -0,0 +1,9 @@ ++extern int __isnanf(float f); ++extern int __isnan(double f); ++extern int __isnanl(long double f); ++#define isnan(x) \ ++ (sizeof (x) == sizeof (float) \ ++ ? __isnanf (x) \ ++ : sizeof (x) == sizeof (double) \ ++ ? __isnan (x) : __isnanl (x)) ++ +diff --git a/test/Misc/warn-in-system-macro-def.c b/test/Misc/warn-in-system-macro-def.c +new file mode 100644 +index 0000000000..b295130702 +--- /dev/null ++++ b/test/Misc/warn-in-system-macro-def.c +@@ -0,0 +1,21 @@ ++// RUN: %clang_cc1 -isystem %S -Wdouble-promotion -fsyntax-only %s 2>&1 | FileCheck -allow-empty %s ++// CHECK: warning: ++// CHECK: expanded from macro 'ISNAN' ++// CHECK: expanded from macro 'isnan' ++ ++#include <warn-in-system-macro-def.c.inc> ++ ++#define isnan(x) \ ++ (sizeof (x) == sizeof (float) \ ++ ? __isnanf (x) \ ++ : sizeof (x) == sizeof (double) \ ++ ? __isnan (x) : __isnanl (x)) ++ ++int main(void) ++{ ++ double foo = 1.0; ++ ++ if (ISNAN(foo)) ++ return 1; ++ return 0; ++} +diff --git a/test/Misc/warn-in-system-macro-def.c.inc b/test/Misc/warn-in-system-macro-def.c.inc +new file mode 100644 +index 0000000000..5c7e60275a +--- /dev/null ++++ b/test/Misc/warn-in-system-macro-def.c.inc +@@ -0,0 +1,4 @@ ++extern int __isnanf(float f); ++extern int __isnan(double f); ++extern int __isnanl(long double f); ++#define ISNAN isnan +-- +2.20.1 + diff --git a/0001-Fix-uninitialized-value-in-ABIArgInfo.patch b/0001-Fix-uninitialized-value-in-ABIArgInfo.patch new file mode 100644 index 0000000..9755200 --- /dev/null +++ b/0001-Fix-uninitialized-value-in-ABIArgInfo.patch @@ -0,0 +1,38 @@ +From 565b9633ee68b311c1a954022869d9e99fee7286 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille <sguelton(a)redhat.com> +Date: Fri, 1 Feb 2019 06:39:13 +0000 +Subject: [PATCH] Fix uninitialized value in ABIArgInfo + +GCC-9 takes advantage of this uninitialized values to optimize stuff, +which ends up in failing validation when compiling clang. +--- + include/clang/CodeGen/CGFunctionInfo.h | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/include/clang/CodeGen/CGFunctionInfo.h b/include/clang/CodeGen/CGFunctionInfo.h +index cf64e9f3ee..131eb38393 100644 +--- a/include/clang/CodeGen/CGFunctionInfo.h ++++ b/include/clang/CodeGen/CGFunctionInfo.h +@@ -112,14 +112,13 @@ private: + } + + ABIArgInfo(Kind K) +- : TheKind(K), PaddingInReg(false), InReg(false), SuppressSRet(false) { +- } ++ : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0), ++ TheKind(K), PaddingInReg(false), InAllocaSRet(false), IndirectByVal(false), ++ IndirectRealign(false), SRetAfterThis(false), InReg(false), ++ CanBeFlattened(false), SignExt(false), SuppressSRet(false) {} + + public: +- ABIArgInfo() +- : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0), +- TheKind(Direct), PaddingInReg(false), InReg(false), +- SuppressSRet(false) {} ++ ABIArgInfo() : ABIArgInfo(Direct) {} + + static ABIArgInfo getDirect(llvm::Type *T = nullptr, unsigned Offset = 0, + llvm::Type *Padding = nullptr, +-- +2.19.2 + diff --git a/0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch b/0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch new file mode 100644 index 0000000..f4f0fa3 --- /dev/null +++ b/0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch @@ -0,0 +1,50 @@ +From 09ae3ef5710a89505318ec721c65b6c838147276 Mon Sep 17 00:00:00 2001 +From: Tom Stellard <tstellar(a)redhat.com> +Date: Thu, 7 Feb 2019 21:05:37 -0800 +Subject: [PATCH] ToolChain: Add -lgcc_s to the linker flags when using libc++ + +The libc++ build for Fedora does not include an implementation of +libunwind, so we need to explicitly link against something that +provides this implementation. +--- + clang/lib/Driver/ToolChain.cpp | 1 + + clang/test/Driver/netbsd.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp +index 88a627e..cb99844 100644 +--- a/lib/Driver/ToolChain.cpp ++++ b/lib/Driver/ToolChain.cpp +@@ -767,6 +767,7 @@ void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args, + switch (Type) { + case ToolChain::CST_Libcxx: + CmdArgs.push_back("-lc++"); ++ CmdArgs.push_back("-lgcc_s"); + break; + + case ToolChain::CST_Libstdcxx: +diff --git a/test/Driver/netbsd.cpp b/test/Driver/netbsd.cpp +index 4af7d83..ff18c62 100644 +--- a/test/Driver/netbsd.cpp ++++ b/test/Driver/netbsd.cpp +@@ -131,7 +131,7 @@ + // ARM-7: clang{{.*}}" "-cc1" "-triple" "armv5e-unknown-netbsd7.0.0-eabi" + // ARM-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so" + // ARM-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o" +-// ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++" "-lm" "-lc" ++// ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++" "-lgcc_s" "-lm" "-lc" + // ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o" + + // AARCH64: clang{{.*}}" "-cc1" "-triple" "aarch64-unknown-netbsd" +@@ -250,7 +250,7 @@ + // S-ARM-7: clang{{.*}}" "-cc1" "-triple" "armv5e-unknown-netbsd7.0.0-eabi" + // S-ARM-7: ld{{.*}}" "--eh-frame-hdr" "-Bstatic" + // S-ARM-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o" +-// S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++" "-lm" "-lc" ++// S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++" "-lgcc_s" "-lm" "-lc" + // S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o" + + // S-AARCH64: clang{{.*}}" "-cc1" "-triple" "aarch64-unknown-netbsd" +-- +1.8.3.1 + diff --git a/0002-Format-isInSystemMacro-after-D55782.patch b/0002-Format-isInSystemMacro-after-D55782.patch new file mode 100644 index 0000000..e5004fb --- /dev/null +++ b/0002-Format-isInSystemMacro-after-D55782.patch @@ -0,0 +1,39 @@ +From 49b29ff9feafd8b9041e2a76cbe843115d263ced Mon Sep 17 00:00:00 2001 +From: Fangrui Song <maskray(a)google.com> +Date: Mon, 11 Feb 2019 13:30:04 +0000 +Subject: [PATCH 2/3] Format isInSystemMacro after D55782 + +git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@353697 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + include/clang/Basic/SourceManager.h | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h +index c6b92f9000..f44239d9ce 100644 +--- a/include/clang/Basic/SourceManager.h ++++ b/include/clang/Basic/SourceManager.h +@@ -1459,17 +1459,15 @@ public: + + /// Returns whether \p Loc is expanded from a macro in a system header. + bool isInSystemMacro(SourceLocation loc) const { +- if(!loc.isMacroID()) ++ if (!loc.isMacroID()) + return false; + + // This happens when the macro is the result of a paste, in that case + // its spelling is the scratch memory, so we take the parent context. +- if (isWrittenInScratchSpace(getSpellingLoc(loc))) { ++ if (isWrittenInScratchSpace(getSpellingLoc(loc))) + return isInSystemHeader(getSpellingLoc(getImmediateMacroCallerLoc(loc))); +- } +- else { +- return isInSystemHeader(getSpellingLoc(loc)); +- } ++ ++ return isInSystemHeader(getSpellingLoc(loc)); + } + + /// The size of the SLocEntry that \p FID represents. +-- +2.20.1 + diff --git a/0002-gtest-reorg.patch b/0002-gtest-reorg.patch new file mode 100644 index 0000000..121ac46 --- /dev/null +++ b/0002-gtest-reorg.patch @@ -0,0 +1,42 @@ +From 1f26a0284925859b72ee520ce74452d77d822409 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille <sguelton(a)redhat.com> +Date: Mon, 28 Jan 2019 19:12:27 +0000 +Subject: [PATCH 2/2] [PATCH] gtest reorg + +--- + CMakeLists.txt | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2016a45ca..48ea3c3bb9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -157,12 +157,6 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.") + set(LLVM_UTILS_PROVIDED ON) + set(CLANG_TEST_DEPS FileCheck count not) + endif() +- set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest) +- if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h +- AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} +- AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt) +- add_subdirectory(${UNITTEST_DIR} utils/unittest) +- endif() + else() + # Seek installed Lit. + find_program(LLVM_LIT +@@ -507,7 +501,11 @@ endif() + + + if( CLANG_INCLUDE_TESTS ) +- if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h) ++ set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest) ++ if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h ++ AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} ++ AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt) ++ add_subdirectory(${UNITTEST_DIR} utils/unittest) + add_subdirectory(unittests) + list(APPEND CLANG_TEST_DEPS ClangUnitTests) + list(APPEND CLANG_TEST_PARAMS +-- +2.19.2 + diff --git a/0003-Fix-isInSystemMacro-in-presence-of-macro-and-pasted-.patch b/0003-Fix-isInSystemMacro-in-presence-of-macro-and-pasted-.patch new file mode 100644 index 0000000..c27dfd9 --- /dev/null +++ b/0003-Fix-isInSystemMacro-in-presence-of-macro-and-pasted-.patch @@ -0,0 +1,63 @@ +From a6b7f0946df82ca207b27f1931d4b430ab77e5e0 Mon Sep 17 00:00:00 2001 +From: Serge Guelton <sguelton(a)redhat.com> +Date: Thu, 16 May 2019 12:40:00 +0000 +Subject: [PATCH 3/3] Fix isInSystemMacro in presence of macro and pasted token + +When a warning is raised from the expansion of a system macro that +involves pasted token, there was still situations were they were not +skipped, as showcased by this issue: +https://bugzilla.redhat.com/show_bug.cgi?id=1472437 + +Differential Revision: https://reviews.llvm.org/D59413 + +git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@360885 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + include/clang/Basic/SourceManager.h | 9 +++++++-- + test/Misc/no-warn-in-system-macro.c | 7 ++++++- + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h +index f44239d9ce..c964c64faf 100644 +--- a/include/clang/Basic/SourceManager.h ++++ b/include/clang/Basic/SourceManager.h +@@ -1464,8 +1464,13 @@ public: + + // This happens when the macro is the result of a paste, in that case + // its spelling is the scratch memory, so we take the parent context. +- if (isWrittenInScratchSpace(getSpellingLoc(loc))) +- return isInSystemHeader(getSpellingLoc(getImmediateMacroCallerLoc(loc))); ++ // There can be several level of token pasting. ++ if (isWrittenInScratchSpace(getSpellingLoc(loc))) { ++ do { ++ loc = getImmediateMacroCallerLoc(loc); ++ } while (isWrittenInScratchSpace(getSpellingLoc(loc))); ++ return isInSystemMacro(loc); ++ } + + return isInSystemHeader(getSpellingLoc(loc)); + } +diff --git a/test/Misc/no-warn-in-system-macro.c b/test/Misc/no-warn-in-system-macro.c +index a319b14c9c..a351b89256 100644 +--- a/test/Misc/no-warn-in-system-macro.c ++++ b/test/Misc/no-warn-in-system-macro.c +@@ -3,11 +3,16 @@ + + #include <no-warn-in-system-macro.c.inc> + ++#define MACRO(x) x ++ + int main(void) + { + double foo = 1.0; + + if (isnan(foo)) + return 1; +- return 0; ++ ++ MACRO(isnan(foo)); ++ ++ return 0; + } +-- +2.20.1 + diff --git a/sources b/sources new file mode 100644 index 0000000..3af1223 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (cfe-8.0.0.src.tar.xz) = 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3

1 0

Architecture specific change in rpms/clang.git
by githook-noreply＠fedoraproject.org 25 Sep '19

25 Sep '19

The package rpms/clang.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/clang.git/commit/?id=1ca49851e1fa08… https://src.fedoraproject.org/cgit/rpms/clang.git/commit/?id=69ca58540c6ad7…. Change: +%ifarch s390 s390x %{arm} %ix86 +%ifarch s390 s390x %{arm} %ix86 ppc64le Thanks. Full change: ============ commit d04c1c444aefb26fa715479d26d5c6520156a708 Author: Tom Stellard <tstellar(a)redhat.com> Date: Fri Sep 20 01:03:04 2019 +0000 9.0.0 Release diff --git a/.gitignore b/.gitignore index d0ca7b8..707d1c8 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,5 @@ /clang-tools-extra-9.0.0rc2.src.tar.xz /cfe-9.0.0rc3.src.tar.xz /clang-tools-extra-9.0.0rc3.src.tar.xz +/cfe-9.0.0.src.tar.xz +/clang-tools-extra-9.0.0.src.tar.xz diff --git a/clang.spec b/clang.spec index 124b1a2..acd083c 100644 --- a/clang.spec +++ b/clang.spec @@ -3,8 +3,8 @@ %global maj_ver 9 %global min_ver 0 %global patch_ver 0 -%global rc_ver 3 -%global baserelease 0.2 +#%%global rc_ver 3 +%global baserelease 1 %global clang_tools_binaries \ %{_bindir}/clangd \ @@ -441,6 +441,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ninja check-all -C _build || \ %endif %changelog +* Thu Sep 19 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-1 +- 9.0.0 Release + * Wed Sep 11 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-0.2.rc3 - Reduce debug info verbosity on ppc64le to avoid OOM errors in koji diff --git a/sources b/sources index cb02107..72efbb6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cfe-9.0.0rc3.src.tar.xz) = cc217c6dd9ad9b0ba07dcfc0548c28c40ce68104b7d998cd783f76d0e39d356ff4fb6ec139e776965f7c461ccddcddf589d4a42ca433da62c5955244493926f6 -SHA512 (clang-tools-extra-9.0.0rc3.src.tar.xz) = f5d288ab07f19dfb0014134a40c5c615a5f160973b8410900828e20116bd01702a041adfd600dcffee5ad2a3679f72ef5410cde20e5611925aaa39fbfc9e2094 +SHA512 (cfe-9.0.0.src.tar.xz) = 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe +SHA512 (clang-tools-extra-9.0.0.src.tar.xz) = 70fd5cdeb8d371e5bbc369bdea3b94a1e3f450e1fdc109a2328d75b30a09c56fbed31678e211172e0a1fc1ff82c9ab4dfea4238be2cc0b82598f71ce9b7ab7d3 diff --git a/tests/testspocl.yml b/tests/testspocl.yml new file mode 100644 index 0000000..01bcd5b --- /dev/null +++ b/tests/testspocl.yml @@ -0,0 +1,28 @@ +# This is separate from tests.yml because we want to run the tests without +# clang installed. +# FIXME: Is there some way we can put this yaml definition in the tests/pocl +# repo? Right now we need to copy and paste this everywhere the test is run. +- hosts: localhost + pre_tasks: + # Programs linked against pocl should be able to run without clang installed, + # so when we run the test we want to make sure clang is not installed to + # verify we haven't introduced an implicit dependency on clang. + - name: Uninstall clang + package: + name: clang + state: absent + tags: classic + roles: + - role: standard-test-basic + tags: + - classic + repositories: + - repo: "https://src.fedoraproject.org/tests/pocl.git" + dest: "pocl" + required_packages: + - ocl-icd-devel + - pocl + - gcc + tests: + # rhbz#1582884 + - pocl/simple-opencl-no-clang: commit 69ca58540c6ad76b41faa08c5368515e20b37269 Author: Tom Stellard <tstellar(a)redhat.com> Date: Wed Sep 11 19:58:15 2019 +0000 Reduce debug info verbosity on ppc64le to avoid OOM errors in koji diff --git a/clang.spec b/clang.spec index 19aa71a..124b1a2 100644 --- a/clang.spec +++ b/clang.spec @@ -4,7 +4,7 @@ %global min_ver 0 %global patch_ver 0 %global rc_ver 3 -%global baserelease 0.1 +%global baserelease 0.2 %global clang_tools_binaries \ %{_bindir}/clangd \ @@ -247,7 +247,7 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py mkdir -p _build cd _build -%ifarch s390 s390x %{arm} %ix86 +%ifarch s390 s390x %{arm} %ix86 ppc64le # Decrease debuginfo verbosity to reduce memory consumption during final library linking %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif @@ -262,7 +262,7 @@ cd _build -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPYTHON_EXECUTABLE=%{__python3} \ -DCMAKE_INSTALL_RPATH:BOOL=";" \ -%ifarch s390 s390x %{arm} %ix86 +%ifarch s390 s390x %{arm} %ix86 ppc64le -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ %endif @@ -441,6 +441,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ninja check-all -C _build || \ %endif %changelog +* Wed Sep 11 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-0.2.rc3 +- Reduce debug info verbosity on ppc64le to avoid OOM errors in koji + * Thu Aug 22 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-0.1.rc3 - 9.0.0 Release candidate 3 commit e3a4c7d64ee7ea5bdaa431bdf28cedca2d37f147 Author: Tom Stellard <tstellar(a)redhat.com> Date: Wed Sep 11 04:04:54 2019 +0000 Add missing patch diff --git a/0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch b/0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch new file mode 100644 index 0000000..c7c6d7f --- /dev/null +++ b/0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch @@ -0,0 +1,27 @@ +From 20ffd5bc4e45980dc804c5fa422e5182cbc975b7 Mon Sep 17 00:00:00 2001 +From: Tom Stellard <tstellar(a)redhat.com> +Date: Tue, 13 Aug 2019 13:38:40 -0700 +Subject: [PATCH] Fix Driver/modules.cpp test to work when build directory name + contains '.s' + +--- + clang/test/Driver/modules.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/clang/test/Driver/modules.cpp b/clang/test/Driver/modules.cpp +index 7c549c1..9e06151 100644 +--- a/clang/test/Driver/modules.cpp ++++ b/clang/test/Driver/modules.cpp +@@ -15,7 +15,8 @@ + // RUN: %clang -std=c++2a %t/module.pcm -S -o %t/module.pcm.o -v 2>&1 | FileCheck %s --check-prefix=CHECK-COMPILE + // + // CHECK-COMPILE: -cc1 {{.*}} {{-emit-obj|-S}} +-// CHECK-COMPILE-SAME: -o {{.*}}.{{pcm.o|s}} ++// Check for extra space to avoid failures when the build directory contains '.s' in its path. ++// CHECK-COMPILE-SAME: -o {{.*}}.{{pcm.o|s}}{{ }} + // CHECK-COMPILE-SAME: -x pcm + // CHECK-COMPILE-SAME: {{.*}}.pcm + +-- +1.8.3.1 + commit 1ca49851e1fa083be8b1a036bcf88b121e400f81 Author: Tom Stellard <tstellar(a)redhat.com> Date: Wed Aug 7 16:22:09 2019 +0000 9.0.0 Release candidate 3 diff --git a/.gitignore b/.gitignore index d6c9690..d0ca7b8 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,7 @@ /clang-tools-extra-8.0.0rc4.src.tar.xz /cfe-8.0.0.src.tar.xz /clang-tools-extra-8.0.0.src.tar.xz +/cfe-9.0.0rc2.src.tar.xz +/clang-tools-extra-9.0.0rc2.src.tar.xz +/cfe-9.0.0rc3.src.tar.xz +/clang-tools-extra-9.0.0rc3.src.tar.xz diff --git a/0001-Fix-uninitialized-value-in-ABIArgInfo.patch b/0001-Fix-uninitialized-value-in-ABIArgInfo.patch index 9755200..6291203 100644 --- a/0001-Fix-uninitialized-value-in-ABIArgInfo.patch +++ b/0001-Fix-uninitialized-value-in-ABIArgInfo.patch @@ -1,4 +1,4 @@ -From 565b9633ee68b311c1a954022869d9e99fee7286 Mon Sep 17 00:00:00 2001 +From bae24f2020f7dc9db372c7e3f38d77fc5fa320d0 Mon Sep 17 00:00:00 2001 From: serge-sans-paille <sguelton(a)redhat.com> Date: Fri, 1 Feb 2019 06:39:13 +0000 Subject: [PATCH] Fix uninitialized value in ABIArgInfo @@ -6,33 +6,32 @@ Subject: [PATCH] Fix uninitialized value in ABIArgInfo GCC-9 takes advantage of this uninitialized values to optimize stuff, which ends up in failing validation when compiling clang. --- - include/clang/CodeGen/CGFunctionInfo.h | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) + clang/include/clang/CodeGen/CGFunctionInfo.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/include/clang/CodeGen/CGFunctionInfo.h b/include/clang/CodeGen/CGFunctionInfo.h -index cf64e9f3ee..131eb38393 100644 ---- a/include/clang/CodeGen/CGFunctionInfo.h -+++ b/include/clang/CodeGen/CGFunctionInfo.h -@@ -112,14 +112,13 @@ private: +diff --git a/clang/include/clang/CodeGen/CGFunctionInfo.h b/clang/include/clang/CodeGen/CGFunctionInfo.h +index 1f81072..caf7105 100644 +--- a/clang/include/clang/CodeGen/CGFunctionInfo.h ++++ b/clang/include/clang/CodeGen/CGFunctionInfo.h +@@ -110,13 +110,13 @@ private: } ABIArgInfo(Kind K) -- : TheKind(K), PaddingInReg(false), InReg(false), SuppressSRet(false) { +- : TheKind(K), PaddingInReg(false), InReg(false) { - } + : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0), + TheKind(K), PaddingInReg(false), InAllocaSRet(false), IndirectByVal(false), + IndirectRealign(false), SRetAfterThis(false), InReg(false), -+ CanBeFlattened(false), SignExt(false), SuppressSRet(false) {} ++ CanBeFlattened(false), SignExt(false) {} public: - ABIArgInfo() - : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0), -- TheKind(Direct), PaddingInReg(false), InReg(false), -- SuppressSRet(false) {} +- TheKind(Direct), PaddingInReg(false), InReg(false) {} + ABIArgInfo() : ABIArgInfo(Direct) {} static ABIArgInfo getDirect(llvm::Type *T = nullptr, unsigned Offset = 0, llvm::Type *Padding = nullptr, -- -2.19.2 +1.8.3.1 diff --git a/clang.spec b/clang.spec index 34a40da..19aa71a 100644 --- a/clang.spec +++ b/clang.spec @@ -1,15 +1,16 @@ %global compat_build 0 -%global maj_ver 8 +%global maj_ver 9 %global min_ver 0 %global patch_ver 0 -#%%global rc_ver 4 -%global baserelease 4 +%global rc_ver 3 +%global baserelease 0.1 %global clang_tools_binaries \ %{_bindir}/clangd \ %{_bindir}/clang-apply-replacements \ %{_bindir}/clang-change-namespace \ + %{_bindir}/clang-doc \ %{_bindir}/clang-include-fixer \ %{_bindir}/clang-query \ %{_bindir}/clang-refactor \ @@ -29,6 +30,7 @@ %{_bindir}/clang-format \ %{_bindir}/clang-import-test \ %{_bindir}/clang-offload-bundler \ + %{_bindir}/clang-scan-deps \ %{_bindir}/diagtool \ %{_bindir}/hmaptool @@ -57,6 +59,11 @@ %global build_install_prefix %{buildroot}%{install_prefix} +%ifarch ppc64le +# Too many threads on ppc64 systems causes OOM errors. +%global _smp_mflags -j8 +%endif + %global clang_srcdir cfe-%{version}%{?rc_ver:rc%{rc_ver}}.src %global clang_tools_srcdir clang-tools-extra-%{version}%{?rc_ver:rc%{rc_ver}}.src @@ -75,9 +82,7 @@ Source1: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver} Patch4: 0002-gtest-reorg.patch Patch9: 0001-Fix-uninitialized-value-in-ABIArgInfo.patch Patch11: 0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch -Patch12: 0001-Fix-isInSystemMacro-to-handle-pasted-macros.patch -Patch13: 0002-Format-isInSystemMacro-after-D55782.patch -Patch14: 0003-Fix-isInSystemMacro-in-presence-of-macro-and-pasted-.patch +Patch12: 0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -213,16 +218,14 @@ Requires: python3 pathfix.py -i %{__python3} -pn \ clang-tidy/tool/*.py \ - include-fixer/find-all-symbols/tool/run-find-all-symbols.py + clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py %setup -q -n %{clang_srcdir} %patch4 -p1 -b .gtest -%patch9 -p1 -b .abi-arginfo +%patch9 -p2 -b .abi-arginfo %patch11 -p1 -b .libcxx-fix -%patch12 -p1 -b .double-promotion-0 -%patch13 -p1 -b .double-promotion-1 -%patch14 -p1 -b .double-promotion-2 +%patch12 -p2 -b .module-test-fix mv ../%{clang_tools_srcdir} tools/extra @@ -249,13 +252,20 @@ cd _build %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif +# -DCMAKE_INSTALL_RPATH=";" is a workaround for llvm manually setting the +# rpath of libraries and binaries. llvm will skip the manual setting +# if CAMKE_INSTALL_RPATH is set to a value, but cmake interprets this value +# as nothing, so it sets the rpath to "" when installing. %cmake .. -G Ninja \ -DLLVM_PARALLEL_LINK_JOBS=1 \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPYTHON_EXECUTABLE=%{__python3} \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DCMAKE_INSTALL_RPATH:BOOL=OFF \ + -DCMAKE_INSTALL_RPATH:BOOL=";" \ +%ifarch s390 s390x %{arm} %ix86 + -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ +%endif %if 0%{?compat_build} -DLLVM_CONFIG:FILEPATH=%{_bindir}/llvm-config-%{maj_ver}.%{min_ver}-%{__isa_bits} \ -DCMAKE_INSTALL_PREFIX=%{install_prefix} \ @@ -285,15 +295,16 @@ cd _build -DLLVM_ENABLE_RTTI=ON \ -DLLVM_BUILD_DOCS=ON \ -DLLVM_ENABLE_SPHINX=ON \ + -DCLANG_LINK_CLANG_DYLIB=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ \ -DCLANG_BUILD_EXAMPLES:BOOL=OFF \ -DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" -ninja -v +%ninja_build %install -DESTDIR=%{buildroot} ninja install -C _build +%ninja_install -C _build %if 0%{?compat_build} @@ -351,11 +362,12 @@ chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1* %if !0%{?compat_build} # requires lit.py from LLVM utilities # FIXME: Fix failing ARM tests, s390x i686 and ppc64le tests +# FIXME: Ignore test failures until rhbz#1715016 is fixed. LD_LIBRARY_PATH=%{buildroot}%{_libdir} ninja check-all -C _build || \ %ifarch s390x i686 ppc64le %{arm} : %else -false +: %endif %endif @@ -429,6 +441,9 @@ false %endif %changelog +* Thu Aug 22 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-0.1.rc3 +- 9.0.0 Release candidate 3 + * Tue Aug 20 2019 sguelton(a)redhat.com - 8.0.0-4 - Rebuilt for Python 3.8 diff --git a/sources b/sources index 76f4e9b..cb02107 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cfe-8.0.0.src.tar.xz) = 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3 -SHA512 (clang-tools-extra-8.0.0.src.tar.xz) = 434e4cb7b76f89b0a0af25f05f32f2f2e8edb9e9f14547be845df75f5032c1d9dbf475be408bb989c476ec667c10af54a15d40e42559b05e52d24c5fd416b517 +SHA512 (cfe-9.0.0rc3.src.tar.xz) = cc217c6dd9ad9b0ba07dcfc0548c28c40ce68104b7d998cd783f76d0e39d356ff4fb6ec139e776965f7c461ccddcddf589d4a42ca433da62c5955244493926f6 +SHA512 (clang-tools-extra-9.0.0rc3.src.tar.xz) = f5d288ab07f19dfb0014134a40c5c615a5f160973b8410900828e20116bd01702a041adfd600dcffee5ad2a3679f72ef5410cde20e5611925aaa39fbfc9e2094 commit 277bd76c83f8bc9847927bf6e7d279614e7ebf74 Author: Tom Stellard <tstellar(a)redhat.com> Date: Thu Aug 1 18:19:20 2019 +0000 Sync with clang8.0 compat diff --git a/clang.spec b/clang.spec index da718ff..34a40da 100644 --- a/clang.spec +++ b/clang.spec @@ -4,6 +4,7 @@ %global min_ver 0 %global patch_ver 0 #%%global rc_ver 4 +%global baserelease 4 %global clang_tools_binaries \ %{_bindir}/clangd \ @@ -61,7 +62,7 @@ Name: %pkg_name Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 4%{?rc_ver:.rc%{rc_ver}}%{?dist} +Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -270,7 +271,11 @@ cd _build %endif %endif \ +%if !0%{compat_build} -DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \ +%else + -DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen-%{maj_ver}.%{min_ver} \ +%endif -DCLANG_ENABLE_ARCMT:BOOL=ON \ -DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \ -DCLANG_INCLUDE_DOCS:BOOL=ON \ commit 77df2a6206d2d630224041b47925e0bedee05bb2 Author: Tom Stellard <tstellar(a)redhat.com> Date: Fri Jun 7 22:55:01 2019 +0000 Pull llvm-test-suite tests from common repo diff --git a/tests/llvm-abi-test-suite/runtest.sh b/tests/llvm-abi-test-suite/runtest.sh deleted file mode 100755 index cef0859..0000000 --- a/tests/llvm-abi-test-suite/runtest.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -e -set -x - -cp -r /usr/share/llvm-test-suite/ABI-Testsuite . -cd ABI-Testsuite -python3 linux-x86.py clang test -v --path /usr/lib64/llvm/ -j 1 diff --git a/tests/llvm-test-suite/runtest.sh b/tests/llvm-test-suite/runtest.sh deleted file mode 100755 index dd65012..0000000 --- a/tests/llvm-test-suite/runtest.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -e -set -x - -cmake -G Ninja /usr/share/llvm-test-suite/ -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DTEST_SUITE_LIT_FLAGS="-svj1" -ninja -j 1 check diff --git a/tests/tests.yml b/tests/tests.yml index 04a1f8f..1ff0b4c 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -19,12 +19,15 @@ - libcxx-devel - glibc-devel - gcc + repositories: + - repo: "https://src.fedoraproject.org/tests/llvm-test-suite.git" + dest: "llvm-test-suite" tests: - rhbz#482491: dir: ./ run: echo "int main(){}" | clang -x c - - - llvm-test-suite - - llvm-abi-test-suite + - llvm-test-suite/test-suite + - llvm-test-suite/abi-test-suite - rhbz_1657544 - rhbz_1647130 - llvm-toolchain commit 7b4d800ffccc788e4e1bc2dcdc1a0738fda14b1a Author: sergesanspaille <sguelton(a)redhat.com> Date: Tue Aug 20 20:55:20 2019 +0000 8.0.0-4 - Rebuilt for Python 3.8 diff --git a/clang.spec b/clang.spec index 4258fb0..da718ff 100644 --- a/clang.spec +++ b/clang.spec @@ -61,7 +61,7 @@ Name: %pkg_name Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 3%{?rc_ver:.rc%{rc_ver}}%{?dist}.2 +Release: 4%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -424,6 +424,9 @@ false %endif %changelog +* Tue Aug 20 2019 sguelton(a)redhat.com - 8.0.0-4 +- Rebuilt for Python 3.8 + * Mon Aug 19 2019 Miro Hronok <mhroncok(a)redhat.com> - 8.0.0-3.2 - Rebuilt for Python 3.8 commit 86a9d03ab132e8094699abfa59923f80d279f381 Author: Miro Hronok <miro(a)hroncok.cz> Date: Mon Aug 19 10:11:35 2019 +0200 Rebuilt for Python 3.8 diff --git a/clang.spec b/clang.spec index 1a799df..4258fb0 100644 --- a/clang.spec +++ b/clang.spec @@ -61,7 +61,7 @@ Name: %pkg_name Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 3%{?rc_ver:.rc%{rc_ver}}%{?dist}.1 +Release: 3%{?rc_ver:.rc%{rc_ver}}%{?dist}.2 Summary: A C language family front-end for LLVM License: NCSA @@ -424,6 +424,9 @@ false %endif %changelog +* Mon Aug 19 2019 Miro Hronok <mhroncok(a)redhat.com> - 8.0.0-3.2 +- Rebuilt for Python 3.8 + * Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.0.0-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

1 0

Architecture specific change in rpms/clang.git
by githook-noreply＠fedoraproject.org 25 Sep '19

25 Sep '19

The package rpms/clang.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/clang.git/commit/?id=d6ec18079c5c21…. Change: +%ifarch s390 s390x %{arm} %ix86 ppc64le Thanks. Full change: ============ commit 8de8874e619c30bc465e7306af45c8b2f21e74e5 Author: Tom Stellard <tstellar(a)redhat.com> Date: Sat Sep 7 04:20:00 2019 +0000 Fix gcc detection when cross-compiler is installed Fixes rhbz#1749971 diff --git a/0001-Driver-Prefer-gcc-toolchains-with-libgcc_s.so-when-n.patch b/0001-Driver-Prefer-gcc-toolchains-with-libgcc_s.so-when-n.patch new file mode 100644 index 0000000..a93b1b6 --- /dev/null +++ b/0001-Driver-Prefer-gcc-toolchains-with-libgcc_s.so-when-n.patch @@ -0,0 +1,132 @@ +From dcd2244fa2db0acc9d8e43d251ec33f1224f7bcf Mon Sep 17 00:00:00 2001 +From: Tom Stellard <tstellar(a)redhat.com> +Date: Fri, 6 Sep 2019 20:35:06 -0700 +Subject: [PATCH] Driver: Prefer gcc toolchains with libgcc_s.so when not + static linking libgcc + +Fedora ships cross-compilers on all platforms, so a user could end up +with a gcc x86_64 cross-compiler installed on an x86_64 system. clang +maintains a list of supported triples for each target and when all +else is equal will prefer toolchains with triples that appear earlier +in the list. + +The cross-compiler triple on Fedora is x86_64-linux-gnu and this comes +before the Fedora system compiler's triple: x86_64-redhat-linux in +the triples list, so the cross compiler is always preferred. This +is a problem, because the cross compiler is missing libraries, like +libgcc_s.so, that clang expects to be there so linker invocations +will fail. + +This patch fixes this by checking for the existence of libgcc_s.so +when it is required and taking that into account when selecting a +toolchain. +--- + clang/lib/Driver/ToolChains/Gnu.cpp | 16 ++++++++++++++-- + clang/lib/Driver/ToolChains/Gnu.h | 4 +++- + .../usr/lib/gcc/x86_64-linux-gnu/7/crtbegin.o | 0 + .../usr/lib/gcc/x86_64-redhat-linux/7/crtbegin.o | 0 + .../usr/lib/gcc/x86_64-redhat-linux/7/libgcc_s.so | 0 + clang/test/Driver/linux-ld.c | 12 ++++++++++++ + 6 files changed, 29 insertions(+), 3 deletions(-) + create mode 100644 clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-linux-gnu/7/crtbegin.o + create mode 100644 clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-redhat-linux/7/crtbegin.o + create mode 100644 clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-redhat-linux/7/libgcc_s.so + +diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp +index 2ad4509..0306828 100644 +--- a/clang/lib/Driver/ToolChains/Gnu.cpp ++++ b/clang/lib/Driver/ToolChains/Gnu.cpp +@@ -2299,6 +2299,8 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple( + (TargetArch == llvm::Triple::x86 && + TargetTriple.getOS() != llvm::Triple::Solaris)}}; + ++ bool NeedLibgccShared = !Args.hasArg(options::OPT_static_libgcc) && ++ !Args.hasArg(options::OPT_static); + for (auto &Suffix : Suffixes) { + if (!Suffix.Active) + continue; +@@ -2316,8 +2318,17 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple( + continue; // Saw this path before; no need to look at it again. + if (CandidateVersion.isOlderThan(4, 1, 1)) + continue; +- if (CandidateVersion <= Version) +- continue; ++ ++ bool CandidateHasLibGccShared = false; ++ if (CandidateVersion <= Version) { ++ if (NeedLibgccShared && !HasLibGccShared) { ++ CandidateHasLibGccShared = ++ D.getVFS().exists(LI->path() + "/libgcc_s.so"); ++ ++ } ++ if (HasLibGccShared || !CandidateHasLibGccShared) ++ continue; ++ } + + if (!ScanGCCForMultilibs(TargetTriple, Args, LI->path(), + NeedsBiarchSuffix)) +@@ -2331,6 +2342,7 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple( + GCCInstallPath = (LibDir + "/" + LibSuffix + "/" + VersionText).str(); + GCCParentLibPath = (GCCInstallPath + "/../" + Suffix.ReversePath).str(); + IsValid = true; ++ HasLibGccShared = CandidateHasLibGccShared; + } + } + } +diff --git a/clang/lib/Driver/ToolChains/Gnu.h b/clang/lib/Driver/ToolChains/Gnu.h +index e8e74e4..e9c598d 100644 +--- a/clang/lib/Driver/ToolChains/Gnu.h ++++ b/clang/lib/Driver/ToolChains/Gnu.h +@@ -186,6 +186,7 @@ public: + /// Driver, and has logic for fuzzing that where appropriate. + class GCCInstallationDetector { + bool IsValid; ++ bool HasLibGccShared; + llvm::Triple GCCTriple; + const Driver &D; + +@@ -209,7 +210,8 @@ public: + MultilibSet Multilibs; + + public: +- explicit GCCInstallationDetector(const Driver &D) : IsValid(false), D(D) {} ++ explicit GCCInstallationDetector(const Driver &D) ++ : IsValid(false), HasLibGccShared(false), D(D) {} + void init(const llvm::Triple &TargetTriple, const llvm::opt::ArgList &Args, + ArrayRef<std::string> ExtraTripleAliases = None); + +diff --git a/clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-linux-gnu/7/crtbegin.o b/clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-linux-gnu/7/crtbegin.o +new file mode 100644 +index 0000000..e69de29 +diff --git a/clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-redhat-linux/7/crtbegin.o b/clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-redhat-linux/7/crtbegin.o +new file mode 100644 +index 0000000..e69de29 +diff --git a/clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-redhat-linux/7/libgcc_s.so b/clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-redhat-linux/7/libgcc_s.so +new file mode 100644 +index 0000000..e69de29 +diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c +index 3ab81be..45a56bc 100644 +--- a/clang/test/Driver/linux-ld.c ++++ b/clang/test/Driver/linux-ld.c +@@ -712,6 +712,18 @@ + // CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0{{/|\\\\}}crtend.o" + // CHECK-FEDORA-21-AARCH64: "{{.*}}/usr/lib/gcc/aarch64-redhat-linux/4.9.0/../../../../lib64{{/|\\\\}}crtn.o" + // ++// Check that clang does not select the cross compiler by default on Fedora 28. ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux-gnu \ ++// RUN: --gcc-toolchain="" \ ++// RUN: --sysroot=%S/Inputs/fedora_28_tree \ ++// RUN: | FileCheck --check-prefix=CHECK-FEDORA-28-X86_64 %s ++// ++// CHECK-FEDORA-28-X86_64: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" ++// CHECK-FEDORA-28-X86_64: "[[SYSROOT]]/usr/lib/gcc/x86_64-redhat-linux/7/crtbegin.o" ++// CHECK-FEDORA-28-X86_64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-redhat-linux/7" ++// + // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ + // RUN: --target=arm-unknown-linux-gnueabi \ + // RUN: --gcc-toolchain="" \ +-- +1.8.3.1 + diff --git a/clang.spec b/clang.spec index c4437cc..c3dea9e 100644 --- a/clang.spec +++ b/clang.spec @@ -61,7 +61,7 @@ Name: %pkg_name Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 2%{?rc_ver:.rc%{rc_ver}}%{?dist} +Release: 3%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -75,6 +75,7 @@ Patch4: 0002-gtest-reorg.patch Patch9: 0001-Fix-uninitialized-value-in-ABIArgInfo.patch Patch10: 0001-Workaround-GCC-9-bug-when-handling-bitfields.patch Patch11: 0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch +Patch12: 0001-Driver-Prefer-gcc-toolchains-with-libgcc_s.so-when-n.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -218,6 +219,7 @@ pathfix.py -i %{__python3} -pn \ %patch9 -p1 -b .abi-arginfo %patch10 -p1 -b .bitfields %patch11 -p1 -b .libcxx-fix +%patch12 -p2 -b .gcc-detection mv ../%{clang_tools_srcdir} tools/extra @@ -424,6 +426,9 @@ false %endif %changelog +* Tue Sep 24 2019 Tom Stellard <tstellar(a)redhat.com> - 8.0.0-3 +- Fix gcc detection when cross-compiler is installed + * Wed Sep 11 2019 Tom Stellard <tstellar(a)redhat.com> - 8.0.0-2 - Reduce debug info verbosity on ppc64le to avoid OOM errors in koji commit d6ec18079c5c21931c12d9dd8bbb750b89f7095e Author: Tom Stellard <tstellar(a)redhat.com> Date: Wed Sep 11 19:58:15 2019 +0000 Reduce debug info verbosity on ppc64le to avoid OOM errors in koji diff --git a/clang.spec b/clang.spec index c6276bd..c4437cc 100644 --- a/clang.spec +++ b/clang.spec @@ -61,7 +61,7 @@ Name: %pkg_name Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 1%{?rc_ver:.rc%{rc_ver}}%{?dist} +Release: 2%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -239,7 +239,7 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py mkdir -p _build cd _build -%ifarch s390 s390x %{arm} %ix86 +%ifarch s390 s390x %{arm} %ix86 ppc64le # Decrease debuginfo verbosity to reduce memory consumption during final library linking %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif @@ -251,6 +251,10 @@ cd _build -DPYTHON_EXECUTABLE=%{__python3} \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_INSTALL_RPATH:BOOL=OFF \ +%ifarch s390 s390x %{arm} %ix86 ppc64le + -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \ +%endif %if 0%{?compat_build} -DLLVM_CONFIG:FILEPATH=%{_bindir}/llvm-config-%{maj_ver}.%{min_ver}-%{__isa_bits} \ -DCMAKE_INSTALL_PREFIX=%{install_prefix} \ @@ -420,6 +424,9 @@ false %endif %changelog +* Wed Sep 11 2019 Tom Stellard <tstellar(a)redhat.com> - 8.0.0-2 +- Reduce debug info verbosity on ppc64le to avoid OOM errors in koji + * Wed Mar 20 2019 sguelton(a)redhat.com - 8.0.0-1 - 8.0.0 final

1 0

Architecture specific change in rpms/primecount.git
by githook-noreply＠fedoraproject.org 25 Sep '19

25 Sep '19

The package rpms/primecount.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/primecount.git/commit/?id=f8bee47f7…. Change: +%ifarch %{ix86} x86_64 Thanks. Full change: ============ commit f8bee47f7bf2838b121432b32e7dc4a8526b3810 Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Sep 25 08:23:28 2019 -0600 Initial import. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c84d91 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/primecount-*.tar.gz diff --git a/primecount-primesieve.patch b/primecount-primesieve.patch new file mode 100644 index 0000000..c44aaa7 --- /dev/null +++ b/primecount-primesieve.patch @@ -0,0 +1,20 @@ +The primecount source distribution includes the primesieve source +distribution. However, we already have primesieve as a separate package in +Fedora, so we use the existing package instead of building it as part of +primecount. + +--- a/CMakeLists.txt 2019-09-02 09:11:38.000000000 -0600 ++++ b/CMakeLists.txt 2019-09-17 12:32:30.822366045 -0600 +@@ -236,11 +236,7 @@ + + # libprimesieve ###################################################### + +-set(COPY_BUILD_TESTS "${BUILD_TESTS}") +-set(BUILD_TESTS OFF CACHE BOOL "Build primesieve tests" FORCE) +-option(BUILD_PRIMESIEVE "Build primesieve binary" OFF) +-add_subdirectory(lib/primesieve) +-set(BUILD_TESTS "${COPY_BUILD_TESTS}" CACHE BOOL "Build test programs" FORCE) ++find_package(primesieve REQUIRED) + + # Testing ############################################################ + diff --git a/primecount-vector.patch b/primecount-vector.patch new file mode 100644 index 0000000..d8ccb94 --- /dev/null +++ b/primecount-vector.patch @@ -0,0 +1,1401 @@ +If primecount is built with GCC and -D_GLIBCXX_ASSERTIONS is in the build +flags, then some tests fail: + +The following tests FAILED: + 8 - S2_hard_xy (Child aborted) + 10 - S2_xy (Child aborted) + 11 - alpha (Child aborted) + 12 - alpha_y (Child aborted) + 13 - alpha_z (Child aborted) + 35 - sieve1 (Child aborted) + 36 - sieve2 (Child aborted) + +Running these tests from the command line shows an assertion failure, e.g. for +S2_hard_xy: + +S2_hard(4912, 16) = 0 OK +S2_hard(4913, 17) = 0/usr/include/c++/9/bits/stl_vector.h:1042: std::vector<_Tp, _Alloc>::reference std::vector<_Tp, _Alloc>::operator[](std::vector<_Tp, _Alloc>::size_type) [with _Tp = unsigned char; _Alloc = std::allocator<unsigned char>; std::vector<_Tp, _Alloc>::reference = unsigned char&; std::vector<_Tp, _Alloc>::size_type = long unsigned int]: Assertion '__builtin_expect(__n < this->size(), true)' failed. +The problem is this code, on lines 214 and 518 of src/Sieve.cpp: + + byte_t* sieve_end = &sieve_[sieve_size]; + +Since sieve_size is the number of elements in the vector, this code asks for +the address of the element just beyond the end of the vector. But GCC's +implementation of operator[] for std::vector looks like this: + + reference + operator[](size_type __n) _GLIBCXX_NOEXCEPT + { + __glibcxx_requires_subscript(__n); + return *(this->_M_impl._M_start + __n); + } + +The __glibcxx_requires_subscript line is where the assertion failure happens. +There actually is a pointer dereference on the following line, so even if +assertions are not enabled, this code dereferences a pointer that points beyond +the vector. + +Upstream elected to solve the problem by converting the vector into a C array, +as follows. See +https://github.com/kimwalisch/primecount/commit/1c441f242739d3189787474943cf18690281072d + +diff --git a/include/Sieve.hpp b/include/Sieve.hpp +index da2102c9..eb6a3a88 100644 +--- a/include/Sieve.hpp ++++ b/include/Sieve.hpp +@@ -24,6 +24,7 @@ + + #include <stdint.h> + #include <cassert> ++#include <memory> + #include <vector> + + namespace primecount { +@@ -94,11 +95,12 @@ public: + + private: + void reset_sieve(uint64_t low, uint64_t high); +- void set_sieve_size(uint64_t segment_size); + void add(uint64_t prime); + + uint64_t start_; +- std::vector<byte_t> sieve_; ++ uint64_t sieve_size_; ++ byte_t* sieve_; ++ std::unique_ptr<byte_t[]> deleter_; + std::vector<Wheel> wheel_; + }; + +diff --git a/src/Sieve.cpp b/src/Sieve.cpp +index 5aa4f3a4..f0f0ad43 100644 +--- a/src/Sieve.cpp ++++ b/src/Sieve.cpp +@@ -27,6 +27,7 @@ + #include <algorithm> + #include <array> + #include <cassert> ++#include <memory> + #include <vector> + + using namespace std; +@@ -91,17 +92,25 @@ Sieve::Sieve(uint64_t start, + assert(segment_size % 240 == 0); + + start_ = start; +- set_sieve_size(segment_size); ++ segment_size = get_segment_size(segment_size); ++ ++ // sieve_size = segment_size / 30 as each byte corresponds ++ // to 30 numbers i.e. the 8 bits correspond to the ++ // offsets = {1, 7, 11, 13, 17, 19, 23, 29}. ++ sieve_size_ = segment_size / 30; ++ sieve_ = new byte_t[sieve_size_]; ++ deleter_.reset(sieve_); ++ + wheel_.reserve(wheel_size); + wheel_.resize(4); + } + +-/// The segment size (a.k.a. sieve distance) is sieve +-/// size * 30 as each byte contains 30 numbers. ++/// The segment size is sieve_size * 30 as each ++/// byte corresponds to 30 numbers. + /// + uint64_t Sieve::segment_size() const + { +- return sieve_.size() * 30; ++ return sieve_size_ * 30; + } + + /// segment_size must be a multiple of 240 as we +@@ -118,16 +127,6 @@ uint64_t Sieve::get_segment_size(uint64_t size) + return size; + } + +-/// Sieve size = segment_size / 30 as +-/// each byte contains 30 numbers. +-/// +-void Sieve::set_sieve_size(uint64_t segment_size) +-{ +- segment_size = get_segment_size(segment_size); +- uint64_t size = segment_size / 30; +- sieve_.resize(size); +-} +- + /// Count 1 bits inside [start, stop] + uint64_t Sieve::count(uint64_t start, uint64_t stop) const + { +@@ -141,15 +140,15 @@ uint64_t Sieve::count(uint64_t start, uint64_t stop) const + uint64_t stop_idx = stop / 240; + uint64_t m1 = unset_smaller[start % 240]; + uint64_t m2 = unset_larger[stop % 240]; +- auto sieve = (uint64_t*) &sieve_[0]; ++ auto sieve64 = (uint64_t*) sieve_; + + if (start_idx == stop_idx) +- bit_count = popcnt64(sieve[start_idx] & (m1 & m2)); ++ bit_count = popcnt64(sieve64[start_idx] & (m1 & m2)); + else + { +- bit_count = popcnt64(sieve[start_idx] & m1); +- bit_count += popcnt(&sieve[start_idx + 1], stop_idx - (start_idx + 1)); +- bit_count += popcnt64(sieve[stop_idx] & m2); ++ bit_count = popcnt64(sieve64[start_idx] & m1); ++ bit_count += popcnt(&sieve64[start_idx + 1], stop_idx - (start_idx + 1)); ++ bit_count += popcnt64(sieve64[stop_idx] & m2); + } + + return bit_count; +@@ -157,15 +156,16 @@ uint64_t Sieve::count(uint64_t start, uint64_t stop) const + + void Sieve::reset_sieve(uint64_t low, uint64_t high) + { +- fill(sieve_.begin(), sieve_.end(), 0xff); ++ fill_n(sieve_, sieve_size_, (byte_t) 0xff); + uint64_t size = high - low; + + if (size < segment_size()) + { +- set_sieve_size(size); +- auto sieve = (uint64_t*) &sieve_[0]; +- uint64_t back = size - 1; +- sieve[back / 240] &= unset_larger[back % 240]; ++ uint64_t last = size - 1; ++ size = get_segment_size(size); ++ sieve_size_ = size / 30; ++ auto sieve64 = (uint64_t*) sieve_; ++ sieve64[last / 240] &= unset_larger[last % 240]; + } + } + +@@ -202,296 +202,289 @@ void Sieve::cross_off(uint64_t prime, uint64_t i) + if (i >= wheel_.size()) + add(prime); + +- uint32_t sieve_size = (uint32_t) sieve_.size(); + Wheel& wheel = wheel_[i]; ++ // pointer to the byte with the 1st multiple ++ byte_t* s = sieve_ + wheel.multiple; ++ byte_t* sieve_end = sieve_ + sieve_size_; ++ prime /= 30; + +- if (wheel.multiple >= sieve_size) +- wheel.multiple -= sieve_size; +- else ++ switch (wheel.index) + { +- // pointer to the byte with the 1st multiple +- byte_t* s = &sieve_[wheel.multiple]; +- byte_t* sieve_end = &sieve_[sieve_size]; +- prime /= 30; +- +- switch (wheel.index) ++ for (;;) + { +- for (;;) ++ case 0: if (s >= sieve_end) { wheel.index = 0; break; } ++ unset_bit<0>(s); s += prime * 6 + 0; ++ case 1: if (s >= sieve_end) { wheel.index = 1; break; } ++ unset_bit<1>(s); s += prime * 4 + 0; ++ case 2: if (s >= sieve_end) { wheel.index = 2; break; } ++ unset_bit<2>(s); s += prime * 2 + 0; ++ case 3: if (s >= sieve_end) { wheel.index = 3; break; } ++ unset_bit<3>(s); s += prime * 4 + 0; ++ case 4: if (s >= sieve_end) { wheel.index = 4; break; } ++ unset_bit<4>(s); s += prime * 2 + 0; ++ case 5: if (s >= sieve_end) { wheel.index = 5; break; } ++ unset_bit<5>(s); s += prime * 4 + 0; ++ case 6: if (s >= sieve_end) { wheel.index = 6; break; } ++ unset_bit<6>(s); s += prime * 6 + 0; ++ case 7: if (s >= sieve_end) { wheel.index = 7; break; } ++ unset_bit<7>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 0; break; } +- case 0: unset_bit<0>(s); s += prime * 6 + 0; +- if (s >= sieve_end) { wheel.index = 1; break; } +- case 1: unset_bit<1>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 2; break; } +- case 2: unset_bit<2>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 3; break; } +- case 3: unset_bit<3>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 4; break; } +- case 4: unset_bit<4>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 5; break; } +- case 5: unset_bit<5>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 6; break; } +- case 6: unset_bit<6>(s); s += prime * 6 + 0; +- if (s >= sieve_end) { wheel.index = 7; break; } +- case 7: unset_bit<7>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 < sieve_end) +- { +- unset_bit<0>(s + prime * 0); +- unset_bit<1>(s + prime * 6); +- unset_bit<2>(s + prime * 10); +- unset_bit<3>(s + prime * 12); +- unset_bit<4>(s + prime * 16); +- unset_bit<5>(s + prime * 18); +- unset_bit<6>(s + prime * 22); +- unset_bit<7>(s + prime * 28); +- s += prime * 30 + 1; +- } ++ unset_bit<0>(s + prime * 0); ++ unset_bit<1>(s + prime * 6); ++ unset_bit<2>(s + prime * 10); ++ unset_bit<3>(s + prime * 12); ++ unset_bit<4>(s + prime * 16); ++ unset_bit<5>(s + prime * 18); ++ unset_bit<6>(s + prime * 22); ++ unset_bit<7>(s + prime * 28); ++ s += prime * 30 + 1; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 8: if (s >= sieve_end) { wheel.index = 8; break; } ++ unset_bit<1>(s); s += prime * 6 + 1; ++ case 9: if (s >= sieve_end) { wheel.index = 9; break; } ++ unset_bit<5>(s); s += prime * 4 + 1; ++ case 10: if (s >= sieve_end) { wheel.index = 10; break; } ++ unset_bit<4>(s); s += prime * 2 + 1; ++ case 11: if (s >= sieve_end) { wheel.index = 11; break; } ++ unset_bit<0>(s); s += prime * 4 + 0; ++ case 12: if (s >= sieve_end) { wheel.index = 12; break; } ++ unset_bit<7>(s); s += prime * 2 + 1; ++ case 13: if (s >= sieve_end) { wheel.index = 13; break; } ++ unset_bit<3>(s); s += prime * 4 + 1; ++ case 14: if (s >= sieve_end) { wheel.index = 14; break; } ++ unset_bit<2>(s); s += prime * 6 + 1; ++ case 15: if (s >= sieve_end) { wheel.index = 15; break; } ++ unset_bit<6>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 6 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 8; break; } +- case 8: unset_bit<1>(s); s += prime * 6 + 1; +- if (s >= sieve_end) { wheel.index = 9; break; } +- case 9: unset_bit<5>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 10; break; } +- case 10: unset_bit<4>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 11; break; } +- case 11: unset_bit<0>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 12; break; } +- case 12: unset_bit<7>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 13; break; } +- case 13: unset_bit<3>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 14; break; } +- case 14: unset_bit<2>(s); s += prime * 6 + 1; +- if (s >= sieve_end) { wheel.index = 15; break; } +- case 15: unset_bit<6>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 6 < sieve_end) +- { +- unset_bit<1>(s + prime * 0 + 0); +- unset_bit<5>(s + prime * 6 + 1); +- unset_bit<4>(s + prime * 10 + 2); +- unset_bit<0>(s + prime * 12 + 3); +- unset_bit<7>(s + prime * 16 + 3); +- unset_bit<3>(s + prime * 18 + 4); +- unset_bit<2>(s + prime * 22 + 5); +- unset_bit<6>(s + prime * 28 + 6); +- s += prime * 30 + 7; +- } ++ unset_bit<1>(s + prime * 0 + 0); ++ unset_bit<5>(s + prime * 6 + 1); ++ unset_bit<4>(s + prime * 10 + 2); ++ unset_bit<0>(s + prime * 12 + 3); ++ unset_bit<7>(s + prime * 16 + 3); ++ unset_bit<3>(s + prime * 18 + 4); ++ unset_bit<2>(s + prime * 22 + 5); ++ unset_bit<6>(s + prime * 28 + 6); ++ s += prime * 30 + 7; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 16: if (s >= sieve_end) { wheel.index = 16; break; } ++ unset_bit<2>(s); s += prime * 6 + 2; ++ case 17: if (s >= sieve_end) { wheel.index = 17; break; } ++ unset_bit<4>(s); s += prime * 4 + 2; ++ case 18: if (s >= sieve_end) { wheel.index = 18; break; } ++ unset_bit<0>(s); s += prime * 2 + 0; ++ case 19: if (s >= sieve_end) { wheel.index = 19; break; } ++ unset_bit<6>(s); s += prime * 4 + 2; ++ case 20: if (s >= sieve_end) { wheel.index = 20; break; } ++ unset_bit<1>(s); s += prime * 2 + 0; ++ case 21: if (s >= sieve_end) { wheel.index = 21; break; } ++ unset_bit<7>(s); s += prime * 4 + 2; ++ case 22: if (s >= sieve_end) { wheel.index = 22; break; } ++ unset_bit<3>(s); s += prime * 6 + 2; ++ case 23: if (s >= sieve_end) { wheel.index = 23; break; } ++ unset_bit<5>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 10 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 16; break; } +- case 16: unset_bit<2>(s); s += prime * 6 + 2; +- if (s >= sieve_end) { wheel.index = 17; break; } +- case 17: unset_bit<4>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 18; break; } +- case 18: unset_bit<0>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 19; break; } +- case 19: unset_bit<6>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 20; break; } +- case 20: unset_bit<1>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 21; break; } +- case 21: unset_bit<7>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 22; break; } +- case 22: unset_bit<3>(s); s += prime * 6 + 2; +- if (s >= sieve_end) { wheel.index = 23; break; } +- case 23: unset_bit<5>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 10 < sieve_end) +- { +- unset_bit<2>(s + prime * 0 + 0); +- unset_bit<4>(s + prime * 6 + 2); +- unset_bit<0>(s + prime * 10 + 4); +- unset_bit<6>(s + prime * 12 + 4); +- unset_bit<1>(s + prime * 16 + 6); +- unset_bit<7>(s + prime * 18 + 6); +- unset_bit<3>(s + prime * 22 + 8); +- unset_bit<5>(s + prime * 28 + 10); +- s += prime * 30 + 11; +- } ++ unset_bit<2>(s + prime * 0 + 0); ++ unset_bit<4>(s + prime * 6 + 2); ++ unset_bit<0>(s + prime * 10 + 4); ++ unset_bit<6>(s + prime * 12 + 4); ++ unset_bit<1>(s + prime * 16 + 6); ++ unset_bit<7>(s + prime * 18 + 6); ++ unset_bit<3>(s + prime * 22 + 8); ++ unset_bit<5>(s + prime * 28 + 10); ++ s += prime * 30 + 11; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 24: if (s >= sieve_end) { wheel.index = 24; break; } ++ unset_bit<3>(s); s += prime * 6 + 3; ++ case 25: if (s >= sieve_end) { wheel.index = 25; break; } ++ unset_bit<0>(s); s += prime * 4 + 1; ++ case 26: if (s >= sieve_end) { wheel.index = 26; break; } ++ unset_bit<6>(s); s += prime * 2 + 1; ++ case 27: if (s >= sieve_end) { wheel.index = 27; break; } ++ unset_bit<5>(s); s += prime * 4 + 2; ++ case 28: if (s >= sieve_end) { wheel.index = 28; break; } ++ unset_bit<2>(s); s += prime * 2 + 1; ++ case 29: if (s >= sieve_end) { wheel.index = 29; break; } ++ unset_bit<1>(s); s += prime * 4 + 1; ++ case 30: if (s >= sieve_end) { wheel.index = 30; break; } ++ unset_bit<7>(s); s += prime * 6 + 3; ++ case 31: if (s >= sieve_end) { wheel.index = 31; break; } ++ unset_bit<4>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 12 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 24; break; } +- case 24: unset_bit<3>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 25; break; } +- case 25: unset_bit<0>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 26; break; } +- case 26: unset_bit<6>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 27; break; } +- case 27: unset_bit<5>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 28; break; } +- case 28: unset_bit<2>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 29; break; } +- case 29: unset_bit<1>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 30; break; } +- case 30: unset_bit<7>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 31; break; } +- case 31: unset_bit<4>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 12 < sieve_end) +- { +- unset_bit<3>(s + prime * 0 + 0); +- unset_bit<0>(s + prime * 6 + 3); +- unset_bit<6>(s + prime * 10 + 4); +- unset_bit<5>(s + prime * 12 + 5); +- unset_bit<2>(s + prime * 16 + 7); +- unset_bit<1>(s + prime * 18 + 8); +- unset_bit<7>(s + prime * 22 + 9); +- unset_bit<4>(s + prime * 28 + 12); +- s += prime * 30 + 13; +- } ++ unset_bit<3>(s + prime * 0 + 0); ++ unset_bit<0>(s + prime * 6 + 3); ++ unset_bit<6>(s + prime * 10 + 4); ++ unset_bit<5>(s + prime * 12 + 5); ++ unset_bit<2>(s + prime * 16 + 7); ++ unset_bit<1>(s + prime * 18 + 8); ++ unset_bit<7>(s + prime * 22 + 9); ++ unset_bit<4>(s + prime * 28 + 12); ++ s += prime * 30 + 13; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 32: if (s >= sieve_end) { wheel.index = 32; break; } ++ unset_bit<4>(s); s += prime * 6 + 3; ++ case 33: if (s >= sieve_end) { wheel.index = 33; break; } ++ unset_bit<7>(s); s += prime * 4 + 3; ++ case 34: if (s >= sieve_end) { wheel.index = 34; break; } ++ unset_bit<1>(s); s += prime * 2 + 1; ++ case 35: if (s >= sieve_end) { wheel.index = 35; break; } ++ unset_bit<2>(s); s += prime * 4 + 2; ++ case 36: if (s >= sieve_end) { wheel.index = 36; break; } ++ unset_bit<5>(s); s += prime * 2 + 1; ++ case 37: if (s >= sieve_end) { wheel.index = 37; break; } ++ unset_bit<6>(s); s += prime * 4 + 3; ++ case 38: if (s >= sieve_end) { wheel.index = 38; break; } ++ unset_bit<0>(s); s += prime * 6 + 3; ++ case 39: if (s >= sieve_end) { wheel.index = 39; break; } ++ unset_bit<3>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 16 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 32; break; } +- case 32: unset_bit<4>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 33; break; } +- case 33: unset_bit<7>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 34; break; } +- case 34: unset_bit<1>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 35; break; } +- case 35: unset_bit<2>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 36; break; } +- case 36: unset_bit<5>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 37; break; } +- case 37: unset_bit<6>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 38; break; } +- case 38: unset_bit<0>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 39; break; } +- case 39: unset_bit<3>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 16 < sieve_end) +- { +- unset_bit<4>(s + prime * 0 + 0); +- unset_bit<7>(s + prime * 6 + 3); +- unset_bit<1>(s + prime * 10 + 6); +- unset_bit<2>(s + prime * 12 + 7); +- unset_bit<5>(s + prime * 16 + 9); +- unset_bit<6>(s + prime * 18 + 10); +- unset_bit<0>(s + prime * 22 + 13); +- unset_bit<3>(s + prime * 28 + 16); +- s += prime * 30 + 17; +- } ++ unset_bit<4>(s + prime * 0 + 0); ++ unset_bit<7>(s + prime * 6 + 3); ++ unset_bit<1>(s + prime * 10 + 6); ++ unset_bit<2>(s + prime * 12 + 7); ++ unset_bit<5>(s + prime * 16 + 9); ++ unset_bit<6>(s + prime * 18 + 10); ++ unset_bit<0>(s + prime * 22 + 13); ++ unset_bit<3>(s + prime * 28 + 16); ++ s += prime * 30 + 17; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 40: if (s >= sieve_end) { wheel.index = 40; break; } ++ unset_bit<5>(s); s += prime * 6 + 4; ++ case 41: if (s >= sieve_end) { wheel.index = 41; break; } ++ unset_bit<3>(s); s += prime * 4 + 2; ++ case 42: if (s >= sieve_end) { wheel.index = 42; break; } ++ unset_bit<7>(s); s += prime * 2 + 2; ++ case 43: if (s >= sieve_end) { wheel.index = 43; break; } ++ unset_bit<1>(s); s += prime * 4 + 2; ++ case 44: if (s >= sieve_end) { wheel.index = 44; break; } ++ unset_bit<6>(s); s += prime * 2 + 2; ++ case 45: if (s >= sieve_end) { wheel.index = 45; break; } ++ unset_bit<0>(s); s += prime * 4 + 2; ++ case 46: if (s >= sieve_end) { wheel.index = 46; break; } ++ unset_bit<4>(s); s += prime * 6 + 4; ++ case 47: if (s >= sieve_end) { wheel.index = 47; break; } ++ unset_bit<2>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 18 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 40; break; } +- case 40: unset_bit<5>(s); s += prime * 6 + 4; +- if (s >= sieve_end) { wheel.index = 41; break; } +- case 41: unset_bit<3>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 42; break; } +- case 42: unset_bit<7>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 43; break; } +- case 43: unset_bit<1>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 44; break; } +- case 44: unset_bit<6>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 45; break; } +- case 45: unset_bit<0>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 46; break; } +- case 46: unset_bit<4>(s); s += prime * 6 + 4; +- if (s >= sieve_end) { wheel.index = 47; break; } +- case 47: unset_bit<2>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 18 < sieve_end) +- { +- unset_bit<5>(s + prime * 0 + 0); +- unset_bit<3>(s + prime * 6 + 4); +- unset_bit<7>(s + prime * 10 + 6); +- unset_bit<1>(s + prime * 12 + 8); +- unset_bit<6>(s + prime * 16 + 10); +- unset_bit<0>(s + prime * 18 + 12); +- unset_bit<4>(s + prime * 22 + 14); +- unset_bit<2>(s + prime * 28 + 18); +- s += prime * 30 + 19; +- } ++ unset_bit<5>(s + prime * 0 + 0); ++ unset_bit<3>(s + prime * 6 + 4); ++ unset_bit<7>(s + prime * 10 + 6); ++ unset_bit<1>(s + prime * 12 + 8); ++ unset_bit<6>(s + prime * 16 + 10); ++ unset_bit<0>(s + prime * 18 + 12); ++ unset_bit<4>(s + prime * 22 + 14); ++ unset_bit<2>(s + prime * 28 + 18); ++ s += prime * 30 + 19; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 48: if (s >= sieve_end) { wheel.index = 48; break; } ++ unset_bit<6>(s); s += prime * 6 + 5; ++ case 49: if (s >= sieve_end) { wheel.index = 49; break; } ++ unset_bit<2>(s); s += prime * 4 + 3; ++ case 50: if (s >= sieve_end) { wheel.index = 50; break; } ++ unset_bit<3>(s); s += prime * 2 + 1; ++ case 51: if (s >= sieve_end) { wheel.index = 51; break; } ++ unset_bit<7>(s); s += prime * 4 + 4; ++ case 52: if (s >= sieve_end) { wheel.index = 52; break; } ++ unset_bit<0>(s); s += prime * 2 + 1; ++ case 53: if (s >= sieve_end) { wheel.index = 53; break; } ++ unset_bit<4>(s); s += prime * 4 + 3; ++ case 54: if (s >= sieve_end) { wheel.index = 54; break; } ++ unset_bit<5>(s); s += prime * 6 + 5; ++ case 55: if (s >= sieve_end) { wheel.index = 55; break; } ++ unset_bit<1>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 22 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 48; break; } +- case 48: unset_bit<6>(s); s += prime * 6 + 5; +- if (s >= sieve_end) { wheel.index = 49; break; } +- case 49: unset_bit<2>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 50; break; } +- case 50: unset_bit<3>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 51; break; } +- case 51: unset_bit<7>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 52; break; } +- case 52: unset_bit<0>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 53; break; } +- case 53: unset_bit<4>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 54; break; } +- case 54: unset_bit<5>(s); s += prime * 6 + 5; +- if (s >= sieve_end) { wheel.index = 55; break; } +- case 55: unset_bit<1>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 22 < sieve_end) +- { +- unset_bit<6>(s + prime * 0 + 0); +- unset_bit<2>(s + prime * 6 + 5); +- unset_bit<3>(s + prime * 10 + 8); +- unset_bit<7>(s + prime * 12 + 9); +- unset_bit<0>(s + prime * 16 + 13); +- unset_bit<4>(s + prime * 18 + 14); +- unset_bit<5>(s + prime * 22 + 17); +- unset_bit<1>(s + prime * 28 + 22); +- s += prime * 30 + 23; +- } ++ unset_bit<6>(s + prime * 0 + 0); ++ unset_bit<2>(s + prime * 6 + 5); ++ unset_bit<3>(s + prime * 10 + 8); ++ unset_bit<7>(s + prime * 12 + 9); ++ unset_bit<0>(s + prime * 16 + 13); ++ unset_bit<4>(s + prime * 18 + 14); ++ unset_bit<5>(s + prime * 22 + 17); ++ unset_bit<1>(s + prime * 28 + 22); ++ s += prime * 30 + 23; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 56: if (s >= sieve_end) { wheel.index = 56; break; } ++ unset_bit<7>(s); s += prime * 6 + 6; ++ case 57: if (s >= sieve_end) { wheel.index = 57; break; } ++ unset_bit<6>(s); s += prime * 4 + 4; ++ case 58: if (s >= sieve_end) { wheel.index = 58; break; } ++ unset_bit<5>(s); s += prime * 2 + 2; ++ case 59: if (s >= sieve_end) { wheel.index = 59; break; } ++ unset_bit<4>(s); s += prime * 4 + 4; ++ case 60: if (s >= sieve_end) { wheel.index = 60; break; } ++ unset_bit<3>(s); s += prime * 2 + 2; ++ case 61: if (s >= sieve_end) { wheel.index = 61; break; } ++ unset_bit<2>(s); s += prime * 4 + 4; ++ case 62: if (s >= sieve_end) { wheel.index = 62; break; } ++ unset_bit<1>(s); s += prime * 6 + 6; ++ case 63: if (s >= sieve_end) { wheel.index = 63; break; } ++ unset_bit<0>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 28 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 56; break; } +- case 56: unset_bit<7>(s); s += prime * 6 + 6; +- if (s >= sieve_end) { wheel.index = 57; break; } +- case 57: unset_bit<6>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 58; break; } +- case 58: unset_bit<5>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 59; break; } +- case 59: unset_bit<4>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 60; break; } +- case 60: unset_bit<3>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 61; break; } +- case 61: unset_bit<2>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 62; break; } +- case 62: unset_bit<1>(s); s += prime * 6 + 6; +- if (s >= sieve_end) { wheel.index = 63; break; } +- case 63: unset_bit<0>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 28 < sieve_end) +- { +- unset_bit<7>(s + prime * 0 + 0); +- unset_bit<6>(s + prime * 6 + 6); +- unset_bit<5>(s + prime * 10 + 10); +- unset_bit<4>(s + prime * 12 + 12); +- unset_bit<3>(s + prime * 16 + 16); +- unset_bit<2>(s + prime * 18 + 18); +- unset_bit<1>(s + prime * 22 + 22); +- unset_bit<0>(s + prime * 28 + 28); +- s += prime * 30 + 29; +- } ++ unset_bit<7>(s + prime * 0 + 0); ++ unset_bit<6>(s + prime * 6 + 6); ++ unset_bit<5>(s + prime * 10 + 10); ++ unset_bit<4>(s + prime * 12 + 12); ++ unset_bit<3>(s + prime * 16 + 16); ++ unset_bit<2>(s + prime * 18 + 18); ++ unset_bit<1>(s + prime * 22 + 22); ++ unset_bit<0>(s + prime * 28 + 28); ++ s += prime * 30 + 29; + } +- break; + } +- +- // update for the next segment +- wheel.multiple = (uint32_t) (s - sieve_end); ++ break; + } ++ ++ // update for the next segment ++ wheel.multiple = (uint32_t) (s - sieve_end); + } + + /// Remove the i-th prime and the multiples of the i-th +@@ -506,361 +499,354 @@ uint64_t Sieve::cross_off_count(uint64_t prime, uint64_t i) + add(prime); + + uint64_t cnt = 0; +- uint32_t sieve_size = (uint32_t) sieve_.size(); + Wheel& wheel = wheel_[i]; ++ // pointer to the byte with the 1st multiple ++ byte_t* s = sieve_ + wheel.multiple; ++ byte_t* sieve_end = sieve_ + sieve_size_; ++ prime /= 30; + +- if (wheel.multiple >= sieve_size) +- wheel.multiple -= sieve_size; +- else ++ switch (wheel.index) + { +- // pointer to the byte with the 1st multiple +- byte_t* s = &sieve_[wheel.multiple]; +- byte_t* sieve_end = &sieve_[sieve_size]; +- prime /= 30; +- +- switch (wheel.index) ++ for (;;) + { +- for (;;) ++ case 0: if (s >= sieve_end) { wheel.index = 0; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 6 + 0; ++ case 1: if (s >= sieve_end) { wheel.index = 1; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 0; ++ case 2: if (s >= sieve_end) { wheel.index = 2; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 0; ++ case 3: if (s >= sieve_end) { wheel.index = 3; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 0; ++ case 4: if (s >= sieve_end) { wheel.index = 4; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 0; ++ case 5: if (s >= sieve_end) { wheel.index = 5; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 0; ++ case 6: if (s >= sieve_end) { wheel.index = 6; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 6 + 0; ++ case 7: if (s >= sieve_end) { wheel.index = 7; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 0; break; } +- case 0: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 6 + 0; +- if (s >= sieve_end) { wheel.index = 1; break; } +- case 1: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 2; break; } +- case 2: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 3; break; } +- case 3: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 4; break; } +- case 4: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 5; break; } +- case 5: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 6; break; } +- case 6: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 6 + 0; +- if (s >= sieve_end) { wheel.index = 7; break; } +- case 7: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 < sieve_end) +- { +- cnt += is_bit<0>(s + prime * 0); +- unset_bit<0>(s + prime * 0); +- cnt += is_bit<1>(s + prime * 6); +- unset_bit<1>(s + prime * 6); +- cnt += is_bit<2>(s + prime * 10); +- unset_bit<2>(s + prime * 10); +- cnt += is_bit<3>(s + prime * 12); +- unset_bit<3>(s + prime * 12); +- cnt += is_bit<4>(s + prime * 16); +- unset_bit<4>(s + prime * 16); +- cnt += is_bit<5>(s + prime * 18); +- unset_bit<5>(s + prime * 18); +- cnt += is_bit<6>(s + prime * 22); +- unset_bit<6>(s + prime * 22); +- cnt += is_bit<7>(s + prime * 28); +- unset_bit<7>(s + prime * 28); +- s += prime * 30 + 1; +- } ++ cnt += is_bit<0>(s + prime * 0); ++ unset_bit<0>(s + prime * 0); ++ cnt += is_bit<1>(s + prime * 6); ++ unset_bit<1>(s + prime * 6); ++ cnt += is_bit<2>(s + prime * 10); ++ unset_bit<2>(s + prime * 10); ++ cnt += is_bit<3>(s + prime * 12); ++ unset_bit<3>(s + prime * 12); ++ cnt += is_bit<4>(s + prime * 16); ++ unset_bit<4>(s + prime * 16); ++ cnt += is_bit<5>(s + prime * 18); ++ unset_bit<5>(s + prime * 18); ++ cnt += is_bit<6>(s + prime * 22); ++ unset_bit<6>(s + prime * 22); ++ cnt += is_bit<7>(s + prime * 28); ++ unset_bit<7>(s + prime * 28); ++ s += prime * 30 + 1; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 8: if (s >= sieve_end) { wheel.index = 8; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 6 + 1; ++ case 9: if (s >= sieve_end) { wheel.index = 9; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 1; ++ case 10: if (s >= sieve_end) { wheel.index = 10; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 1; ++ case 11: if (s >= sieve_end) { wheel.index = 11; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 0; ++ case 12: if (s >= sieve_end) { wheel.index = 12; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 1; ++ case 13: if (s >= sieve_end) { wheel.index = 13; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 1; ++ case 14: if (s >= sieve_end) { wheel.index = 14; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 6 + 1; ++ case 15: if (s >= sieve_end) { wheel.index = 15; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 6 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 8; break; } +- case 8: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 6 + 1; +- if (s >= sieve_end) { wheel.index = 9; break; } +- case 9: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 10; break; } +- case 10: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 11; break; } +- case 11: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 12; break; } +- case 12: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 13; break; } +- case 13: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 14; break; } +- case 14: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 6 + 1; +- if (s >= sieve_end) { wheel.index = 15; break; } +- case 15: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 6 < sieve_end) +- { +- cnt += is_bit<1>(s + prime * 0 + 0); +- unset_bit<1>(s + prime * 0 + 0); +- cnt += is_bit<5>(s + prime * 6 + 1); +- unset_bit<5>(s + prime * 6 + 1); +- cnt += is_bit<4>(s + prime * 10 + 2); +- unset_bit<4>(s + prime * 10 + 2); +- cnt += is_bit<0>(s + prime * 12 + 3); +- unset_bit<0>(s + prime * 12 + 3); +- cnt += is_bit<7>(s + prime * 16 + 3); +- unset_bit<7>(s + prime * 16 + 3); +- cnt += is_bit<3>(s + prime * 18 + 4); +- unset_bit<3>(s + prime * 18 + 4); +- cnt += is_bit<2>(s + prime * 22 + 5); +- unset_bit<2>(s + prime * 22 + 5); +- cnt += is_bit<6>(s + prime * 28 + 6); +- unset_bit<6>(s + prime * 28 + 6); +- s += prime * 30 + 7; +- } ++ cnt += is_bit<1>(s + prime * 0 + 0); ++ unset_bit<1>(s + prime * 0 + 0); ++ cnt += is_bit<5>(s + prime * 6 + 1); ++ unset_bit<5>(s + prime * 6 + 1); ++ cnt += is_bit<4>(s + prime * 10 + 2); ++ unset_bit<4>(s + prime * 10 + 2); ++ cnt += is_bit<0>(s + prime * 12 + 3); ++ unset_bit<0>(s + prime * 12 + 3); ++ cnt += is_bit<7>(s + prime * 16 + 3); ++ unset_bit<7>(s + prime * 16 + 3); ++ cnt += is_bit<3>(s + prime * 18 + 4); ++ unset_bit<3>(s + prime * 18 + 4); ++ cnt += is_bit<2>(s + prime * 22 + 5); ++ unset_bit<2>(s + prime * 22 + 5); ++ cnt += is_bit<6>(s + prime * 28 + 6); ++ unset_bit<6>(s + prime * 28 + 6); ++ s += prime * 30 + 7; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 16: if (s >= sieve_end) { wheel.index = 16; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 6 + 2; ++ case 17: if (s >= sieve_end) { wheel.index = 17; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 2; ++ case 18: if (s >= sieve_end) { wheel.index = 18; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 0; ++ case 19: if (s >= sieve_end) { wheel.index = 19; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 2; ++ case 20: if (s >= sieve_end) { wheel.index = 20; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 0; ++ case 21: if (s >= sieve_end) { wheel.index = 21; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 2; ++ case 22: if (s >= sieve_end) { wheel.index = 22; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 6 + 2; ++ case 23: if (s >= sieve_end) { wheel.index = 23; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 10 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 16; break; } +- case 16: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 6 + 2; +- if (s >= sieve_end) { wheel.index = 17; break; } +- case 17: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 18; break; } +- case 18: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 19; break; } +- case 19: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 20; break; } +- case 20: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 21; break; } +- case 21: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 22; break; } +- case 22: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 6 + 2; +- if (s >= sieve_end) { wheel.index = 23; break; } +- case 23: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 10 < sieve_end) +- { +- cnt += is_bit<2>(s + prime * 0 + 0); +- unset_bit<2>(s + prime * 0 + 0); +- cnt += is_bit<4>(s + prime * 6 + 2); +- unset_bit<4>(s + prime * 6 + 2); +- cnt += is_bit<0>(s + prime * 10 + 4); +- unset_bit<0>(s + prime * 10 + 4); +- cnt += is_bit<6>(s + prime * 12 + 4); +- unset_bit<6>(s + prime * 12 + 4); +- cnt += is_bit<1>(s + prime * 16 + 6); +- unset_bit<1>(s + prime * 16 + 6); +- cnt += is_bit<7>(s + prime * 18 + 6); +- unset_bit<7>(s + prime * 18 + 6); +- cnt += is_bit<3>(s + prime * 22 + 8); +- unset_bit<3>(s + prime * 22 + 8); +- cnt += is_bit<5>(s + prime * 28 + 10); +- unset_bit<5>(s + prime * 28 + 10); +- s += prime * 30 + 11; +- } ++ cnt += is_bit<2>(s + prime * 0 + 0); ++ unset_bit<2>(s + prime * 0 + 0); ++ cnt += is_bit<4>(s + prime * 6 + 2); ++ unset_bit<4>(s + prime * 6 + 2); ++ cnt += is_bit<0>(s + prime * 10 + 4); ++ unset_bit<0>(s + prime * 10 + 4); ++ cnt += is_bit<6>(s + prime * 12 + 4); ++ unset_bit<6>(s + prime * 12 + 4); ++ cnt += is_bit<1>(s + prime * 16 + 6); ++ unset_bit<1>(s + prime * 16 + 6); ++ cnt += is_bit<7>(s + prime * 18 + 6); ++ unset_bit<7>(s + prime * 18 + 6); ++ cnt += is_bit<3>(s + prime * 22 + 8); ++ unset_bit<3>(s + prime * 22 + 8); ++ cnt += is_bit<5>(s + prime * 28 + 10); ++ unset_bit<5>(s + prime * 28 + 10); ++ s += prime * 30 + 11; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 24: if (s >= sieve_end) { wheel.index = 24; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 6 + 3; ++ case 25: if (s >= sieve_end) { wheel.index = 25; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 1; ++ case 26: if (s >= sieve_end) { wheel.index = 26; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 1; ++ case 27: if (s >= sieve_end) { wheel.index = 27; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 2; ++ case 28: if (s >= sieve_end) { wheel.index = 28; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 1; ++ case 29: if (s >= sieve_end) { wheel.index = 29; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 1; ++ case 30: if (s >= sieve_end) { wheel.index = 30; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 6 + 3; ++ case 31: if (s >= sieve_end) { wheel.index = 31; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 12 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 24; break; } +- case 24: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 25; break; } +- case 25: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 26; break; } +- case 26: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 27; break; } +- case 27: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 28; break; } +- case 28: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 29; break; } +- case 29: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 30; break; } +- case 30: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 31; break; } +- case 31: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 12 < sieve_end) +- { +- cnt += is_bit<3>(s + prime * 0 + 0); +- unset_bit<3>(s + prime * 0 + 0); +- cnt += is_bit<0>(s + prime * 6 + 3); +- unset_bit<0>(s + prime * 6 + 3); +- cnt += is_bit<6>(s + prime * 10 + 4); +- unset_bit<6>(s + prime * 10 + 4); +- cnt += is_bit<5>(s + prime * 12 + 5); +- unset_bit<5>(s + prime * 12 + 5); +- cnt += is_bit<2>(s + prime * 16 + 7); +- unset_bit<2>(s + prime * 16 + 7); +- cnt += is_bit<1>(s + prime * 18 + 8); +- unset_bit<1>(s + prime * 18 + 8); +- cnt += is_bit<7>(s + prime * 22 + 9); +- unset_bit<7>(s + prime * 22 + 9); +- cnt += is_bit<4>(s + prime * 28 + 12); +- unset_bit<4>(s + prime * 28 + 12); +- s += prime * 30 + 13; +- } ++ cnt += is_bit<3>(s + prime * 0 + 0); ++ unset_bit<3>(s + prime * 0 + 0); ++ cnt += is_bit<0>(s + prime * 6 + 3); ++ unset_bit<0>(s + prime * 6 + 3); ++ cnt += is_bit<6>(s + prime * 10 + 4); ++ unset_bit<6>(s + prime * 10 + 4); ++ cnt += is_bit<5>(s + prime * 12 + 5); ++ unset_bit<5>(s + prime * 12 + 5); ++ cnt += is_bit<2>(s + prime * 16 + 7); ++ unset_bit<2>(s + prime * 16 + 7); ++ cnt += is_bit<1>(s + prime * 18 + 8); ++ unset_bit<1>(s + prime * 18 + 8); ++ cnt += is_bit<7>(s + prime * 22 + 9); ++ unset_bit<7>(s + prime * 22 + 9); ++ cnt += is_bit<4>(s + prime * 28 + 12); ++ unset_bit<4>(s + prime * 28 + 12); ++ s += prime * 30 + 13; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 32: if (s >= sieve_end) { wheel.index = 32; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 6 + 3; ++ case 33: if (s >= sieve_end) { wheel.index = 33; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 3; ++ case 34: if (s >= sieve_end) { wheel.index = 34; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 1; ++ case 35: if (s >= sieve_end) { wheel.index = 35; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 2; ++ case 36: if (s >= sieve_end) { wheel.index = 36; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 1; ++ case 37: if (s >= sieve_end) { wheel.index = 37; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 3; ++ case 38: if (s >= sieve_end) { wheel.index = 38; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 6 + 3; ++ case 39: if (s >= sieve_end) { wheel.index = 39; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 16 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 32; break; } +- case 32: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 33; break; } +- case 33: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 34; break; } +- case 34: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 35; break; } +- case 35: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 36; break; } +- case 36: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 37; break; } +- case 37: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 38; break; } +- case 38: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 39; break; } +- case 39: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 16 < sieve_end) +- { +- cnt += is_bit<4>(s + prime * 0 + 0); +- unset_bit<4>(s + prime * 0 + 0); +- cnt += is_bit<7>(s + prime * 6 + 3); +- unset_bit<7>(s + prime * 6 + 3); +- cnt += is_bit<1>(s + prime * 10 + 6); +- unset_bit<1>(s + prime * 10 + 6); +- cnt += is_bit<2>(s + prime * 12 + 7); +- unset_bit<2>(s + prime * 12 + 7); +- cnt += is_bit<5>(s + prime * 16 + 9); +- unset_bit<5>(s + prime * 16 + 9); +- cnt += is_bit<6>(s + prime * 18 + 10); +- unset_bit<6>(s + prime * 18 + 10); +- cnt += is_bit<0>(s + prime * 22 + 13); +- unset_bit<0>(s + prime * 22 + 13); +- cnt += is_bit<3>(s + prime * 28 + 16); +- unset_bit<3>(s + prime * 28 + 16); +- s += prime * 30 + 17; +- } ++ cnt += is_bit<4>(s + prime * 0 + 0); ++ unset_bit<4>(s + prime * 0 + 0); ++ cnt += is_bit<7>(s + prime * 6 + 3); ++ unset_bit<7>(s + prime * 6 + 3); ++ cnt += is_bit<1>(s + prime * 10 + 6); ++ unset_bit<1>(s + prime * 10 + 6); ++ cnt += is_bit<2>(s + prime * 12 + 7); ++ unset_bit<2>(s + prime * 12 + 7); ++ cnt += is_bit<5>(s + prime * 16 + 9); ++ unset_bit<5>(s + prime * 16 + 9); ++ cnt += is_bit<6>(s + prime * 18 + 10); ++ unset_bit<6>(s + prime * 18 + 10); ++ cnt += is_bit<0>(s + prime * 22 + 13); ++ unset_bit<0>(s + prime * 22 + 13); ++ cnt += is_bit<3>(s + prime * 28 + 16); ++ unset_bit<3>(s + prime * 28 + 16); ++ s += prime * 30 + 17; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 40: if (s >= sieve_end) { wheel.index = 40; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 6 + 4; ++ case 41: if (s >= sieve_end) { wheel.index = 41; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 2; ++ case 42: if (s >= sieve_end) { wheel.index = 42; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 2; ++ case 43: if (s >= sieve_end) { wheel.index = 43; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 2; ++ case 44: if (s >= sieve_end) { wheel.index = 44; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 2; ++ case 45: if (s >= sieve_end) { wheel.index = 45; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 2; ++ case 46: if (s >= sieve_end) { wheel.index = 46; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 6 + 4; ++ case 47: if (s >= sieve_end) { wheel.index = 47; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 18 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 40; break; } +- case 40: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 6 + 4; +- if (s >= sieve_end) { wheel.index = 41; break; } +- case 41: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 42; break; } +- case 42: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 43; break; } +- case 43: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 44; break; } +- case 44: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 45; break; } +- case 45: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 46; break; } +- case 46: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 6 + 4; +- if (s >= sieve_end) { wheel.index = 47; break; } +- case 47: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 18 < sieve_end) +- { +- cnt += is_bit<5>(s + prime * 0 + 0); +- unset_bit<5>(s + prime * 0 + 0); +- cnt += is_bit<3>(s + prime * 6 + 4); +- unset_bit<3>(s + prime * 6 + 4); +- cnt += is_bit<7>(s + prime * 10 + 6); +- unset_bit<7>(s + prime * 10 + 6); +- cnt += is_bit<1>(s + prime * 12 + 8); +- unset_bit<1>(s + prime * 12 + 8); +- cnt += is_bit<6>(s + prime * 16 + 10); +- unset_bit<6>(s + prime * 16 + 10); +- cnt += is_bit<0>(s + prime * 18 + 12); +- unset_bit<0>(s + prime * 18 + 12); +- cnt += is_bit<4>(s + prime * 22 + 14); +- unset_bit<4>(s + prime * 22 + 14); +- cnt += is_bit<2>(s + prime * 28 + 18); +- unset_bit<2>(s + prime * 28 + 18); +- s += prime * 30 + 19; +- } ++ cnt += is_bit<5>(s + prime * 0 + 0); ++ unset_bit<5>(s + prime * 0 + 0); ++ cnt += is_bit<3>(s + prime * 6 + 4); ++ unset_bit<3>(s + prime * 6 + 4); ++ cnt += is_bit<7>(s + prime * 10 + 6); ++ unset_bit<7>(s + prime * 10 + 6); ++ cnt += is_bit<1>(s + prime * 12 + 8); ++ unset_bit<1>(s + prime * 12 + 8); ++ cnt += is_bit<6>(s + prime * 16 + 10); ++ unset_bit<6>(s + prime * 16 + 10); ++ cnt += is_bit<0>(s + prime * 18 + 12); ++ unset_bit<0>(s + prime * 18 + 12); ++ cnt += is_bit<4>(s + prime * 22 + 14); ++ unset_bit<4>(s + prime * 22 + 14); ++ cnt += is_bit<2>(s + prime * 28 + 18); ++ unset_bit<2>(s + prime * 28 + 18); ++ s += prime * 30 + 19; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 48: if (s >= sieve_end) { wheel.index = 48; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 6 + 5; ++ case 49: if (s >= sieve_end) { wheel.index = 49; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 3; ++ case 50: if (s >= sieve_end) { wheel.index = 50; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 1; ++ case 51: if (s >= sieve_end) { wheel.index = 51; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 4; ++ case 52: if (s >= sieve_end) { wheel.index = 52; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 1; ++ case 53: if (s >= sieve_end) { wheel.index = 53; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 3; ++ case 54: if (s >= sieve_end) { wheel.index = 54; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 6 + 5; ++ case 55: if (s >= sieve_end) { wheel.index = 55; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 22 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 48; break; } +- case 48: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 6 + 5; +- if (s >= sieve_end) { wheel.index = 49; break; } +- case 49: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 50; break; } +- case 50: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 51; break; } +- case 51: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 52; break; } +- case 52: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 53; break; } +- case 53: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 54; break; } +- case 54: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 6 + 5; +- if (s >= sieve_end) { wheel.index = 55; break; } +- case 55: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 22 < sieve_end) +- { +- cnt += is_bit<6>(s + prime * 0 + 0); +- unset_bit<6>(s + prime * 0 + 0); +- cnt += is_bit<2>(s + prime * 6 + 5); +- unset_bit<2>(s + prime * 6 + 5); +- cnt += is_bit<3>(s + prime * 10 + 8); +- unset_bit<3>(s + prime * 10 + 8); +- cnt += is_bit<7>(s + prime * 12 + 9); +- unset_bit<7>(s + prime * 12 + 9); +- cnt += is_bit<0>(s + prime * 16 + 13); +- unset_bit<0>(s + prime * 16 + 13); +- cnt += is_bit<4>(s + prime * 18 + 14); +- unset_bit<4>(s + prime * 18 + 14); +- cnt += is_bit<5>(s + prime * 22 + 17); +- unset_bit<5>(s + prime * 22 + 17); +- cnt += is_bit<1>(s + prime * 28 + 22); +- unset_bit<1>(s + prime * 28 + 22); +- s += prime * 30 + 23; +- } ++ cnt += is_bit<6>(s + prime * 0 + 0); ++ unset_bit<6>(s + prime * 0 + 0); ++ cnt += is_bit<2>(s + prime * 6 + 5); ++ unset_bit<2>(s + prime * 6 + 5); ++ cnt += is_bit<3>(s + prime * 10 + 8); ++ unset_bit<3>(s + prime * 10 + 8); ++ cnt += is_bit<7>(s + prime * 12 + 9); ++ unset_bit<7>(s + prime * 12 + 9); ++ cnt += is_bit<0>(s + prime * 16 + 13); ++ unset_bit<0>(s + prime * 16 + 13); ++ cnt += is_bit<4>(s + prime * 18 + 14); ++ unset_bit<4>(s + prime * 18 + 14); ++ cnt += is_bit<5>(s + prime * 22 + 17); ++ unset_bit<5>(s + prime * 22 + 17); ++ cnt += is_bit<1>(s + prime * 28 + 22); ++ unset_bit<1>(s + prime * 28 + 22); ++ s += prime * 30 + 23; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 56: if (s >= sieve_end) { wheel.index = 56; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 6 + 6; ++ case 57: if (s >= sieve_end) { wheel.index = 57; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 4; ++ case 58: if (s >= sieve_end) { wheel.index = 58; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 2; ++ case 59: if (s >= sieve_end) { wheel.index = 59; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 4; ++ case 60: if (s >= sieve_end) { wheel.index = 60; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 2; ++ case 61: if (s >= sieve_end) { wheel.index = 61; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 4; ++ case 62: if (s >= sieve_end) { wheel.index = 62; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 6 + 6; ++ case 63: if (s >= sieve_end) { wheel.index = 63; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 28 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 56; break; } +- case 56: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 6 + 6; +- if (s >= sieve_end) { wheel.index = 57; break; } +- case 57: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 58; break; } +- case 58: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 59; break; } +- case 59: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 60; break; } +- case 60: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 61; break; } +- case 61: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 62; break; } +- case 62: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 6 + 6; +- if (s >= sieve_end) { wheel.index = 63; break; } +- case 63: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 28 < sieve_end) +- { +- cnt += is_bit<7>(s + prime * 0 + 0); +- unset_bit<7>(s + prime * 0 + 0); +- cnt += is_bit<6>(s + prime * 6 + 6); +- unset_bit<6>(s + prime * 6 + 6); +- cnt += is_bit<5>(s + prime * 10 + 10); +- unset_bit<5>(s + prime * 10 + 10); +- cnt += is_bit<4>(s + prime * 12 + 12); +- unset_bit<4>(s + prime * 12 + 12); +- cnt += is_bit<3>(s + prime * 16 + 16); +- unset_bit<3>(s + prime * 16 + 16); +- cnt += is_bit<2>(s + prime * 18 + 18); +- unset_bit<2>(s + prime * 18 + 18); +- cnt += is_bit<1>(s + prime * 22 + 22); +- unset_bit<1>(s + prime * 22 + 22); +- cnt += is_bit<0>(s + prime * 28 + 28); +- unset_bit<0>(s + prime * 28 + 28); +- s += prime * 30 + 29; +- } ++ cnt += is_bit<7>(s + prime * 0 + 0); ++ unset_bit<7>(s + prime * 0 + 0); ++ cnt += is_bit<6>(s + prime * 6 + 6); ++ unset_bit<6>(s + prime * 6 + 6); ++ cnt += is_bit<5>(s + prime * 10 + 10); ++ unset_bit<5>(s + prime * 10 + 10); ++ cnt += is_bit<4>(s + prime * 12 + 12); ++ unset_bit<4>(s + prime * 12 + 12); ++ cnt += is_bit<3>(s + prime * 16 + 16); ++ unset_bit<3>(s + prime * 16 + 16); ++ cnt += is_bit<2>(s + prime * 18 + 18); ++ unset_bit<2>(s + prime * 18 + 18); ++ cnt += is_bit<1>(s + prime * 22 + 22); ++ unset_bit<1>(s + prime * 22 + 22); ++ cnt += is_bit<0>(s + prime * 28 + 28); ++ unset_bit<0>(s + prime * 28 + 28); ++ s += prime * 30 + 29; + } +- break; + } +- +- // update for the next segment +- wheel.multiple = (uint32_t) (s - sieve_end); ++ break; + } + ++ // update for the next segment ++ wheel.multiple = (uint32_t) (s - sieve_end); ++ + return cnt; + } + diff --git a/primecount.rpmlintrc b/primecount.rpmlintrc new file mode 100644 index 0000000..3445fb7 --- /dev/null +++ b/primecount.rpmlintrc @@ -0,0 +1,8 @@ +# THIS FILE SERVES FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON +# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_er… + +# Spelling errors +addFilter(r'spelling-error .* (amongst|balancer|combinatorial|counterclaim|parallelized)') + +# Missing documentation from subpackages +addFilter(r'^primecount-libs\.[^:]+: W: no-documentation') diff --git a/primecount.spec b/primecount.spec new file mode 100644 index 0000000..fb0bae0 --- /dev/null +++ b/primecount.spec @@ -0,0 +1,110 @@ +Name: primecount +Version: 5.1 +Release: 2%{?dist} +Summary: Fast prime counting function implementation + +License: BSD +URL: https://github.com/kimwalisch/%{name}/ +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# Fedora-only patch: unbundle primesieve +Patch0: %{name}-primesieve.patch +# Fix assertion failures due to reading off the end of a vector +# https://github.com/kimwalisch/primecount/pull/26 +Patch1: %{name}-vector.patch + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: help2man +BuildRequires: libdivide-devel +BuildRequires: primesieve-devel + +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description +Primecount is a command-line program and C++ library that counts the +primes below an integer x<=10**31 using highly optimized implementations +of the combinatorial prime counting algorithms. + +Primecount includes implementations of all important combinatorial prime +counting algorithms known up to this date all of which have been +parallelized using OpenMP. Primecount contains the first ever open +source implementations of the Deleglise-Rivat algorithm and Xavier +Gourdon's algorithm (that works). Primecount also features a novel load +balancer that is shared amongst all implementations and that scales up +to hundreds of CPU cores. Primecount has already been used to compute +several world records e.g. pi(10**27) +(http://www.mersenneforum.org/showthread.php?t=20473) and +nth_prime(10**24) (https://oeis.org/A006988). + +%package libs +Summary: C++ library for fast prime counting + +%description libs +This package contains a C++ library for counting primes below an +integer. See the primecount package for a command line interface. + +%package devel +Summary: Headers and library links for libprimecount +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: cmake-filesystem%{?_isa} + +%description devel +This package contains files necessary to develop applications that use +libprimecount. + +%prep +%autosetup -p1 + +# Unbundle libdivide +rm -f include/libdivide.h +ln -s %{_includedir}/libdivide.h include/libdivide.h + +# Ensure we do not use the bundled primesieve library +rm -fr lib + +# Do not add flags that change the architecture +sed -i '/(WITH_POPCNT)/,/^endif()$/d' CMakeLists.txt + +%build +%ifarch %{ix86} x86_64 +export CFLAGS="%{optflags} -DLIBDIVIDE_SSE2" +export CXXFLAGS="$CFLAGS" +%endif +mkdir build +cd build +%cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DBUILD_TESTS=ON .. +%make_build +cd - + +%install +cd build +%make_install +LD_LIBRARY_PATH=$PWD help2man -N -o primecount.1 ./primecount +mkdir -p %{buildroot}%{_mandir}/man1 +cp -p primecount.1 %{buildroot}%{_mandir}/man1 +cd - + +%check +make test + +%files +%doc README.md +%{_bindir}/primecount +%{_mandir}/man1/primecount.1* + +%files libs +%license COPYING +%{_libdir}/libprimecount.so.5* + +%files devel +%doc ChangeLog doc/*.pdf doc/*.md +%{_includedir}/primecount.hpp +%{_libdir}/libprimecount.so + +%changelog +* Fri Sep 20 2019 Jerry James <loganjerry(a)gmail.com> - 5.1-2 +- Add justifications in the patch files +- Generate a man page with help2man + +* Thu Sep 19 2019 Jerry James <loganjerry(a)gmail.com> - 5.1-1 +- Initial RPM diff --git a/sources b/sources new file mode 100644 index 0000000..5211000 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (primecount-5.1.tar.gz) = 64c4aa7a3071cc2ec01373160c0f57829a29f4021b60ada13abc05bc960da3628d48686a28e2b4490d64b7ce3c77b45804f8060205417f5e2b95a55c2cd10603

1 0

Architecture specific change in rpms/primecount.git
by githook-noreply＠fedoraproject.org 25 Sep '19

25 Sep '19

The package rpms/primecount.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/primecount.git/commit/?id=f8bee47f7…. Change: +%ifarch %{ix86} x86_64 Thanks. Full change: ============ commit f8bee47f7bf2838b121432b32e7dc4a8526b3810 Author: Jerry James <loganjerry(a)gmail.com> Date: Wed Sep 25 08:23:28 2019 -0600 Initial import. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c84d91 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/primecount-*.tar.gz diff --git a/primecount-primesieve.patch b/primecount-primesieve.patch new file mode 100644 index 0000000..c44aaa7 --- /dev/null +++ b/primecount-primesieve.patch @@ -0,0 +1,20 @@ +The primecount source distribution includes the primesieve source +distribution. However, we already have primesieve as a separate package in +Fedora, so we use the existing package instead of building it as part of +primecount. + +--- a/CMakeLists.txt 2019-09-02 09:11:38.000000000 -0600 ++++ b/CMakeLists.txt 2019-09-17 12:32:30.822366045 -0600 +@@ -236,11 +236,7 @@ + + # libprimesieve ###################################################### + +-set(COPY_BUILD_TESTS "${BUILD_TESTS}") +-set(BUILD_TESTS OFF CACHE BOOL "Build primesieve tests" FORCE) +-option(BUILD_PRIMESIEVE "Build primesieve binary" OFF) +-add_subdirectory(lib/primesieve) +-set(BUILD_TESTS "${COPY_BUILD_TESTS}" CACHE BOOL "Build test programs" FORCE) ++find_package(primesieve REQUIRED) + + # Testing ############################################################ + diff --git a/primecount-vector.patch b/primecount-vector.patch new file mode 100644 index 0000000..d8ccb94 --- /dev/null +++ b/primecount-vector.patch @@ -0,0 +1,1401 @@ +If primecount is built with GCC and -D_GLIBCXX_ASSERTIONS is in the build +flags, then some tests fail: + +The following tests FAILED: + 8 - S2_hard_xy (Child aborted) + 10 - S2_xy (Child aborted) + 11 - alpha (Child aborted) + 12 - alpha_y (Child aborted) + 13 - alpha_z (Child aborted) + 35 - sieve1 (Child aborted) + 36 - sieve2 (Child aborted) + +Running these tests from the command line shows an assertion failure, e.g. for +S2_hard_xy: + +S2_hard(4912, 16) = 0 OK +S2_hard(4913, 17) = 0/usr/include/c++/9/bits/stl_vector.h:1042: std::vector<_Tp, _Alloc>::reference std::vector<_Tp, _Alloc>::operator[](std::vector<_Tp, _Alloc>::size_type) [with _Tp = unsigned char; _Alloc = std::allocator<unsigned char>; std::vector<_Tp, _Alloc>::reference = unsigned char&; std::vector<_Tp, _Alloc>::size_type = long unsigned int]: Assertion '__builtin_expect(__n < this->size(), true)' failed. +The problem is this code, on lines 214 and 518 of src/Sieve.cpp: + + byte_t* sieve_end = &sieve_[sieve_size]; + +Since sieve_size is the number of elements in the vector, this code asks for +the address of the element just beyond the end of the vector. But GCC's +implementation of operator[] for std::vector looks like this: + + reference + operator[](size_type __n) _GLIBCXX_NOEXCEPT + { + __glibcxx_requires_subscript(__n); + return *(this->_M_impl._M_start + __n); + } + +The __glibcxx_requires_subscript line is where the assertion failure happens. +There actually is a pointer dereference on the following line, so even if +assertions are not enabled, this code dereferences a pointer that points beyond +the vector. + +Upstream elected to solve the problem by converting the vector into a C array, +as follows. See +https://github.com/kimwalisch/primecount/commit/1c441f242739d3189787474943cf18690281072d + +diff --git a/include/Sieve.hpp b/include/Sieve.hpp +index da2102c9..eb6a3a88 100644 +--- a/include/Sieve.hpp ++++ b/include/Sieve.hpp +@@ -24,6 +24,7 @@ + + #include <stdint.h> + #include <cassert> ++#include <memory> + #include <vector> + + namespace primecount { +@@ -94,11 +95,12 @@ public: + + private: + void reset_sieve(uint64_t low, uint64_t high); +- void set_sieve_size(uint64_t segment_size); + void add(uint64_t prime); + + uint64_t start_; +- std::vector<byte_t> sieve_; ++ uint64_t sieve_size_; ++ byte_t* sieve_; ++ std::unique_ptr<byte_t[]> deleter_; + std::vector<Wheel> wheel_; + }; + +diff --git a/src/Sieve.cpp b/src/Sieve.cpp +index 5aa4f3a4..f0f0ad43 100644 +--- a/src/Sieve.cpp ++++ b/src/Sieve.cpp +@@ -27,6 +27,7 @@ + #include <algorithm> + #include <array> + #include <cassert> ++#include <memory> + #include <vector> + + using namespace std; +@@ -91,17 +92,25 @@ Sieve::Sieve(uint64_t start, + assert(segment_size % 240 == 0); + + start_ = start; +- set_sieve_size(segment_size); ++ segment_size = get_segment_size(segment_size); ++ ++ // sieve_size = segment_size / 30 as each byte corresponds ++ // to 30 numbers i.e. the 8 bits correspond to the ++ // offsets = {1, 7, 11, 13, 17, 19, 23, 29}. ++ sieve_size_ = segment_size / 30; ++ sieve_ = new byte_t[sieve_size_]; ++ deleter_.reset(sieve_); ++ + wheel_.reserve(wheel_size); + wheel_.resize(4); + } + +-/// The segment size (a.k.a. sieve distance) is sieve +-/// size * 30 as each byte contains 30 numbers. ++/// The segment size is sieve_size * 30 as each ++/// byte corresponds to 30 numbers. + /// + uint64_t Sieve::segment_size() const + { +- return sieve_.size() * 30; ++ return sieve_size_ * 30; + } + + /// segment_size must be a multiple of 240 as we +@@ -118,16 +127,6 @@ uint64_t Sieve::get_segment_size(uint64_t size) + return size; + } + +-/// Sieve size = segment_size / 30 as +-/// each byte contains 30 numbers. +-/// +-void Sieve::set_sieve_size(uint64_t segment_size) +-{ +- segment_size = get_segment_size(segment_size); +- uint64_t size = segment_size / 30; +- sieve_.resize(size); +-} +- + /// Count 1 bits inside [start, stop] + uint64_t Sieve::count(uint64_t start, uint64_t stop) const + { +@@ -141,15 +140,15 @@ uint64_t Sieve::count(uint64_t start, uint64_t stop) const + uint64_t stop_idx = stop / 240; + uint64_t m1 = unset_smaller[start % 240]; + uint64_t m2 = unset_larger[stop % 240]; +- auto sieve = (uint64_t*) &sieve_[0]; ++ auto sieve64 = (uint64_t*) sieve_; + + if (start_idx == stop_idx) +- bit_count = popcnt64(sieve[start_idx] & (m1 & m2)); ++ bit_count = popcnt64(sieve64[start_idx] & (m1 & m2)); + else + { +- bit_count = popcnt64(sieve[start_idx] & m1); +- bit_count += popcnt(&sieve[start_idx + 1], stop_idx - (start_idx + 1)); +- bit_count += popcnt64(sieve[stop_idx] & m2); ++ bit_count = popcnt64(sieve64[start_idx] & m1); ++ bit_count += popcnt(&sieve64[start_idx + 1], stop_idx - (start_idx + 1)); ++ bit_count += popcnt64(sieve64[stop_idx] & m2); + } + + return bit_count; +@@ -157,15 +156,16 @@ uint64_t Sieve::count(uint64_t start, uint64_t stop) const + + void Sieve::reset_sieve(uint64_t low, uint64_t high) + { +- fill(sieve_.begin(), sieve_.end(), 0xff); ++ fill_n(sieve_, sieve_size_, (byte_t) 0xff); + uint64_t size = high - low; + + if (size < segment_size()) + { +- set_sieve_size(size); +- auto sieve = (uint64_t*) &sieve_[0]; +- uint64_t back = size - 1; +- sieve[back / 240] &= unset_larger[back % 240]; ++ uint64_t last = size - 1; ++ size = get_segment_size(size); ++ sieve_size_ = size / 30; ++ auto sieve64 = (uint64_t*) sieve_; ++ sieve64[last / 240] &= unset_larger[last % 240]; + } + } + +@@ -202,296 +202,289 @@ void Sieve::cross_off(uint64_t prime, uint64_t i) + if (i >= wheel_.size()) + add(prime); + +- uint32_t sieve_size = (uint32_t) sieve_.size(); + Wheel& wheel = wheel_[i]; ++ // pointer to the byte with the 1st multiple ++ byte_t* s = sieve_ + wheel.multiple; ++ byte_t* sieve_end = sieve_ + sieve_size_; ++ prime /= 30; + +- if (wheel.multiple >= sieve_size) +- wheel.multiple -= sieve_size; +- else ++ switch (wheel.index) + { +- // pointer to the byte with the 1st multiple +- byte_t* s = &sieve_[wheel.multiple]; +- byte_t* sieve_end = &sieve_[sieve_size]; +- prime /= 30; +- +- switch (wheel.index) ++ for (;;) + { +- for (;;) ++ case 0: if (s >= sieve_end) { wheel.index = 0; break; } ++ unset_bit<0>(s); s += prime * 6 + 0; ++ case 1: if (s >= sieve_end) { wheel.index = 1; break; } ++ unset_bit<1>(s); s += prime * 4 + 0; ++ case 2: if (s >= sieve_end) { wheel.index = 2; break; } ++ unset_bit<2>(s); s += prime * 2 + 0; ++ case 3: if (s >= sieve_end) { wheel.index = 3; break; } ++ unset_bit<3>(s); s += prime * 4 + 0; ++ case 4: if (s >= sieve_end) { wheel.index = 4; break; } ++ unset_bit<4>(s); s += prime * 2 + 0; ++ case 5: if (s >= sieve_end) { wheel.index = 5; break; } ++ unset_bit<5>(s); s += prime * 4 + 0; ++ case 6: if (s >= sieve_end) { wheel.index = 6; break; } ++ unset_bit<6>(s); s += prime * 6 + 0; ++ case 7: if (s >= sieve_end) { wheel.index = 7; break; } ++ unset_bit<7>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 0; break; } +- case 0: unset_bit<0>(s); s += prime * 6 + 0; +- if (s >= sieve_end) { wheel.index = 1; break; } +- case 1: unset_bit<1>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 2; break; } +- case 2: unset_bit<2>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 3; break; } +- case 3: unset_bit<3>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 4; break; } +- case 4: unset_bit<4>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 5; break; } +- case 5: unset_bit<5>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 6; break; } +- case 6: unset_bit<6>(s); s += prime * 6 + 0; +- if (s >= sieve_end) { wheel.index = 7; break; } +- case 7: unset_bit<7>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 < sieve_end) +- { +- unset_bit<0>(s + prime * 0); +- unset_bit<1>(s + prime * 6); +- unset_bit<2>(s + prime * 10); +- unset_bit<3>(s + prime * 12); +- unset_bit<4>(s + prime * 16); +- unset_bit<5>(s + prime * 18); +- unset_bit<6>(s + prime * 22); +- unset_bit<7>(s + prime * 28); +- s += prime * 30 + 1; +- } ++ unset_bit<0>(s + prime * 0); ++ unset_bit<1>(s + prime * 6); ++ unset_bit<2>(s + prime * 10); ++ unset_bit<3>(s + prime * 12); ++ unset_bit<4>(s + prime * 16); ++ unset_bit<5>(s + prime * 18); ++ unset_bit<6>(s + prime * 22); ++ unset_bit<7>(s + prime * 28); ++ s += prime * 30 + 1; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 8: if (s >= sieve_end) { wheel.index = 8; break; } ++ unset_bit<1>(s); s += prime * 6 + 1; ++ case 9: if (s >= sieve_end) { wheel.index = 9; break; } ++ unset_bit<5>(s); s += prime * 4 + 1; ++ case 10: if (s >= sieve_end) { wheel.index = 10; break; } ++ unset_bit<4>(s); s += prime * 2 + 1; ++ case 11: if (s >= sieve_end) { wheel.index = 11; break; } ++ unset_bit<0>(s); s += prime * 4 + 0; ++ case 12: if (s >= sieve_end) { wheel.index = 12; break; } ++ unset_bit<7>(s); s += prime * 2 + 1; ++ case 13: if (s >= sieve_end) { wheel.index = 13; break; } ++ unset_bit<3>(s); s += prime * 4 + 1; ++ case 14: if (s >= sieve_end) { wheel.index = 14; break; } ++ unset_bit<2>(s); s += prime * 6 + 1; ++ case 15: if (s >= sieve_end) { wheel.index = 15; break; } ++ unset_bit<6>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 6 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 8; break; } +- case 8: unset_bit<1>(s); s += prime * 6 + 1; +- if (s >= sieve_end) { wheel.index = 9; break; } +- case 9: unset_bit<5>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 10; break; } +- case 10: unset_bit<4>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 11; break; } +- case 11: unset_bit<0>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 12; break; } +- case 12: unset_bit<7>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 13; break; } +- case 13: unset_bit<3>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 14; break; } +- case 14: unset_bit<2>(s); s += prime * 6 + 1; +- if (s >= sieve_end) { wheel.index = 15; break; } +- case 15: unset_bit<6>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 6 < sieve_end) +- { +- unset_bit<1>(s + prime * 0 + 0); +- unset_bit<5>(s + prime * 6 + 1); +- unset_bit<4>(s + prime * 10 + 2); +- unset_bit<0>(s + prime * 12 + 3); +- unset_bit<7>(s + prime * 16 + 3); +- unset_bit<3>(s + prime * 18 + 4); +- unset_bit<2>(s + prime * 22 + 5); +- unset_bit<6>(s + prime * 28 + 6); +- s += prime * 30 + 7; +- } ++ unset_bit<1>(s + prime * 0 + 0); ++ unset_bit<5>(s + prime * 6 + 1); ++ unset_bit<4>(s + prime * 10 + 2); ++ unset_bit<0>(s + prime * 12 + 3); ++ unset_bit<7>(s + prime * 16 + 3); ++ unset_bit<3>(s + prime * 18 + 4); ++ unset_bit<2>(s + prime * 22 + 5); ++ unset_bit<6>(s + prime * 28 + 6); ++ s += prime * 30 + 7; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 16: if (s >= sieve_end) { wheel.index = 16; break; } ++ unset_bit<2>(s); s += prime * 6 + 2; ++ case 17: if (s >= sieve_end) { wheel.index = 17; break; } ++ unset_bit<4>(s); s += prime * 4 + 2; ++ case 18: if (s >= sieve_end) { wheel.index = 18; break; } ++ unset_bit<0>(s); s += prime * 2 + 0; ++ case 19: if (s >= sieve_end) { wheel.index = 19; break; } ++ unset_bit<6>(s); s += prime * 4 + 2; ++ case 20: if (s >= sieve_end) { wheel.index = 20; break; } ++ unset_bit<1>(s); s += prime * 2 + 0; ++ case 21: if (s >= sieve_end) { wheel.index = 21; break; } ++ unset_bit<7>(s); s += prime * 4 + 2; ++ case 22: if (s >= sieve_end) { wheel.index = 22; break; } ++ unset_bit<3>(s); s += prime * 6 + 2; ++ case 23: if (s >= sieve_end) { wheel.index = 23; break; } ++ unset_bit<5>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 10 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 16; break; } +- case 16: unset_bit<2>(s); s += prime * 6 + 2; +- if (s >= sieve_end) { wheel.index = 17; break; } +- case 17: unset_bit<4>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 18; break; } +- case 18: unset_bit<0>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 19; break; } +- case 19: unset_bit<6>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 20; break; } +- case 20: unset_bit<1>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 21; break; } +- case 21: unset_bit<7>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 22; break; } +- case 22: unset_bit<3>(s); s += prime * 6 + 2; +- if (s >= sieve_end) { wheel.index = 23; break; } +- case 23: unset_bit<5>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 10 < sieve_end) +- { +- unset_bit<2>(s + prime * 0 + 0); +- unset_bit<4>(s + prime * 6 + 2); +- unset_bit<0>(s + prime * 10 + 4); +- unset_bit<6>(s + prime * 12 + 4); +- unset_bit<1>(s + prime * 16 + 6); +- unset_bit<7>(s + prime * 18 + 6); +- unset_bit<3>(s + prime * 22 + 8); +- unset_bit<5>(s + prime * 28 + 10); +- s += prime * 30 + 11; +- } ++ unset_bit<2>(s + prime * 0 + 0); ++ unset_bit<4>(s + prime * 6 + 2); ++ unset_bit<0>(s + prime * 10 + 4); ++ unset_bit<6>(s + prime * 12 + 4); ++ unset_bit<1>(s + prime * 16 + 6); ++ unset_bit<7>(s + prime * 18 + 6); ++ unset_bit<3>(s + prime * 22 + 8); ++ unset_bit<5>(s + prime * 28 + 10); ++ s += prime * 30 + 11; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 24: if (s >= sieve_end) { wheel.index = 24; break; } ++ unset_bit<3>(s); s += prime * 6 + 3; ++ case 25: if (s >= sieve_end) { wheel.index = 25; break; } ++ unset_bit<0>(s); s += prime * 4 + 1; ++ case 26: if (s >= sieve_end) { wheel.index = 26; break; } ++ unset_bit<6>(s); s += prime * 2 + 1; ++ case 27: if (s >= sieve_end) { wheel.index = 27; break; } ++ unset_bit<5>(s); s += prime * 4 + 2; ++ case 28: if (s >= sieve_end) { wheel.index = 28; break; } ++ unset_bit<2>(s); s += prime * 2 + 1; ++ case 29: if (s >= sieve_end) { wheel.index = 29; break; } ++ unset_bit<1>(s); s += prime * 4 + 1; ++ case 30: if (s >= sieve_end) { wheel.index = 30; break; } ++ unset_bit<7>(s); s += prime * 6 + 3; ++ case 31: if (s >= sieve_end) { wheel.index = 31; break; } ++ unset_bit<4>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 12 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 24; break; } +- case 24: unset_bit<3>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 25; break; } +- case 25: unset_bit<0>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 26; break; } +- case 26: unset_bit<6>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 27; break; } +- case 27: unset_bit<5>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 28; break; } +- case 28: unset_bit<2>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 29; break; } +- case 29: unset_bit<1>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 30; break; } +- case 30: unset_bit<7>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 31; break; } +- case 31: unset_bit<4>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 12 < sieve_end) +- { +- unset_bit<3>(s + prime * 0 + 0); +- unset_bit<0>(s + prime * 6 + 3); +- unset_bit<6>(s + prime * 10 + 4); +- unset_bit<5>(s + prime * 12 + 5); +- unset_bit<2>(s + prime * 16 + 7); +- unset_bit<1>(s + prime * 18 + 8); +- unset_bit<7>(s + prime * 22 + 9); +- unset_bit<4>(s + prime * 28 + 12); +- s += prime * 30 + 13; +- } ++ unset_bit<3>(s + prime * 0 + 0); ++ unset_bit<0>(s + prime * 6 + 3); ++ unset_bit<6>(s + prime * 10 + 4); ++ unset_bit<5>(s + prime * 12 + 5); ++ unset_bit<2>(s + prime * 16 + 7); ++ unset_bit<1>(s + prime * 18 + 8); ++ unset_bit<7>(s + prime * 22 + 9); ++ unset_bit<4>(s + prime * 28 + 12); ++ s += prime * 30 + 13; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 32: if (s >= sieve_end) { wheel.index = 32; break; } ++ unset_bit<4>(s); s += prime * 6 + 3; ++ case 33: if (s >= sieve_end) { wheel.index = 33; break; } ++ unset_bit<7>(s); s += prime * 4 + 3; ++ case 34: if (s >= sieve_end) { wheel.index = 34; break; } ++ unset_bit<1>(s); s += prime * 2 + 1; ++ case 35: if (s >= sieve_end) { wheel.index = 35; break; } ++ unset_bit<2>(s); s += prime * 4 + 2; ++ case 36: if (s >= sieve_end) { wheel.index = 36; break; } ++ unset_bit<5>(s); s += prime * 2 + 1; ++ case 37: if (s >= sieve_end) { wheel.index = 37; break; } ++ unset_bit<6>(s); s += prime * 4 + 3; ++ case 38: if (s >= sieve_end) { wheel.index = 38; break; } ++ unset_bit<0>(s); s += prime * 6 + 3; ++ case 39: if (s >= sieve_end) { wheel.index = 39; break; } ++ unset_bit<3>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 16 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 32; break; } +- case 32: unset_bit<4>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 33; break; } +- case 33: unset_bit<7>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 34; break; } +- case 34: unset_bit<1>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 35; break; } +- case 35: unset_bit<2>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 36; break; } +- case 36: unset_bit<5>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 37; break; } +- case 37: unset_bit<6>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 38; break; } +- case 38: unset_bit<0>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 39; break; } +- case 39: unset_bit<3>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 16 < sieve_end) +- { +- unset_bit<4>(s + prime * 0 + 0); +- unset_bit<7>(s + prime * 6 + 3); +- unset_bit<1>(s + prime * 10 + 6); +- unset_bit<2>(s + prime * 12 + 7); +- unset_bit<5>(s + prime * 16 + 9); +- unset_bit<6>(s + prime * 18 + 10); +- unset_bit<0>(s + prime * 22 + 13); +- unset_bit<3>(s + prime * 28 + 16); +- s += prime * 30 + 17; +- } ++ unset_bit<4>(s + prime * 0 + 0); ++ unset_bit<7>(s + prime * 6 + 3); ++ unset_bit<1>(s + prime * 10 + 6); ++ unset_bit<2>(s + prime * 12 + 7); ++ unset_bit<5>(s + prime * 16 + 9); ++ unset_bit<6>(s + prime * 18 + 10); ++ unset_bit<0>(s + prime * 22 + 13); ++ unset_bit<3>(s + prime * 28 + 16); ++ s += prime * 30 + 17; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 40: if (s >= sieve_end) { wheel.index = 40; break; } ++ unset_bit<5>(s); s += prime * 6 + 4; ++ case 41: if (s >= sieve_end) { wheel.index = 41; break; } ++ unset_bit<3>(s); s += prime * 4 + 2; ++ case 42: if (s >= sieve_end) { wheel.index = 42; break; } ++ unset_bit<7>(s); s += prime * 2 + 2; ++ case 43: if (s >= sieve_end) { wheel.index = 43; break; } ++ unset_bit<1>(s); s += prime * 4 + 2; ++ case 44: if (s >= sieve_end) { wheel.index = 44; break; } ++ unset_bit<6>(s); s += prime * 2 + 2; ++ case 45: if (s >= sieve_end) { wheel.index = 45; break; } ++ unset_bit<0>(s); s += prime * 4 + 2; ++ case 46: if (s >= sieve_end) { wheel.index = 46; break; } ++ unset_bit<4>(s); s += prime * 6 + 4; ++ case 47: if (s >= sieve_end) { wheel.index = 47; break; } ++ unset_bit<2>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 18 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 40; break; } +- case 40: unset_bit<5>(s); s += prime * 6 + 4; +- if (s >= sieve_end) { wheel.index = 41; break; } +- case 41: unset_bit<3>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 42; break; } +- case 42: unset_bit<7>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 43; break; } +- case 43: unset_bit<1>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 44; break; } +- case 44: unset_bit<6>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 45; break; } +- case 45: unset_bit<0>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 46; break; } +- case 46: unset_bit<4>(s); s += prime * 6 + 4; +- if (s >= sieve_end) { wheel.index = 47; break; } +- case 47: unset_bit<2>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 18 < sieve_end) +- { +- unset_bit<5>(s + prime * 0 + 0); +- unset_bit<3>(s + prime * 6 + 4); +- unset_bit<7>(s + prime * 10 + 6); +- unset_bit<1>(s + prime * 12 + 8); +- unset_bit<6>(s + prime * 16 + 10); +- unset_bit<0>(s + prime * 18 + 12); +- unset_bit<4>(s + prime * 22 + 14); +- unset_bit<2>(s + prime * 28 + 18); +- s += prime * 30 + 19; +- } ++ unset_bit<5>(s + prime * 0 + 0); ++ unset_bit<3>(s + prime * 6 + 4); ++ unset_bit<7>(s + prime * 10 + 6); ++ unset_bit<1>(s + prime * 12 + 8); ++ unset_bit<6>(s + prime * 16 + 10); ++ unset_bit<0>(s + prime * 18 + 12); ++ unset_bit<4>(s + prime * 22 + 14); ++ unset_bit<2>(s + prime * 28 + 18); ++ s += prime * 30 + 19; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 48: if (s >= sieve_end) { wheel.index = 48; break; } ++ unset_bit<6>(s); s += prime * 6 + 5; ++ case 49: if (s >= sieve_end) { wheel.index = 49; break; } ++ unset_bit<2>(s); s += prime * 4 + 3; ++ case 50: if (s >= sieve_end) { wheel.index = 50; break; } ++ unset_bit<3>(s); s += prime * 2 + 1; ++ case 51: if (s >= sieve_end) { wheel.index = 51; break; } ++ unset_bit<7>(s); s += prime * 4 + 4; ++ case 52: if (s >= sieve_end) { wheel.index = 52; break; } ++ unset_bit<0>(s); s += prime * 2 + 1; ++ case 53: if (s >= sieve_end) { wheel.index = 53; break; } ++ unset_bit<4>(s); s += prime * 4 + 3; ++ case 54: if (s >= sieve_end) { wheel.index = 54; break; } ++ unset_bit<5>(s); s += prime * 6 + 5; ++ case 55: if (s >= sieve_end) { wheel.index = 55; break; } ++ unset_bit<1>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 22 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 48; break; } +- case 48: unset_bit<6>(s); s += prime * 6 + 5; +- if (s >= sieve_end) { wheel.index = 49; break; } +- case 49: unset_bit<2>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 50; break; } +- case 50: unset_bit<3>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 51; break; } +- case 51: unset_bit<7>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 52; break; } +- case 52: unset_bit<0>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 53; break; } +- case 53: unset_bit<4>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 54; break; } +- case 54: unset_bit<5>(s); s += prime * 6 + 5; +- if (s >= sieve_end) { wheel.index = 55; break; } +- case 55: unset_bit<1>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 22 < sieve_end) +- { +- unset_bit<6>(s + prime * 0 + 0); +- unset_bit<2>(s + prime * 6 + 5); +- unset_bit<3>(s + prime * 10 + 8); +- unset_bit<7>(s + prime * 12 + 9); +- unset_bit<0>(s + prime * 16 + 13); +- unset_bit<4>(s + prime * 18 + 14); +- unset_bit<5>(s + prime * 22 + 17); +- unset_bit<1>(s + prime * 28 + 22); +- s += prime * 30 + 23; +- } ++ unset_bit<6>(s + prime * 0 + 0); ++ unset_bit<2>(s + prime * 6 + 5); ++ unset_bit<3>(s + prime * 10 + 8); ++ unset_bit<7>(s + prime * 12 + 9); ++ unset_bit<0>(s + prime * 16 + 13); ++ unset_bit<4>(s + prime * 18 + 14); ++ unset_bit<5>(s + prime * 22 + 17); ++ unset_bit<1>(s + prime * 28 + 22); ++ s += prime * 30 + 23; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 56: if (s >= sieve_end) { wheel.index = 56; break; } ++ unset_bit<7>(s); s += prime * 6 + 6; ++ case 57: if (s >= sieve_end) { wheel.index = 57; break; } ++ unset_bit<6>(s); s += prime * 4 + 4; ++ case 58: if (s >= sieve_end) { wheel.index = 58; break; } ++ unset_bit<5>(s); s += prime * 2 + 2; ++ case 59: if (s >= sieve_end) { wheel.index = 59; break; } ++ unset_bit<4>(s); s += prime * 4 + 4; ++ case 60: if (s >= sieve_end) { wheel.index = 60; break; } ++ unset_bit<3>(s); s += prime * 2 + 2; ++ case 61: if (s >= sieve_end) { wheel.index = 61; break; } ++ unset_bit<2>(s); s += prime * 4 + 4; ++ case 62: if (s >= sieve_end) { wheel.index = 62; break; } ++ unset_bit<1>(s); s += prime * 6 + 6; ++ case 63: if (s >= sieve_end) { wheel.index = 63; break; } ++ unset_bit<0>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 28 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 56; break; } +- case 56: unset_bit<7>(s); s += prime * 6 + 6; +- if (s >= sieve_end) { wheel.index = 57; break; } +- case 57: unset_bit<6>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 58; break; } +- case 58: unset_bit<5>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 59; break; } +- case 59: unset_bit<4>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 60; break; } +- case 60: unset_bit<3>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 61; break; } +- case 61: unset_bit<2>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 62; break; } +- case 62: unset_bit<1>(s); s += prime * 6 + 6; +- if (s >= sieve_end) { wheel.index = 63; break; } +- case 63: unset_bit<0>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 28 < sieve_end) +- { +- unset_bit<7>(s + prime * 0 + 0); +- unset_bit<6>(s + prime * 6 + 6); +- unset_bit<5>(s + prime * 10 + 10); +- unset_bit<4>(s + prime * 12 + 12); +- unset_bit<3>(s + prime * 16 + 16); +- unset_bit<2>(s + prime * 18 + 18); +- unset_bit<1>(s + prime * 22 + 22); +- unset_bit<0>(s + prime * 28 + 28); +- s += prime * 30 + 29; +- } ++ unset_bit<7>(s + prime * 0 + 0); ++ unset_bit<6>(s + prime * 6 + 6); ++ unset_bit<5>(s + prime * 10 + 10); ++ unset_bit<4>(s + prime * 12 + 12); ++ unset_bit<3>(s + prime * 16 + 16); ++ unset_bit<2>(s + prime * 18 + 18); ++ unset_bit<1>(s + prime * 22 + 22); ++ unset_bit<0>(s + prime * 28 + 28); ++ s += prime * 30 + 29; + } +- break; + } +- +- // update for the next segment +- wheel.multiple = (uint32_t) (s - sieve_end); ++ break; + } ++ ++ // update for the next segment ++ wheel.multiple = (uint32_t) (s - sieve_end); + } + + /// Remove the i-th prime and the multiples of the i-th +@@ -506,361 +499,354 @@ uint64_t Sieve::cross_off_count(uint64_t prime, uint64_t i) + add(prime); + + uint64_t cnt = 0; +- uint32_t sieve_size = (uint32_t) sieve_.size(); + Wheel& wheel = wheel_[i]; ++ // pointer to the byte with the 1st multiple ++ byte_t* s = sieve_ + wheel.multiple; ++ byte_t* sieve_end = sieve_ + sieve_size_; ++ prime /= 30; + +- if (wheel.multiple >= sieve_size) +- wheel.multiple -= sieve_size; +- else ++ switch (wheel.index) + { +- // pointer to the byte with the 1st multiple +- byte_t* s = &sieve_[wheel.multiple]; +- byte_t* sieve_end = &sieve_[sieve_size]; +- prime /= 30; +- +- switch (wheel.index) ++ for (;;) + { +- for (;;) ++ case 0: if (s >= sieve_end) { wheel.index = 0; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 6 + 0; ++ case 1: if (s >= sieve_end) { wheel.index = 1; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 0; ++ case 2: if (s >= sieve_end) { wheel.index = 2; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 0; ++ case 3: if (s >= sieve_end) { wheel.index = 3; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 0; ++ case 4: if (s >= sieve_end) { wheel.index = 4; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 0; ++ case 5: if (s >= sieve_end) { wheel.index = 5; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 0; ++ case 6: if (s >= sieve_end) { wheel.index = 6; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 6 + 0; ++ case 7: if (s >= sieve_end) { wheel.index = 7; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 0; break; } +- case 0: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 6 + 0; +- if (s >= sieve_end) { wheel.index = 1; break; } +- case 1: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 2; break; } +- case 2: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 3; break; } +- case 3: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 4; break; } +- case 4: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 5; break; } +- case 5: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 6; break; } +- case 6: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 6 + 0; +- if (s >= sieve_end) { wheel.index = 7; break; } +- case 7: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 < sieve_end) +- { +- cnt += is_bit<0>(s + prime * 0); +- unset_bit<0>(s + prime * 0); +- cnt += is_bit<1>(s + prime * 6); +- unset_bit<1>(s + prime * 6); +- cnt += is_bit<2>(s + prime * 10); +- unset_bit<2>(s + prime * 10); +- cnt += is_bit<3>(s + prime * 12); +- unset_bit<3>(s + prime * 12); +- cnt += is_bit<4>(s + prime * 16); +- unset_bit<4>(s + prime * 16); +- cnt += is_bit<5>(s + prime * 18); +- unset_bit<5>(s + prime * 18); +- cnt += is_bit<6>(s + prime * 22); +- unset_bit<6>(s + prime * 22); +- cnt += is_bit<7>(s + prime * 28); +- unset_bit<7>(s + prime * 28); +- s += prime * 30 + 1; +- } ++ cnt += is_bit<0>(s + prime * 0); ++ unset_bit<0>(s + prime * 0); ++ cnt += is_bit<1>(s + prime * 6); ++ unset_bit<1>(s + prime * 6); ++ cnt += is_bit<2>(s + prime * 10); ++ unset_bit<2>(s + prime * 10); ++ cnt += is_bit<3>(s + prime * 12); ++ unset_bit<3>(s + prime * 12); ++ cnt += is_bit<4>(s + prime * 16); ++ unset_bit<4>(s + prime * 16); ++ cnt += is_bit<5>(s + prime * 18); ++ unset_bit<5>(s + prime * 18); ++ cnt += is_bit<6>(s + prime * 22); ++ unset_bit<6>(s + prime * 22); ++ cnt += is_bit<7>(s + prime * 28); ++ unset_bit<7>(s + prime * 28); ++ s += prime * 30 + 1; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 8: if (s >= sieve_end) { wheel.index = 8; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 6 + 1; ++ case 9: if (s >= sieve_end) { wheel.index = 9; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 1; ++ case 10: if (s >= sieve_end) { wheel.index = 10; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 1; ++ case 11: if (s >= sieve_end) { wheel.index = 11; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 0; ++ case 12: if (s >= sieve_end) { wheel.index = 12; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 1; ++ case 13: if (s >= sieve_end) { wheel.index = 13; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 1; ++ case 14: if (s >= sieve_end) { wheel.index = 14; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 6 + 1; ++ case 15: if (s >= sieve_end) { wheel.index = 15; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 6 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 8; break; } +- case 8: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 6 + 1; +- if (s >= sieve_end) { wheel.index = 9; break; } +- case 9: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 10; break; } +- case 10: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 11; break; } +- case 11: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 0; +- if (s >= sieve_end) { wheel.index = 12; break; } +- case 12: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 13; break; } +- case 13: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 14; break; } +- case 14: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 6 + 1; +- if (s >= sieve_end) { wheel.index = 15; break; } +- case 15: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 6 < sieve_end) +- { +- cnt += is_bit<1>(s + prime * 0 + 0); +- unset_bit<1>(s + prime * 0 + 0); +- cnt += is_bit<5>(s + prime * 6 + 1); +- unset_bit<5>(s + prime * 6 + 1); +- cnt += is_bit<4>(s + prime * 10 + 2); +- unset_bit<4>(s + prime * 10 + 2); +- cnt += is_bit<0>(s + prime * 12 + 3); +- unset_bit<0>(s + prime * 12 + 3); +- cnt += is_bit<7>(s + prime * 16 + 3); +- unset_bit<7>(s + prime * 16 + 3); +- cnt += is_bit<3>(s + prime * 18 + 4); +- unset_bit<3>(s + prime * 18 + 4); +- cnt += is_bit<2>(s + prime * 22 + 5); +- unset_bit<2>(s + prime * 22 + 5); +- cnt += is_bit<6>(s + prime * 28 + 6); +- unset_bit<6>(s + prime * 28 + 6); +- s += prime * 30 + 7; +- } ++ cnt += is_bit<1>(s + prime * 0 + 0); ++ unset_bit<1>(s + prime * 0 + 0); ++ cnt += is_bit<5>(s + prime * 6 + 1); ++ unset_bit<5>(s + prime * 6 + 1); ++ cnt += is_bit<4>(s + prime * 10 + 2); ++ unset_bit<4>(s + prime * 10 + 2); ++ cnt += is_bit<0>(s + prime * 12 + 3); ++ unset_bit<0>(s + prime * 12 + 3); ++ cnt += is_bit<7>(s + prime * 16 + 3); ++ unset_bit<7>(s + prime * 16 + 3); ++ cnt += is_bit<3>(s + prime * 18 + 4); ++ unset_bit<3>(s + prime * 18 + 4); ++ cnt += is_bit<2>(s + prime * 22 + 5); ++ unset_bit<2>(s + prime * 22 + 5); ++ cnt += is_bit<6>(s + prime * 28 + 6); ++ unset_bit<6>(s + prime * 28 + 6); ++ s += prime * 30 + 7; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 16: if (s >= sieve_end) { wheel.index = 16; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 6 + 2; ++ case 17: if (s >= sieve_end) { wheel.index = 17; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 2; ++ case 18: if (s >= sieve_end) { wheel.index = 18; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 0; ++ case 19: if (s >= sieve_end) { wheel.index = 19; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 2; ++ case 20: if (s >= sieve_end) { wheel.index = 20; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 0; ++ case 21: if (s >= sieve_end) { wheel.index = 21; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 2; ++ case 22: if (s >= sieve_end) { wheel.index = 22; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 6 + 2; ++ case 23: if (s >= sieve_end) { wheel.index = 23; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 10 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 16; break; } +- case 16: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 6 + 2; +- if (s >= sieve_end) { wheel.index = 17; break; } +- case 17: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 18; break; } +- case 18: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 19; break; } +- case 19: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 20; break; } +- case 20: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 0; +- if (s >= sieve_end) { wheel.index = 21; break; } +- case 21: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 22; break; } +- case 22: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 6 + 2; +- if (s >= sieve_end) { wheel.index = 23; break; } +- case 23: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 10 < sieve_end) +- { +- cnt += is_bit<2>(s + prime * 0 + 0); +- unset_bit<2>(s + prime * 0 + 0); +- cnt += is_bit<4>(s + prime * 6 + 2); +- unset_bit<4>(s + prime * 6 + 2); +- cnt += is_bit<0>(s + prime * 10 + 4); +- unset_bit<0>(s + prime * 10 + 4); +- cnt += is_bit<6>(s + prime * 12 + 4); +- unset_bit<6>(s + prime * 12 + 4); +- cnt += is_bit<1>(s + prime * 16 + 6); +- unset_bit<1>(s + prime * 16 + 6); +- cnt += is_bit<7>(s + prime * 18 + 6); +- unset_bit<7>(s + prime * 18 + 6); +- cnt += is_bit<3>(s + prime * 22 + 8); +- unset_bit<3>(s + prime * 22 + 8); +- cnt += is_bit<5>(s + prime * 28 + 10); +- unset_bit<5>(s + prime * 28 + 10); +- s += prime * 30 + 11; +- } ++ cnt += is_bit<2>(s + prime * 0 + 0); ++ unset_bit<2>(s + prime * 0 + 0); ++ cnt += is_bit<4>(s + prime * 6 + 2); ++ unset_bit<4>(s + prime * 6 + 2); ++ cnt += is_bit<0>(s + prime * 10 + 4); ++ unset_bit<0>(s + prime * 10 + 4); ++ cnt += is_bit<6>(s + prime * 12 + 4); ++ unset_bit<6>(s + prime * 12 + 4); ++ cnt += is_bit<1>(s + prime * 16 + 6); ++ unset_bit<1>(s + prime * 16 + 6); ++ cnt += is_bit<7>(s + prime * 18 + 6); ++ unset_bit<7>(s + prime * 18 + 6); ++ cnt += is_bit<3>(s + prime * 22 + 8); ++ unset_bit<3>(s + prime * 22 + 8); ++ cnt += is_bit<5>(s + prime * 28 + 10); ++ unset_bit<5>(s + prime * 28 + 10); ++ s += prime * 30 + 11; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 24: if (s >= sieve_end) { wheel.index = 24; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 6 + 3; ++ case 25: if (s >= sieve_end) { wheel.index = 25; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 1; ++ case 26: if (s >= sieve_end) { wheel.index = 26; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 1; ++ case 27: if (s >= sieve_end) { wheel.index = 27; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 2; ++ case 28: if (s >= sieve_end) { wheel.index = 28; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 1; ++ case 29: if (s >= sieve_end) { wheel.index = 29; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 1; ++ case 30: if (s >= sieve_end) { wheel.index = 30; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 6 + 3; ++ case 31: if (s >= sieve_end) { wheel.index = 31; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 12 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 24; break; } +- case 24: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 25; break; } +- case 25: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 26; break; } +- case 26: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 27; break; } +- case 27: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 28; break; } +- case 28: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 29; break; } +- case 29: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 1; +- if (s >= sieve_end) { wheel.index = 30; break; } +- case 30: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 31; break; } +- case 31: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 12 < sieve_end) +- { +- cnt += is_bit<3>(s + prime * 0 + 0); +- unset_bit<3>(s + prime * 0 + 0); +- cnt += is_bit<0>(s + prime * 6 + 3); +- unset_bit<0>(s + prime * 6 + 3); +- cnt += is_bit<6>(s + prime * 10 + 4); +- unset_bit<6>(s + prime * 10 + 4); +- cnt += is_bit<5>(s + prime * 12 + 5); +- unset_bit<5>(s + prime * 12 + 5); +- cnt += is_bit<2>(s + prime * 16 + 7); +- unset_bit<2>(s + prime * 16 + 7); +- cnt += is_bit<1>(s + prime * 18 + 8); +- unset_bit<1>(s + prime * 18 + 8); +- cnt += is_bit<7>(s + prime * 22 + 9); +- unset_bit<7>(s + prime * 22 + 9); +- cnt += is_bit<4>(s + prime * 28 + 12); +- unset_bit<4>(s + prime * 28 + 12); +- s += prime * 30 + 13; +- } ++ cnt += is_bit<3>(s + prime * 0 + 0); ++ unset_bit<3>(s + prime * 0 + 0); ++ cnt += is_bit<0>(s + prime * 6 + 3); ++ unset_bit<0>(s + prime * 6 + 3); ++ cnt += is_bit<6>(s + prime * 10 + 4); ++ unset_bit<6>(s + prime * 10 + 4); ++ cnt += is_bit<5>(s + prime * 12 + 5); ++ unset_bit<5>(s + prime * 12 + 5); ++ cnt += is_bit<2>(s + prime * 16 + 7); ++ unset_bit<2>(s + prime * 16 + 7); ++ cnt += is_bit<1>(s + prime * 18 + 8); ++ unset_bit<1>(s + prime * 18 + 8); ++ cnt += is_bit<7>(s + prime * 22 + 9); ++ unset_bit<7>(s + prime * 22 + 9); ++ cnt += is_bit<4>(s + prime * 28 + 12); ++ unset_bit<4>(s + prime * 28 + 12); ++ s += prime * 30 + 13; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 32: if (s >= sieve_end) { wheel.index = 32; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 6 + 3; ++ case 33: if (s >= sieve_end) { wheel.index = 33; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 3; ++ case 34: if (s >= sieve_end) { wheel.index = 34; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 1; ++ case 35: if (s >= sieve_end) { wheel.index = 35; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 2; ++ case 36: if (s >= sieve_end) { wheel.index = 36; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 1; ++ case 37: if (s >= sieve_end) { wheel.index = 37; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 3; ++ case 38: if (s >= sieve_end) { wheel.index = 38; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 6 + 3; ++ case 39: if (s >= sieve_end) { wheel.index = 39; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 16 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 32; break; } +- case 32: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 33; break; } +- case 33: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 34; break; } +- case 34: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 35; break; } +- case 35: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 36; break; } +- case 36: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 37; break; } +- case 37: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 38; break; } +- case 38: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 6 + 3; +- if (s >= sieve_end) { wheel.index = 39; break; } +- case 39: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 16 < sieve_end) +- { +- cnt += is_bit<4>(s + prime * 0 + 0); +- unset_bit<4>(s + prime * 0 + 0); +- cnt += is_bit<7>(s + prime * 6 + 3); +- unset_bit<7>(s + prime * 6 + 3); +- cnt += is_bit<1>(s + prime * 10 + 6); +- unset_bit<1>(s + prime * 10 + 6); +- cnt += is_bit<2>(s + prime * 12 + 7); +- unset_bit<2>(s + prime * 12 + 7); +- cnt += is_bit<5>(s + prime * 16 + 9); +- unset_bit<5>(s + prime * 16 + 9); +- cnt += is_bit<6>(s + prime * 18 + 10); +- unset_bit<6>(s + prime * 18 + 10); +- cnt += is_bit<0>(s + prime * 22 + 13); +- unset_bit<0>(s + prime * 22 + 13); +- cnt += is_bit<3>(s + prime * 28 + 16); +- unset_bit<3>(s + prime * 28 + 16); +- s += prime * 30 + 17; +- } ++ cnt += is_bit<4>(s + prime * 0 + 0); ++ unset_bit<4>(s + prime * 0 + 0); ++ cnt += is_bit<7>(s + prime * 6 + 3); ++ unset_bit<7>(s + prime * 6 + 3); ++ cnt += is_bit<1>(s + prime * 10 + 6); ++ unset_bit<1>(s + prime * 10 + 6); ++ cnt += is_bit<2>(s + prime * 12 + 7); ++ unset_bit<2>(s + prime * 12 + 7); ++ cnt += is_bit<5>(s + prime * 16 + 9); ++ unset_bit<5>(s + prime * 16 + 9); ++ cnt += is_bit<6>(s + prime * 18 + 10); ++ unset_bit<6>(s + prime * 18 + 10); ++ cnt += is_bit<0>(s + prime * 22 + 13); ++ unset_bit<0>(s + prime * 22 + 13); ++ cnt += is_bit<3>(s + prime * 28 + 16); ++ unset_bit<3>(s + prime * 28 + 16); ++ s += prime * 30 + 17; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 40: if (s >= sieve_end) { wheel.index = 40; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 6 + 4; ++ case 41: if (s >= sieve_end) { wheel.index = 41; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 2; ++ case 42: if (s >= sieve_end) { wheel.index = 42; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 2; ++ case 43: if (s >= sieve_end) { wheel.index = 43; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 2; ++ case 44: if (s >= sieve_end) { wheel.index = 44; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 2; ++ case 45: if (s >= sieve_end) { wheel.index = 45; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 2; ++ case 46: if (s >= sieve_end) { wheel.index = 46; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 6 + 4; ++ case 47: if (s >= sieve_end) { wheel.index = 47; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 18 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 40; break; } +- case 40: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 6 + 4; +- if (s >= sieve_end) { wheel.index = 41; break; } +- case 41: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 42; break; } +- case 42: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 43; break; } +- case 43: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 44; break; } +- case 44: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 45; break; } +- case 45: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 4 + 2; +- if (s >= sieve_end) { wheel.index = 46; break; } +- case 46: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 6 + 4; +- if (s >= sieve_end) { wheel.index = 47; break; } +- case 47: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 18 < sieve_end) +- { +- cnt += is_bit<5>(s + prime * 0 + 0); +- unset_bit<5>(s + prime * 0 + 0); +- cnt += is_bit<3>(s + prime * 6 + 4); +- unset_bit<3>(s + prime * 6 + 4); +- cnt += is_bit<7>(s + prime * 10 + 6); +- unset_bit<7>(s + prime * 10 + 6); +- cnt += is_bit<1>(s + prime * 12 + 8); +- unset_bit<1>(s + prime * 12 + 8); +- cnt += is_bit<6>(s + prime * 16 + 10); +- unset_bit<6>(s + prime * 16 + 10); +- cnt += is_bit<0>(s + prime * 18 + 12); +- unset_bit<0>(s + prime * 18 + 12); +- cnt += is_bit<4>(s + prime * 22 + 14); +- unset_bit<4>(s + prime * 22 + 14); +- cnt += is_bit<2>(s + prime * 28 + 18); +- unset_bit<2>(s + prime * 28 + 18); +- s += prime * 30 + 19; +- } ++ cnt += is_bit<5>(s + prime * 0 + 0); ++ unset_bit<5>(s + prime * 0 + 0); ++ cnt += is_bit<3>(s + prime * 6 + 4); ++ unset_bit<3>(s + prime * 6 + 4); ++ cnt += is_bit<7>(s + prime * 10 + 6); ++ unset_bit<7>(s + prime * 10 + 6); ++ cnt += is_bit<1>(s + prime * 12 + 8); ++ unset_bit<1>(s + prime * 12 + 8); ++ cnt += is_bit<6>(s + prime * 16 + 10); ++ unset_bit<6>(s + prime * 16 + 10); ++ cnt += is_bit<0>(s + prime * 18 + 12); ++ unset_bit<0>(s + prime * 18 + 12); ++ cnt += is_bit<4>(s + prime * 22 + 14); ++ unset_bit<4>(s + prime * 22 + 14); ++ cnt += is_bit<2>(s + prime * 28 + 18); ++ unset_bit<2>(s + prime * 28 + 18); ++ s += prime * 30 + 19; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 48: if (s >= sieve_end) { wheel.index = 48; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 6 + 5; ++ case 49: if (s >= sieve_end) { wheel.index = 49; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 3; ++ case 50: if (s >= sieve_end) { wheel.index = 50; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 1; ++ case 51: if (s >= sieve_end) { wheel.index = 51; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 4; ++ case 52: if (s >= sieve_end) { wheel.index = 52; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 1; ++ case 53: if (s >= sieve_end) { wheel.index = 53; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 3; ++ case 54: if (s >= sieve_end) { wheel.index = 54; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 6 + 5; ++ case 55: if (s >= sieve_end) { wheel.index = 55; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 22 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 48; break; } +- case 48: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 6 + 5; +- if (s >= sieve_end) { wheel.index = 49; break; } +- case 49: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 50; break; } +- case 50: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 51; break; } +- case 51: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 52; break; } +- case 52: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 1; +- if (s >= sieve_end) { wheel.index = 53; break; } +- case 53: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 3; +- if (s >= sieve_end) { wheel.index = 54; break; } +- case 54: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 6 + 5; +- if (s >= sieve_end) { wheel.index = 55; break; } +- case 55: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 22 < sieve_end) +- { +- cnt += is_bit<6>(s + prime * 0 + 0); +- unset_bit<6>(s + prime * 0 + 0); +- cnt += is_bit<2>(s + prime * 6 + 5); +- unset_bit<2>(s + prime * 6 + 5); +- cnt += is_bit<3>(s + prime * 10 + 8); +- unset_bit<3>(s + prime * 10 + 8); +- cnt += is_bit<7>(s + prime * 12 + 9); +- unset_bit<7>(s + prime * 12 + 9); +- cnt += is_bit<0>(s + prime * 16 + 13); +- unset_bit<0>(s + prime * 16 + 13); +- cnt += is_bit<4>(s + prime * 18 + 14); +- unset_bit<4>(s + prime * 18 + 14); +- cnt += is_bit<5>(s + prime * 22 + 17); +- unset_bit<5>(s + prime * 22 + 17); +- cnt += is_bit<1>(s + prime * 28 + 22); +- unset_bit<1>(s + prime * 28 + 22); +- s += prime * 30 + 23; +- } ++ cnt += is_bit<6>(s + prime * 0 + 0); ++ unset_bit<6>(s + prime * 0 + 0); ++ cnt += is_bit<2>(s + prime * 6 + 5); ++ unset_bit<2>(s + prime * 6 + 5); ++ cnt += is_bit<3>(s + prime * 10 + 8); ++ unset_bit<3>(s + prime * 10 + 8); ++ cnt += is_bit<7>(s + prime * 12 + 9); ++ unset_bit<7>(s + prime * 12 + 9); ++ cnt += is_bit<0>(s + prime * 16 + 13); ++ unset_bit<0>(s + prime * 16 + 13); ++ cnt += is_bit<4>(s + prime * 18 + 14); ++ unset_bit<4>(s + prime * 18 + 14); ++ cnt += is_bit<5>(s + prime * 22 + 17); ++ unset_bit<5>(s + prime * 22 + 17); ++ cnt += is_bit<1>(s + prime * 28 + 22); ++ unset_bit<1>(s + prime * 28 + 22); ++ s += prime * 30 + 23; + } +- break; ++ } ++ break; + +- for (;;) ++ for (;;) ++ { ++ case 56: if (s >= sieve_end) { wheel.index = 56; break; } ++ cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 6 + 6; ++ case 57: if (s >= sieve_end) { wheel.index = 57; break; } ++ cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 4; ++ case 58: if (s >= sieve_end) { wheel.index = 58; break; } ++ cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 2; ++ case 59: if (s >= sieve_end) { wheel.index = 59; break; } ++ cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 4; ++ case 60: if (s >= sieve_end) { wheel.index = 60; break; } ++ cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 2; ++ case 61: if (s >= sieve_end) { wheel.index = 61; break; } ++ cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 4; ++ case 62: if (s >= sieve_end) { wheel.index = 62; break; } ++ cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 6 + 6; ++ case 63: if (s >= sieve_end) { wheel.index = 63; break; } ++ cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 1; ++ ++ while (s + prime * 28 + 28 < sieve_end) + { +- if (s >= sieve_end) { wheel.index = 56; break; } +- case 56: cnt += is_bit<7>(s); unset_bit<7>(s); s += prime * 6 + 6; +- if (s >= sieve_end) { wheel.index = 57; break; } +- case 57: cnt += is_bit<6>(s); unset_bit<6>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 58; break; } +- case 58: cnt += is_bit<5>(s); unset_bit<5>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 59; break; } +- case 59: cnt += is_bit<4>(s); unset_bit<4>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 60; break; } +- case 60: cnt += is_bit<3>(s); unset_bit<3>(s); s += prime * 2 + 2; +- if (s >= sieve_end) { wheel.index = 61; break; } +- case 61: cnt += is_bit<2>(s); unset_bit<2>(s); s += prime * 4 + 4; +- if (s >= sieve_end) { wheel.index = 62; break; } +- case 62: cnt += is_bit<1>(s); unset_bit<1>(s); s += prime * 6 + 6; +- if (s >= sieve_end) { wheel.index = 63; break; } +- case 63: cnt += is_bit<0>(s); unset_bit<0>(s); s += prime * 2 + 1; +- +- while (s + prime * 28 + 28 < sieve_end) +- { +- cnt += is_bit<7>(s + prime * 0 + 0); +- unset_bit<7>(s + prime * 0 + 0); +- cnt += is_bit<6>(s + prime * 6 + 6); +- unset_bit<6>(s + prime * 6 + 6); +- cnt += is_bit<5>(s + prime * 10 + 10); +- unset_bit<5>(s + prime * 10 + 10); +- cnt += is_bit<4>(s + prime * 12 + 12); +- unset_bit<4>(s + prime * 12 + 12); +- cnt += is_bit<3>(s + prime * 16 + 16); +- unset_bit<3>(s + prime * 16 + 16); +- cnt += is_bit<2>(s + prime * 18 + 18); +- unset_bit<2>(s + prime * 18 + 18); +- cnt += is_bit<1>(s + prime * 22 + 22); +- unset_bit<1>(s + prime * 22 + 22); +- cnt += is_bit<0>(s + prime * 28 + 28); +- unset_bit<0>(s + prime * 28 + 28); +- s += prime * 30 + 29; +- } ++ cnt += is_bit<7>(s + prime * 0 + 0); ++ unset_bit<7>(s + prime * 0 + 0); ++ cnt += is_bit<6>(s + prime * 6 + 6); ++ unset_bit<6>(s + prime * 6 + 6); ++ cnt += is_bit<5>(s + prime * 10 + 10); ++ unset_bit<5>(s + prime * 10 + 10); ++ cnt += is_bit<4>(s + prime * 12 + 12); ++ unset_bit<4>(s + prime * 12 + 12); ++ cnt += is_bit<3>(s + prime * 16 + 16); ++ unset_bit<3>(s + prime * 16 + 16); ++ cnt += is_bit<2>(s + prime * 18 + 18); ++ unset_bit<2>(s + prime * 18 + 18); ++ cnt += is_bit<1>(s + prime * 22 + 22); ++ unset_bit<1>(s + prime * 22 + 22); ++ cnt += is_bit<0>(s + prime * 28 + 28); ++ unset_bit<0>(s + prime * 28 + 28); ++ s += prime * 30 + 29; + } +- break; + } +- +- // update for the next segment +- wheel.multiple = (uint32_t) (s - sieve_end); ++ break; + } + ++ // update for the next segment ++ wheel.multiple = (uint32_t) (s - sieve_end); ++ + return cnt; + } + diff --git a/primecount.rpmlintrc b/primecount.rpmlintrc new file mode 100644 index 0000000..3445fb7 --- /dev/null +++ b/primecount.rpmlintrc @@ -0,0 +1,8 @@ +# THIS FILE SERVES FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON +# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_er… + +# Spelling errors +addFilter(r'spelling-error .* (amongst|balancer|combinatorial|counterclaim|parallelized)') + +# Missing documentation from subpackages +addFilter(r'^primecount-libs\.[^:]+: W: no-documentation') diff --git a/primecount.spec b/primecount.spec new file mode 100644 index 0000000..fb0bae0 --- /dev/null +++ b/primecount.spec @@ -0,0 +1,110 @@ +Name: primecount +Version: 5.1 +Release: 2%{?dist} +Summary: Fast prime counting function implementation + +License: BSD +URL: https://github.com/kimwalisch/%{name}/ +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# Fedora-only patch: unbundle primesieve +Patch0: %{name}-primesieve.patch +# Fix assertion failures due to reading off the end of a vector +# https://github.com/kimwalisch/primecount/pull/26 +Patch1: %{name}-vector.patch + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: help2man +BuildRequires: libdivide-devel +BuildRequires: primesieve-devel + +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description +Primecount is a command-line program and C++ library that counts the +primes below an integer x<=10**31 using highly optimized implementations +of the combinatorial prime counting algorithms. + +Primecount includes implementations of all important combinatorial prime +counting algorithms known up to this date all of which have been +parallelized using OpenMP. Primecount contains the first ever open +source implementations of the Deleglise-Rivat algorithm and Xavier +Gourdon's algorithm (that works). Primecount also features a novel load +balancer that is shared amongst all implementations and that scales up +to hundreds of CPU cores. Primecount has already been used to compute +several world records e.g. pi(10**27) +(http://www.mersenneforum.org/showthread.php?t=20473) and +nth_prime(10**24) (https://oeis.org/A006988). + +%package libs +Summary: C++ library for fast prime counting + +%description libs +This package contains a C++ library for counting primes below an +integer. See the primecount package for a command line interface. + +%package devel +Summary: Headers and library links for libprimecount +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: cmake-filesystem%{?_isa} + +%description devel +This package contains files necessary to develop applications that use +libprimecount. + +%prep +%autosetup -p1 + +# Unbundle libdivide +rm -f include/libdivide.h +ln -s %{_includedir}/libdivide.h include/libdivide.h + +# Ensure we do not use the bundled primesieve library +rm -fr lib + +# Do not add flags that change the architecture +sed -i '/(WITH_POPCNT)/,/^endif()$/d' CMakeLists.txt + +%build +%ifarch %{ix86} x86_64 +export CFLAGS="%{optflags} -DLIBDIVIDE_SSE2" +export CXXFLAGS="$CFLAGS" +%endif +mkdir build +cd build +%cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DBUILD_TESTS=ON .. +%make_build +cd - + +%install +cd build +%make_install +LD_LIBRARY_PATH=$PWD help2man -N -o primecount.1 ./primecount +mkdir -p %{buildroot}%{_mandir}/man1 +cp -p primecount.1 %{buildroot}%{_mandir}/man1 +cd - + +%check +make test + +%files +%doc README.md +%{_bindir}/primecount +%{_mandir}/man1/primecount.1* + +%files libs +%license COPYING +%{_libdir}/libprimecount.so.5* + +%files devel +%doc ChangeLog doc/*.pdf doc/*.md +%{_includedir}/primecount.hpp +%{_libdir}/libprimecount.so + +%changelog +* Fri Sep 20 2019 Jerry James <loganjerry(a)gmail.com> - 5.1-2 +- Add justifications in the patch files +- Generate a man page with help2man + +* Thu Sep 19 2019 Jerry James <loganjerry(a)gmail.com> - 5.1-1 +- Initial RPM diff --git a/sources b/sources new file mode 100644 index 0000000..5211000 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (primecount-5.1.tar.gz) = 64c4aa7a3071cc2ec01373160c0f57829a29f4021b60ada13abc05bc960da3628d48686a28e2b4490d64b7ce3c77b45804f8060205417f5e2b95a55c2cd10603

1 0

Architecture specific change in rpms/isdn4k-utils.git
by githook-noreply＠fedoraproject.org 25 Sep '19

25 Sep '19

The package rpms/isdn4k-utils.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/isdn4k-utils.git/commit/?id=bf62be3…. Change: -ExcludeArch: s390 s390x Thanks. Full change: ============ commit bf62be328c5aead6804b6a5f65eb0ca4600085ad Author: Than Ngo <than(a)redhat.com> Date: Wed Sep 25 13:37:10 2019 +0200 isdn4k-utils is retired because upstream is dead and isdn support is dropped in kernel-5.3 and later diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f8c9d38..0000000 --- a/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -ibod-1.4-src.tar.gz -isdn4k-utils-CVS-2003-09-23.tar.bz2 -kernel-header-2.4-1.tar.bz2 -libpcap-0.7.2.tar.gz -isdn4k-utils-CVS-2004-11-18.tar.bz2 -isdn-header-1.tar.bz2 -isdn4k-utils-CVS-2005-02-16.tar.bz2 -isdn4k-utils-CVS-2005-03-09.tar.bz2 -isdn4k-utils-CVS-2006-02-13.tar.bz2 -isdn4k-utils-ppp-2.4.4.tar.bz2 -isdn4k-utils-CVS-2006-07-20.tar.bz2 -isdn4k-utils-CVS-2009-10-20.tar.bz2 -isdn4k-utils-CVS-2009-10-20-patched.tar.bz2 -isdn4k-utils-CVS-2010-05-01-patched.tar.bz2 -/isdn4k-utils-3.27_20151118.tar.xz diff --git a/40-isdn.rules b/40-isdn.rules deleted file mode 100644 index 1a31cb6..0000000 --- a/40-isdn.rules +++ /dev/null @@ -1,4 +0,0 @@ -# do not edit this file, it will be overwritten on update - -SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", GROUP="dialout" -SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n" diff --git a/capi.service b/capi.service deleted file mode 100644 index 32d42f0..0000000 --- a/capi.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Capi services for passiv ISDN cards -After=syslog.target - -[Service] -ExecStart=/sbin/capiinit start -ExecStop=/sbin/capiinit stop - -[Install] -WantedBy=multi-user.target diff --git a/capi20.conf b/capi20.conf deleted file mode 100644 index c0ac223..0000000 --- a/capi20.conf +++ /dev/null @@ -1,18 +0,0 @@ -# libcapi20 features autodetection of connected CAPI -# devices. In case you need to select a special device -# use the remote configuration file: -# ~/.capi20rc -# if it doesn't exist look for -# /etc/capi20.conf -# -# To set the remote machine, the above file need to have -# the following line -# REMOTE <driver> <remote hostname|ip-address> <remote port> -# -# Drivers: -# * fritzbox - Remote CAPI via FRITZ!Box -# * rcapi - Melware Remote CAPI -# -# If this doesn't exist, the library tries the old, normal way -# of using the local /dev/isdn/capi20. -# REMOTE fritzbox 192.168.178.1 5031 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5b76589 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +isdn4k-utils is retired because upstream is dead and isdn support is dropped in kernel-5.3 and later diff --git a/isdn-manpages.patch b/isdn-manpages.patch deleted file mode 100644 index 5818f44..0000000 --- a/isdn-manpages.patch +++ /dev/null @@ -1,654 +0,0 @@ ---- isdn4k-utils/ipppd/ipppd.man.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/ipppd/ipppd.man.in 2013-11-23 13:31:33.804345614 +0100 -@@ -133,7 +133,7 @@ - .TP - .B callback \fI<string> - Request the peer to call back at the location given in --<string>. Ususally this is a phone number, but it may be interpreted -+<string>. Usually this is a phone number, but it may be interpreted - differently (or ignored) depending on the \fBcallback-type\fR option. - If <string> is the empty string, \fIipppd\fR automatically tries to - negotiate a callback type that does not need a location to be specified. -@@ -332,7 +332,7 @@ - .TP - .B ipx-routing \fI<n> - Set the routing protocol to be received by this option. Use a --comma-serperated list if you want to specify more than one -+comma-separated list if you want to specify more than one - protocol. - The '\fInone\fR' - option (0) may be specified as the only instance of ipx-routing. The -@@ -367,7 +367,7 @@ - send before it rejects the options. The default value is 3. - .TP - .B ipxcp-max-terminate \fI<n> --Set the maximum nuber of IPXCP terminate request frames before the -+Set the maximum number of IPXCP terminate request frames before the - local system considers that the peer is not listening to them. The - default value is 3. - .TP -@@ -562,7 +562,7 @@ - protocols must be loaded or this option will be ignored. - .TP - .B -pred1comp --Do not accept Predictor-1 comprssion, even if the peer wants to send -+Do not accept Predictor-1 compression, even if the peer wants to send - this type of compression and support has been defined in the kernel. - .TP - .B proxyarp ---- isdn4k-utils/avmb1/avmcapictrl.man.in.manpages 2013-11-23 13:31:33.803345638 +0100 -+++ isdn4k-utils/avmb1/avmcapictrl.man.in 2013-11-23 13:33:55.238895248 +0100 -@@ -73,7 +73,7 @@ - point to point - .br - .I DN1:SPID1 DN2:SPID2 --is for the american protocols 5ESS and NI1. -+is for the North American 5ESS and NI1 protocols. - .LP - .TP 5 - .B reset [contrnr] ---- isdn4k-utils/pppdcapiplugin/capiplugin.8.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/pppdcapiplugin/capiplugin.8 2013-11-23 13:36:27.374183518 +0100 -@@ -35,12 +35,12 @@ - In this case, the party called has to reject the call and call back soon. - When using dial-on-demand it is possible let both parties setup the connection, - that means while the pppd is in dial-on-demand mode not only an outgoing --paket but also an incoming call can trigger the connection setup. This -+packet but also an incoming call can trigger the connection setup. This - can also combined with callback to assign the cost to one side only (COSO). - - .SH PPPD VERSIONS - .LP --The plugin interface of the pppd is binary incompartible between different -+The plugin interface of the pppd is binary incompatible between different - version of the pppd. So you need a different capiplugin for every version - of the pppd. The different plugins will be in the directory - /usr/lib/ppp/\fI<pppd-version>\fR. -@@ -55,7 +55,7 @@ - set up a connection and sets the global variable devnam. - The capiplugin will register a timer function that is - called every second to handle the CAPI messages while pppd is running. --To notify pppd when CAPI messages arrive, the CAPI file desciptor -+To notify pppd when CAPI messages arrive, the CAPI file descriptor - is added to the list of file descriptors which the pppd monitors for input. - Once the connection is set up the pppd will start PPP negotiation - on device devnam. When the pppd enters the DEAD phase, the connection will -@@ -63,7 +63,7 @@ - When operating in dial-on-demand mode with wakeup on incoming calls, - in phase DORMANT the plugin will setup CAPI2.0 to accept incoming calls. - To wakeup pppd when an incoming call arrives, the plugin will generate --an UDP paket to the discard port (9) of the gateway, so don't filter this paket -+an UDP packet to the discard port (9) of the gateway, so don't filter this packet - or wakeup by incoming a call will not work. - - .SH MODES OF OPERATION -@@ -258,7 +258,7 @@ - - .TP - .B clicb --The option is retained for compartiblity reasons only. -+The option is retained for compatibility reasons only. - Use option \fIcoso local\fR or \fIcoso remote\fR instead. - .br - Enable callback mode. -@@ -273,7 +273,7 @@ - before PPP negotiation starts. Default value is 0 seconds. - This option is useful when connecting with protocol \fImodem\fR. - Some Internet access servers will hang up if they receive data --immediatly after the connection is established. -+immediately after the connection is established. - - .TP - .B controller \fI<controller specification> -@@ -298,7 +298,7 @@ - .TP - .B coso remote - The costs are assigned to the remote party. --On an outcoming call the remote party will reject the call and callback. -+On an outgoing call the remote party will reject the call and callback. - - .TP - .B dialmax \fI<times> -@@ -572,10 +572,10 @@ - .LP - Do not provide option \fIcli\fR to the capiplugin. - Start a pppd for every b channel. --Authorization is checked using PAP or CHAP and the ip numbers are assigned -+Authorization is checked using PAP or CHAP and the IP addresses are assigned - according to the /etc/ppp/pap-secrets or /etc/ppp/chap-secrets file. --Assume that the server has ip number 192.168.0.1, the clients are --to be assigned the ip numbers starting from 192.168.0.2, and the hostname of the -+Assume that the server has IP address 192.168.0.1, the clients are -+to be assigned IP addresses starting from 192.168.0.2, and the hostname of the - server is "dialinserver". - Add these two lines to the /etc/inittab file: - .IP -@@ -610,8 +610,8 @@ - \fIinmsn\fR, \fIcli\fR and \fIprotocol\fI. - .LP - Start a pppd for every client. --Assume that the server has ip number 192.168.0.1 and the clients are to be --assigned the ip numbers starting from 192.168.0.2. -+Assume that the server has IP address 192.168.0.1 and the clients are to be -+assigned IP addresses starting from 192.168.0.2. - Add these three lines to the /etc/inittab file: - .IP - p0:23:respawn:/usr/sbin/pppd call incoming-cli cli 04711 192.168.0.1:192.168.0.2 -@@ -641,8 +641,8 @@ - and call back. - .LP - Start a pppd for every client. --Assume that the server has ip number 192.168.0.1 and the clients are to be --assigned the ip numbers starting from 192.168.0.2. -+Assume that the server has IP address 192.168.0.1 and the clients are to be -+assigned IP addresses starting from 192.168.0.2. - Add these three lines to the /etc/inittab file. - .IP - p0:23:respawn:/usr/sbin/pppd call incoming-cli cli 04711 cbnumber 4711 192.168.0.1:192.168.0.2 -@@ -666,8 +666,8 @@ - - .SH EXAMPLE OF A LEASED LINE CONNECTION WITH HDLC - .LP --Assume that the server has ip number 192.168.0.1 and the peer has --the ip number 192.168.0.2. -+Assume that the server has IP address 192.168.0.1 and the peer has -+the IP address 192.168.0.2. - Add this line to the /etc/inittab file: - .IP - p0:23:respawn:/usr/sbin/pppd call leased-hdlc controller 1 channels 1 192.168.0.1:192.168.0.2 -@@ -699,8 +699,8 @@ - - .SH EXAMPLE OF A LEASED LINE CONNECTION WITH V42BIS - .LP --Assume that the server has ip number 192.168.0.1 and the peer has --the ip number 192.168.0.2. -+Assume that the server has IP address 192.168.0.1 and the peer has -+the IP address 192.168.0.2. - Add this line to the /etc/inittab file for server 1 (192.168.0.1): - .IP - p0:23:respawn:/usr/sbin/pppd call leased-v42bis controller 1 channels 1 192.168.0.1:192.168.0.2 ---- isdn4k-utils/isdnctrl/isdnctrl.man.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnctrl/isdnctrl.man.in 2013-11-23 13:31:43.582106889 +0100 -@@ -39,17 +39,13 @@ - interface - .IR name " to the kernel. If " name - is omitted, the kernel will use --.BI eth X, --where --.I X --is an increasing number starting from 0. This is probably not useful with --.SM ISDN --so using a name like -+.BI ethX, -+where X is an increasing number starting from 0. This is not ideal so providing a name such as - .B isdn0 - (for raw ip interfaces) or - .B ippp0 - (for synchronous PPP interfaces) --is always recommended. -+is strongly recommended. - .TP - .BI delif " name " [force] - Removes the -@@ -66,7 +62,7 @@ - .B reset [force] - Removes all - .SM ISDN --interfaces from the kernel if it is possible. If the optional keyword -+interfaces from the kernel if possible. If the optional keyword - .B force - is appended, - .BR isdnctrl " executes" -@@ -74,9 +70,9 @@ - before removing an interface. - .TP - .BI ifdefaults " name " --resets the interface -+resets interface - .IR name --to some reasonable defaults. -+to reasonable defaults. - .TP - .BI dialmode " name " [ off | manual | auto ] - Sets the dial mode of the interface to one of: -@@ -85,7 +81,7 @@ - .B off - .br - no connection can be made; an existing connection is terminated immediately. --Incoming connections are also not possible. -+Also, incoming connections are not possible. - .LP - .B manual - .br -@@ -145,7 +141,7 @@ - .B isdnctrl addphone - repeatedly. If more than one number is set, these will be tried - one after another (the last added number is tried first, etc.). --When using a german SPV-type connection, -+When using a German SPV-type connection, - the number has to be prefixed by a capital S. - .TP - .BI addphone " name " in " num" -@@ -357,7 +353,7 @@ - .I encapsulation - is omitted, the current setting is printed. - .TP --.BI l2_prot " name " [ protocol ] -+.BI l2_prot " name " [protocol] - Set the layer-2 protocol for interface - .IR name . - Possible values for -@@ -368,7 +364,7 @@ - .I protocol - is omitted the current setting is printed. - .TP --.B l3_prot " name " [ protocol ] -+.B l3_prot " name " [protocol] - Set the layer-3 protocol for interface - .IR name . - At the moment only -@@ -385,7 +381,7 @@ - .I name - is - .BR all , --then all interfaces are listed. -+all interfaces are listed. - .TP - .BI status " name" - Show the connection status for interface ---- isdn4k-utils/isdnctrl/.isdnctrl_conf.man.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnctrl/.isdnctrl_conf.man.in 2013-11-23 13:31:43.582106889 +0100 -@@ -81,14 +81,14 @@ - CBDELAY = 5 - .TP 5 - .BI "DIALMAX = " num --Set the number of dial atempts to -+Set the number of dial attempts to - .IR num . - - .B Example: - DIALMAX = 1 - .TP 5 - .BI "HUPTIMEOUT = " seconds --Set the hanguptime to -+Set the hangup time to - .IR seconds . - - .B Example: -@@ -168,7 +168,7 @@ - .BI "PPPBIND = " num - Binds the current interface to the ippp device - .BI /dev/ippp X . --This works only for syncronous ppp. -+This works only for synchronous PPP. - The value must be a number. - - .B Example: ---- isdn4k-utils/isdnlog/isdnconf/isdnconf.1.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/isdnconf/isdnconf.1.in 2013-11-23 13:31:43.582106889 +0100 -@@ -25,10 +25,10 @@ - - You can use this program to build your own phonebook. These files are - used by many of the other ISDN utilities that use phone numbers, to --display a number symbolicly instead of as a plain number. -+display a number symbolically instead of as a plain number. - - .SH OPTIONS --Note: usage of the options -A and -D is dangerous! The -+Note: use of the options -A and -D is dangerous! The - complete structure of the file may be changed, and all comments are - removed! Make backups of your data files before trying these. - -@@ -37,7 +37,7 @@ - .TP 4 - .B \-A - Add a new entry, which is read from standard input. The following --values are asked for (here with examples): -+values are asked for (shown here with examples): - .RS - .nf - -@@ -54,7 +54,7 @@ - Time: 8-20 - Flags: (control-D here indicates end of flags) - --Alias: (control-D here indicated end of entries) -+Alias: (control-D here indicates end of entries) - - .fi - If you want another [Flags] entry, simply enter the data for another -@@ -64,7 +64,7 @@ - If you want to add another number, simply enter the data for the next - number at the Alias prompt. - --You can also pipe the data into this program; the input data then must -+You can also pipe the data into the program; the input data must - correspond to the prompts that the program gives! Note that you can - only add one number at a time then (there's no way of telling - .I isdnconf -@@ -93,7 +93,7 @@ - will display entries which match the data given. - - .B DATA OPTIONS: --(none applicable for -A) -+(not applicable for -A) - .TP 4 - .B \-n 'number' - number: match the given number. It can contain wildcards. ---- isdn4k-utils/isdnlog/tools/isdnrate.man.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/isdnrate.man 2013-11-23 13:31:43.583106864 +0100 -@@ -1,7 +1,7 @@ - .\" CHECKIN $Date: 2004/07/13 21:44:20 $ - .TH ISDNRATE 1 "@MANDATE@" -lt- - .SH NAME --isdnrate \- Print telefon rates and various info from rate\-files(5). -+isdnrate \- Print telephone rates and various info from rate\-files(5). - .SH SYNOPSIS - .BI "isdnrate \-b" best " \-d" day " \-f" from " \-h" hour " \-l" len - .B \-o -@@ -18,14 +18,14 @@ - .SH DESCRIPTION - The - .B isdnrate --program prints various information from rate\-files(5). It's main purpose --is the calculation of telefon rates from your location to an arbitrary -+program prints various information from rate\-files(5). Its main purpose -+is the calculation of telephone rates from your location to an arbitrary - destination at a certain time and of a certain length for all the providers in a rate\-file. - .P - .SS - .B NUMBER - .P --A telefon number may be -+A telephone number may be - .IP - .B 1234 - a local area number -@@ -51,7 +51,7 @@ - .B -s - is also given). - .P --Note that currently only city names in AT, DE, NL are supported plus some international capitals. -+Note that currently only city names in AT, DE and NL are supported plus some international capitals. - .br - Note also, spaces in country- or service names may be given as underscores. - .SS -@@ -88,7 +88,7 @@ - Default is now. - .P - .BI \-f from --Callers location. Default ist from -+Callers location. Default is from - .IR isdn.conf . - .P - .BI \-h hour -@@ -102,7 +102,7 @@ - .IR isdn.conf . - .P - .BI \-l len --Length of call in second. Default value is 153 secs. -+Length of call in seconds. Default is 153 seconds. - .P - .B \-o - Show only booked providers. These are providers, which are listed in -@@ -118,8 +118,8 @@ - for business providers. - .P - \fB\-r\fPv\fINN\fP --Show only providers whose vbn begins with \fINN\fP. --The vbn is also known as provider prefix consisting of VBN and provider number. -+Show only providers whose VBN begins with \fINN\fP. -+The VBN is also known as provider prefix consisting of VBN and provider number. - .P - .B \-s - Consider -@@ -141,7 +141,7 @@ - .B DISPLAY AND RUN OPTIONS - .P - .B \-C --Connect to a running isdnrate daemon. This avoids long startup times. -+Connect to a running isdnrate daemon. This avoids long start-up times. - .P - .B \-D - Start as a daemon, waiting for connections from a client. The socket -@@ -231,8 +231,8 @@ - .br - shows the rate for provider 1 and the cheapest rate to this service. - .P --Note: Various output options may not be used together. If you gave conflicting --options you'll see a warning. -+Note: Various output options may not be used together. Conflicting -+options will produce a warning. - .br - Note also: Sort by name or providernumber and - .BI -b best -@@ -242,7 +242,7 @@ - .br - And finally: Some options like - .IR \-X50 ", " \-X51 ", " \-X52 ", " \-D ", " \-V --don't require a telefon -+don't require a telephone - .IR NUMBER . - .SH FILES - .IR rate-CC.dat , -@@ -280,7 +280,9 @@ - .I isdnrate -CX -p1_2,24 +1 - .br - Show rates and zones for destination USA for providers --.IR "1_2 " and " 24" . -+.IR "1, 2" -+and -+.IR "24" . - .P - .I isdnrate -C -l60 -rv010 HAM - .br -@@ -302,7 +304,7 @@ - .br - Show rates and numbers for service - .I Internet --for a 1 minutes call. -+for a 1 minute call. - .P - .I isdnrate -CZ 19430 - .br ---- isdn4k-utils/isdnlog/isdnlog/isdn.conf.5.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/isdnlog/isdn.conf.5.in 2013-11-23 13:31:43.582106889 +0100 -@@ -124,7 +124,7 @@ - - .TP - .B REBOOTCMD --Isdnlog can use this command to reboot linux (when all else fails). -+Isdnlog can use this command to reboot Linux (when all else fails). - Default value is "@REBOOTCMD@". Optional. - - .TP ---- isdn4k-utils/isdnlog/isdnlog/isdnlog.8.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/isdnlog/isdnlog.8.in 2013-11-23 13:31:43.583106864 +0100 -@@ -107,7 +107,7 @@ - - .TP - .B \-i\fIx\fB internS0="value" --Telefon number shorter then -+Telephone numbers shorter then - .I value - are considered to be internal numbers on your PABX. - -@@ -425,7 +425,7 @@ - This needs a kernel patch to work. If the kernel patch is not found - a simulation is done. - .br --Note: depending on your telefon provider local area calls may or may not -+Note: depending on your telephone provider local area calls may or may not - be routed to alternate providers. - For changing the ISP a script is called. s. next option 'providerchange' - ---- isdn4k-utils/isdnlog/isdnrep/isdnrep.1.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/isdnrep/isdnrep.1.in 2013-11-23 13:31:43.583106864 +0100 -@@ -4,7 +4,7 @@ - - .PD 0 - .SH NAME --isdnrep \- report isdn activity -+isdnrep \- report ISDN activity - - .SH DESCRIPTION - Isdnrep reads the isdnlog log files, generates reports, does statistics, -@@ -95,12 +95,12 @@ - - .TP - .B \-v verbose --Display warnings on startup. -+Display warnings on start-up. - - .TP - .B \-c ignore default options - Do not append the "REPOPTIONS" setting from @I4LCONFDIR@/@CONFFILE@ --to the commandline. -+to the command line. - - .TP - .B \-p [n][m]'number'[,[m]'number'...] phonenumber -@@ -171,13 +171,13 @@ - .RE - .sp - This will display all calls on Tuesdays, Wednesdays, or Thursdays --that are no holidays with a start time between 09:00 and 12:00 or -+that are not holidays with a start time between 09:00 and 12:00 or - 15:00 and 17:00. - - .TP - .B \-u unknown caller - At the end of the report, all numbers not aliased in callerid.conf or --~/.isdn are displayed. This option is not available when HTML output -+~/.isdn are displayed. This option is unavailable when HTML output - is requested. - - .TP -@@ -389,7 +389,7 @@ - and can be used with - .B -Fshort. - --Without showing the transfered bytes, this string also fits into 80 chars: -+Without showing the transferred bytes, this string also fits into 80 chars: - .sp - .RS - " %X %D %16.16H %T %-25.25F %U" -@@ -509,18 +509,18 @@ - .RE - .fi - --The package NAS (Network Audio System) may be needed. -+The NAS (Network Audio System) package may be needed. - - Now, when the browser is started, it will recognize WAV files and start --the corresponding program to handle these. The WAV format has been chosen --as this can also be played from a Windows pc. -+the corresponding program to handle them. The WAV format has been chosen -+as it can also be played from a Windows PC. - - - .cu - faxes received by mgetty - - When %G is used in the isdnrep output format, any faxes received by mgetty --will be accessible via a HTML link, in the same manner as the ansering -+will be accessible via a HTML link, in the same manner as the answering - machine messages. - - For the faxes the following entry in the [ISDNLOG] section in isdn.conf -@@ -594,7 +594,7 @@ - already installed if you want to use this feature :-) - - The advantage of the JPEG format is that it can also be displayed by --a browser running on a Windows pc. -+a browser running on a Windows PC. - - .cu - summary -@@ -674,7 +674,7 @@ - there was no connection, as the called party didn't pick up the phone - .TP - (5) --"the number you have dialled is not connected. Hang up and dial again. ..." -+"the number you have dialed is not connected. Hang up and dial again. ..." - .TP - (6) - total time for incoming calls ---- isdn4k-utils/doc/isdnctrl.man.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/doc/isdnctrl.man.in 2013-11-23 13:31:43.582106889 +0100 -@@ -48,10 +48,10 @@ - Create a slave interface. - .RS - Creates a slave interface for RAW-device channel-bundling. --These devices behave like network-interfaces, execpt they -+These devices behave like network-interfaces, except they - are invisible to user. Only - .SM ISDN --parameters can be controlled, but no IP-parameters. IP-parameters -+parameters can be controlled, not IP-parameters. IP-parameters - are inherited from the corresponding master-device. - .TP - Argument: -@@ -81,7 +81,7 @@ - .I arg - should point to a zero terminated string of max. 10 characters - naming an existing interface which will be deleted. If the interface --is a master interface, all it's slave-interfaces will be deleted also. -+is a master interface, all its slave-interfaces will be deleted also. - .TP - Return: - On success, the call returns 0. On failure, an error code is returned. -@@ -98,7 +98,7 @@ - .TP - Argument: - .I arg --shoud point to a -+should point to a - .I struct isdn_net_ioctl_cfg - (defined in linux/isdn.h) - .TP -@@ -117,7 +117,7 @@ - .TP - Argument: - .I arg --shoud point to a -+should point to a - .I struct isdn_net_ioctl_cfg - (defined in linux/isdn.h) which will be filled by the current setup. - .TP -@@ -135,7 +135,7 @@ - .TP - Argument: - .I arg --shoud point to a -+should point to a - .I struct isdn_net_ioctl_phone - which contains necessary information. - .TP -@@ -153,7 +153,7 @@ - .TP - Argument: - .I arg --shoud point to a -+should point to a - .I struct isdn_net_ioctl_phone - which contains necessary information. - .TP -@@ -172,7 +172,7 @@ - .TP - Argument: - .I arg --shoud point to a a union of -+should point to a union of - .I struct isdn_net_ioctl_phone - and a buffer, large enough to hold a concatenated list of - strings containing the phone numbers. -@@ -457,7 +457,7 @@ - filled correctly. The arg component inside isdn_ioctl_struct is - handed down to the driver's ioctl function. Its meaning is not - defined here and depends on the lowlevel driver. See documentation --for the various lewlevel drivers for information about driver- -+for the various lowlevel drivers for information about driver- - specific ioctl. - .TP - Return: diff --git a/isdn-nofirmware.patch b/isdn-nofirmware.patch deleted file mode 100644 index 0d35f8c..0000000 --- a/isdn-nofirmware.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- isdn4k-utils/icn/Makefile.in.nofw 2013-11-23 18:55:13.780774825 +0100 -+++ isdn4k-utils/icn/Makefile.in 2013-11-23 18:55:13.800774324 +0100 -@@ -49,9 +49,6 @@ - - install-data: - mkdir -p $(DESTDIR)$(DATADIR) -- $(INSTALL_DATA) firmware/loadpg.bin $(DESTDIR)$(DATADIR)/loadpg.bin -- $(INSTALL_DATA) firmware/pc_eu_ca.bin $(DESTDIR)$(DATADIR)/pc_eu_ca.bin -- $(INSTALL_DATA) firmware/pc_1t_ca.bin $(DESTDIR)$(DATADIR)/pc_1t_ca.bin - - install-man: $(PROGRAM).man - mkdir -p $(DESTDIR)$(MAN8DIR) ---- isdn4k-utils/hisax/Makefile.in.nofw 2013-11-23 18:58:57.654318661 +0100 -+++ isdn4k-utils/hisax/Makefile.in 2013-11-23 18:59:17.007847228 +0100 -@@ -44,8 +44,6 @@ - install: $(PROGRAMS) $(MANPAGES) - mkdir -p $(DESTDIR)$(SBINDIR) - $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(SBINDIR) -- mkdir -p $(DESTDIR)$(DATADIR) -- $(INSTALL_DATA) ISAR.BIN $(DESTDIR)$(DATADIR)/ISAR.BIN - mkdir -p $(DESTDIR)$(MAN8DIR) - $(INSTALL_MAN) $(MANPAGES) $(DESTDIR)$(MAN8DIR) - diff --git a/isdn.init b/isdn.init deleted file mode 100755 index 6ea2a69..0000000 --- a/isdn.init +++ /dev/null @@ -1,283 +0,0 @@ -#! /bin/bash -# -# chkconfig: 2345 9 91 -# description: start and stop ISDN services -# - -PATH=/bin:/sbin:/usr/bin:/usr/sbin - -# Check that we're a privileged user -[ `id -u` = 0 ] || exit 4 - -[ -x /sbin/isdnctrl ] || exit 5 - -# source function library -. /etc/init.d/functions - -test -f /etc/sysconfig/isdncard || exit 6 -. /etc/sysconfig/isdncard - -if [ -z "$MODULE" -o -z "$RESOURCES" ]; then - exit 6 -fi - -# disable debug as default -IBOD=no -RETVAL=0 -sync_devices=0 -raw_devices=0 -PCMCIA=no -COMPRESSION=7 - -# check PCMCIA -if [ "$RESOURCES" = "NONE" ] ; then - PCMCIA=yes -fi - -function isapnp() -{ - [ -f /proc/isapnp ] || return - [ -f /proc/bus/isapnp/devices ] || return - - found=0 - - eval $RESOURCES >/dev/null 2>&1 - if [ -z "$VENDOR_ID" -o -z "$DEVICE_ID" ] ; then - case "$type" in - 12) VENDOR_ID="ASU1690" # ASUS COM ISDNLink ISA PnP - DEVICE_ID="ASU1690" - ;; - 14) VENDOR_ID="TAG2610" # Teles 16.3c PnP - DEVICE_ID="TAG2610" - ;; - 7) VENDOR_ID="ELS0133" # Elsa Quickstep 1000 PnP - DEVICE_ID="ELS0133" - ;; - *) return - ;; - esac - fi - - # get isapnp infos - id_list="$(cat /proc/bus/isapnp/devices 2>/dev/null | while read dummy id dummy ; do echo $id ; done)" - for i in $id_list ; do - _vendor_id="$(echo $i | cut -b1-7)" - _device_id="$(echo $i | cut -b8-)" - if [ "$VENDOR_ID" = "$_vendor_id" -a "$DEVICE_ID" = "$_device_id" ] ; then - found=1 - break - fi - done - - [ "$found" = "1" ] || return - - card="card 0 $VENDOR_ID" - dev="dev 0 $DEVICE_ID" - [ -n "$io" ] && port0="port 0 $io" - [ -n "$io1" ] && port1="port 1 $io1" - [ -n "$io2" ] && port2="port 2 $io2" - [ -n "$irq" ] && irq="irq 0 $irq" - [ -n "$mem" ] && memory="memory 0 $mem" - - case "$1" in - activate) activate_isapnp ;; - deactivate) deactivate_isapnp ;; - *) return - esac -} - -function activate_isapnp() -{ - [ ! -f /var/lock/subsys/isapnp_isdn ] || return - - str='' - for i in "$card" "$dev" "$port0" "$port1" "$port2" "$memory" "$irq" ; do - [ -n "$i" ] || continue - str="$str$i\n" - done - - [ -n "$str" ] || return - - echo -e "${str}activate" >/proc/isapnp - touch /var/lock/subsys/isapnp_isdn -} - -function deactivate_isapnp() -{ - echo -e "$card\n$dev\ndeactivate" >/proc/isapnp - rm -f /var/lock/subsys/isapnp_isdn -} - -function load_modules() -{ - isdn_path="/lib/modules/$(uname -r)/kernel/drivers/isdn" - if [ -f $isdn_path/isdn_lzscomp.o -o -f $isdn_path/isdn_lzscomp.ko ] ; then - modprobe isdn_lzscomp comp=$COMPRESSION debug=0 > /dev/null 2>&1 - fi - - [ "$PCMCIA" = "no" ] || return - - modprobe $MODULE $RESOURCES > /dev/null 2>&1 - isdnctrl list all >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - action $"Loading ISDN modules" /bin/true - touch /var/lock/subsys/isdn - else - action $"Loading ISDN modules" /bin/false - modprobe -r $MODULE > /dev/null 2>&1 - fi -} - -function remove_modules() -{ - modprobe -r isdn_lzscomp >/dev/null 2>&1 - - # Unload hisax modules - [ "$PCMCIA" = "no" ] || return - - if lsmod | grep "^$MODULE" >/dev/null 2>&1 ; then - action $"Unloading ISDN modules" modprobe -r $MODULE - rm -f /var/lock/subsys/isdn - fi -} - -function load_firmware() -{ - # loading firmware - if [ -n "$FIRMWARE" ] ; then - $FIRMWARE >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - action $"Loading Firmware" /bin/true - else - action $"Loading Firmware" /bin/false - fi - fi -} - -function start_isdnlog() -{ - # don't start isdnlog, if the ISDN card requires the firmware - [ -z "$FIRMWARE" ] || return - prog="isdnlog" - if [ "$MODULE" = "hisax" ] ; then - driverid="HiSax" - elif [ "$MODULE" = "hisax_fcpcipnp" ] ; then - driverid="fcpcipnp0" - else - return - fi - - if ! hisaxctrl $driverid 1 0x3ff >/dev/null 2>&1 ; then - return - fi - if [ -f /etc/isdn/isdnlog.option ] ; then - daemon /sbin/isdnlog /dev/isdnctrl0 -D -f /etc/isdn/isdnlog.option - else - daemon /sbin/isdnlog /dev/isdnctrl0 -x0x3fff -M -w2 -S -D -s -O+/var/log/isdnctrl - fi - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - action $"Starting $prog" /bin/true - touch /var/lock/subsys/isdnlog - else - action $"Starting $prog" /bin/false - fi -} - -function stop_isdnlog() -{ - prog="isdnlog" - echo -n $"Shutting down $prog" - killproc isdnlog - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && /bin/rm -f /var/lock/subsys/isdnlog -} - -function makedev() -{ - if [ -x /sbin/MAKEDEV ] ; then - if ! /bin/ls /dev/isdn* /dev/ippp* >/dev/null 2>&1 ; then - /sbin/MAKEDEV isdn ippp capi - fi - fi -} - -function start() -{ - # workaround for kernel/udev (ISDN part) - makedev - - # activate ISA PnP - isapnp activate - - # load modules - load_modules - - # load firmware and setup isdn device driver - load_firmware - - # start isdn logging - start_isdnlog -} - -function stop() -{ - stop_isdnlog - remove_modules - isapnp deactivate -} - -function restart() -{ - stop - start -} - -function status() -{ - ifcfg_prefix="/etc/sysconfig/network-scripts/ifcfg-" - interfaces="$(cat /proc/net/dev 2>/dev/null | egrep "(ippp*|isdn*)" | cut -f1 -d:)" - if [ -z "$interfaces" ]; then - echo $"$0: Link is down" - return - fi - for i in $interfaces ;do - if [ -f $ifcfg_prefix$i ]; then - . $ifcfg_prefix$i - echo $"$NAME is attached to $DEVICE" - fi - done -} - -function condrestart() -{ - if [ -f /var/lock/subsys/isdn ] ; then - restart - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - condrestart) - condrestart - ;; - status) - status - ;; - *) - echo $"Usage: $0 {start|stop|restart|status|condrestart}" - RETVAL=3 -esac - -exit $RETVAL diff --git a/isdn.service b/isdn.service deleted file mode 100644 index 3442737..0000000 --- a/isdn.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=ISDN Services -Requires=syslog.target network.target - -[Service] -Type=oneshot -ExecStart=/usr/libexec/isdn start -ExecStop=/usr/libexec/isdn stop -Environment=BOOTUP=serial -Environment=CONSOLETYPE=serial -StandardError=syslog -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/isdn4k-fix-Werror-format-security-ftbfs.patch b/isdn4k-fix-Werror-format-security-ftbfs.patch deleted file mode 100644 index ce88205..0000000 --- a/isdn4k-fix-Werror-format-security-ftbfs.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/isdnlog/asn1_address.c 2006-01-15 10:08:55.000000000 -0500 -+++ isdn4k-utils-CVS-2010-05-01-patched.new/isdnlog/isdnlog/asn1_address.c 2014-01-28 16:59:10.588350961 -0500 -@@ -160,7 +160,7 @@ - XSEQUENCE_1(ParsePartyNumber, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, partyNumber); - XSEQUENCE_OPT_1(ParsePartySubaddress, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, partySubaddress); - -- str += sprintf(str, partyNumber); -+ str += sprintf(str, "%s", partyNumber); - if (strlen(partySubaddress)) - str += sprintf(str, ".%s", partySubaddress); - -@@ -191,13 +191,13 @@ - - switch (publicTypeOfNumber) { - case 0: break; // unknown -- case 1: str += sprintf(str, countryprefix); break; -- case 2: str += sprintf(str, areaprefix); break; -+ case 1: str += sprintf(str, "%s", countryprefix); break; -+ case 2: str += sprintf(str, "%s", areaprefix); break; - case 3: str += sprintf(str, "(network)"); break; - case 4: str += sprintf(str, "(MSN)"); break; - case 6: str += sprintf(str, "(abbrev)"); break; - } -- str += sprintf(str, numberDigits); -+ str += sprintf(str, "%s", numberDigits); - - return p - beg; - } -@@ -219,7 +219,7 @@ - case 4: str += sprintf(str, "(local)"); break; - case 6: str += sprintf(str, "(abbrev)"); break; - } -- str += sprintf(str, numberDigits); -+ str += sprintf(str, "%s", numberDigits); - - return p - beg; - } ---- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/isdnrep/isdnbill.c 2009-10-20 05:07:28.000000000 -0400 -+++ isdn4k-utils-CVS-2010-05-01-patched.new/isdnlog/isdnrep/isdnbill.c 2014-01-28 17:16:00.533957441 -0500 -@@ -271,8 +271,7 @@ - memset(s, c, len); - s[len] = 0; - -- printf(s); -- printf("\n"); -+ printf("%s\n", s); - } /* strich */ - - diff --git a/isdn4k-utils-3.27_20151118-help-text.patch b/isdn4k-utils-3.27_20151118-help-text.patch deleted file mode 100644 index 144a804..0000000 --- a/isdn4k-utils-3.27_20151118-help-text.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c.me isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c ---- isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c.me 2018-10-08 10:53:25.317135507 +0200 -+++ isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c 2018-10-08 10:54:15.545306401 +0200 -@@ -195,8 +195,8 @@ static void usage(void) - fprintf(stderr, "\n"); - fprintf(stderr, "Usage: %s OPTION [ OPTION ] [ ... ]\n", vbasename); - fprintf(stderr, "\n"); -- fprintf(stderr, "-c, --create Removes a control file (default).\n"); -- fprintf(stderr, "-r, --remove Creates a control file.\n"); -+ fprintf(stderr, "-c, --create Creates a control file.\n"); -+ fprintf(stderr, "-r, --remove Removes a control file (default).\n"); - fprintf(stderr, "-n, --answernow Control file \"vboxctrl-answernow\".\n"); - fprintf(stderr, "-a, --answerall Control file \"vboxctrl-answerall\".\n"); - fprintf(stderr, "-p, --stop Control file \"vboxctrl-stop\".\n"); diff --git a/isdn4k-utils-3.27_20151118-perl-wld-modul.patch b/isdn4k-utils-3.27_20151118-perl-wld-modul.patch deleted file mode 100644 index a76828e..0000000 --- a/isdn4k-utils-3.27_20151118-perl-wld-modul.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest.than isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest ---- isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest.than 2017-08-08 11:49:59.607377458 +0200 -+++ isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest 2017-08-08 11:52:10.989430703 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/perl -+#! /usr/bin/perl -w -I . - - # make dest.gdbm - # necessary parts: ../../country-de.dat -diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate.than isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate ---- isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate.than 2017-08-08 11:52:26.278855030 +0200 -+++ isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate 2017-08-08 11:52:38.020412941 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/perl -+#! /usr/bin/perl -w- I . - - # This version of pp_rate originates from rates4linux: - # $Id: pp_rate,v 1.11 2004/10/23 17:40:21 tobiasb Exp $ diff --git a/isdn4k-utils-CVS-2005-03-09-xmon.patch b/isdn4k-utils-CVS-2005-03-09-xmon.patch deleted file mode 100644 index f176578..0000000 --- a/isdn4k-utils-CVS-2005-03-09-xmon.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- isdn4k-utils-CVS-2005-03-09/xmonisdn/Imakefile.tn 2005-11-16 11:43:34.000000000 +0100 -+++ isdn4k-utils-CVS-2005-03-09/xmonisdn/Imakefile 2005-11-16 11:43:47.000000000 +0100 -@@ -25,4 +25,4 @@ - -e s,\@CONFIG_XMONISDN_DOWNCMD\@,${CONFIG_XMONISDN_DOWNCMD},g \ - < $< > $@ - --install.all: install install.man install.bitmap -+install.all: install install.man diff --git a/isdn4k-utils-CVS-2009-10-20-lib64.patch b/isdn4k-utils-CVS-2009-10-20-lib64.patch deleted file mode 100644 index 2666886..0000000 --- a/isdn4k-utils-CVS-2009-10-20-lib64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template ---- isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me 2009-10-20 14:08:23.000000000 +0200 -+++ isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template 2009-10-20 14:09:17.000000000 +0200 -@@ -8,7 +8,7 @@ - # as published by the Free Software Foundation; either version - # 2 of the License, or (at your option) any later version. - --PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) -+PLUGINDIR=${DESTDIR}/$(LIBDIR)/pppd/$(PPPVERSION) - - include $(TOPDIR)/Rules.make - diff --git a/isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch b/isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch deleted file mode 100644 index 9d9f8d0..0000000 --- a/isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in.me isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in ---- isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in.me 2010-09-20 14:55:42.000000000 +0200 -+++ isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in 2010-09-20 14:56:22.000000000 +0200 -@@ -81,7 +81,7 @@ exec_prefix = @exec_prefix@ - mandir = @CONFIG_MANDIR@ - bindir = @CONFIG_BINDIR@ - sbindir = /usr/sbin --sysconfdir = /etc/vbox -+sysconfdir = /etc/isdn - - LOGFILEDIR = @VBOX_LOGDIR@ - PIDFILEDIR = @VBOX_PIDDIR@ diff --git a/isdn4k-utils-autoconf-2.6.4-quoting.patch b/isdn4k-utils-autoconf-2.6.4-quoting.patch deleted file mode 100644 index a98c138..0000000 --- a/isdn4k-utils-autoconf-2.6.4-quoting.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- isdn4k-utils/isdnlog/configure.in.quote 2013-11-23 13:24:33.093608335 +0100 -+++ isdn4k-utils/isdnlog/configure.in 2013-11-23 13:24:33.101608142 +0100 -@@ -140,8 +140,8 @@ - AC_MSG_RESULT(Using 'cdb' as database) - else - AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM, 1, [Use libgdbm]), -- AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM, 1, [Use libdbm]), -- AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB, 1, [use libdb])))) -+ [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM, 1, [Use libdbm]), -+ [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB, 1, [use libdb]))])]) - fi - AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[rdb extension]) - diff --git a/isdn4k-utils-autoconf25x.patch b/isdn4k-utils-autoconf25x.patch deleted file mode 100644 index 23a9450..0000000 --- a/isdn4k-utils-autoconf25x.patch +++ /dev/null @@ -1,287 +0,0 @@ ---- isdn4k-utils/imon/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/imon/configure.in 2013-11-23 12:58:32.616668380 +0100 -@@ -38,14 +38,14 @@ - AC_ARG_WITH(sbin, - [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], - CONFIG_SBINDIR="${withval}" -- AC_DEFINE(CONFIG_SBINDIR,"${withval}"), -+ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[kernel directory]), - ) - - dnl Optional man directory - AC_ARG_WITH(man, -- [ --with-man=DIR Set manpage dir. [/usr/man]], -+ [ --with-man=DIR Set manpage dir. [/usr/share/man]], - CONFIG_MANDIR="${withval}" -- AC_DEFINE(CONFIG_MANDIR,"${withval}"), -+ AC_DEFINE(CONFIG_MANDIR,"${withval}",[man directory]), - ) - - AC_SUBST(INSTALL) ---- isdn4k-utils/isdnctrl/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnctrl/configure.in 2013-11-23 12:58:32.616668380 +0100 -@@ -30,21 +30,21 @@ - AC_ARG_WITH(sbin, - [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], - CONFIG_SBINDIR="${withval}" -- AC_DEFINE(CONFIG_SBINDIR,"${withval}"), -+ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[sbin dir]), - ) - - dnl Optional man directory - AC_ARG_WITH(man, - [ --with-man=DIR Set manpage dir. [/usr/man]], - CONFIG_MANDIR="${withval}" -- AC_DEFINE(CONFIG_MANDIR,"${withval}"), -+ AC_DEFINE(CONFIG_MANDIR,"${withval}",[man dir]), - ) - - dnl Optional config-file-option - AC_ARG_ENABLE(cfile, - [ --enable-cfile Enable configfile option [no]], - CONFIG_ISDNCTRL_CONF=y -- AC_DEFINE(CONFIG_ISDNCTRL_CONF,y), -+ AC_DEFINE(CONFIG_ISDNCTRL_CONF,y,[enable config file]), - ) - - AC_SUBST(INSTALL) ---- isdn4k-utils/isdnlog/aclocal.m4.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/aclocal.m4 2013-11-23 12:58:32.615668404 +0100 -@@ -45,13 +45,13 @@ - if test "$pqdir" != "no" ; then - AC_MSG_RESULT("yes") - POSTGRES=1 -- AC_DEFINE_UNQUOTED(POSTGRES,1) -+ AC_DEFINE_UNQUOTED(POSTGRES,1,[postgres support]) - else - AC_MSG_RESULT("no POSTGRES DISABLED") - pqdir="" - fi - POSTGRESDIR="$pqdir" -- AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir") -+ AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir",[postgres dir]) - AC_SUBST(POSTGRES) - AC_SUBST(POSTGRESDIR) - ]) -@@ -108,13 +108,13 @@ - if test "$mydir" != "no" ; then - AC_MSG_RESULT("yes") - MYSQLDB=1 -- AC_DEFINE_UNQUOTED(MYSQLDB,1) -+ AC_DEFINE_UNQUOTED(MYSQLDB,1,[MySQL support]) - else - AC_MSG_RESULT("no MYSQL DISABLED") - mydir="" - fi - MYSQLDIR="$mydir" -- AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir") -+ AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir",[MySQL dir]) - AC_SUBST(MYSQLDB) - AC_SUBST(MYSQLDIR) - ]) -@@ -134,7 +134,7 @@ - if test "$oradir" != "no" ; then - AC_MSG_RESULT("yes") - ORACLE=1 -- AC_DEFINE_UNQUOTED(ORACLE,1) -+ AC_DEFINE_UNQUOTED(ORACLE,1,[oracle support, unsupported]) - else - AC_MSG_RESULT("no ORACLE DISABLED") - fi ---- isdn4k-utils/isdnlog/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/configure.in 2013-11-23 12:58:32.615668404 +0100 -@@ -81,45 +81,46 @@ - dnl To make it possible to set variables in policy.h - dnl they have to be defined with AC_DEFINE... - dnl --AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR") --AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE") --AC_DEFINE_UNQUOTED(DATADIR,"$datadir") --AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT) --AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE") --AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE") --AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE") --AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD") --AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD") --AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD") -+AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR", [old config dir]) -+AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE", [old config file]) -+AC_DEFINE_UNQUOTED(DATADIR,"$datadir", [data dir]) -+AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT, [server port]) -+AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE", [user file]) -+AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE", [log file]) -+AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE", [charge file]) -+AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD", [reload command]) -+AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD", [stop command]) -+AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD", [reboot command]) -+ - if test "$CONFIG_ISDN_LOG_DE" = "y" ; then - NATION="de" - NATION_MACRO="ISDN_DE" -- AC_DEFINE(ISDN_DE) -+ AC_DEFINE(ISDN_DE, 1, [German ISDN]) - fi - if test "$CONFIG_ISDN_LOG_AT" = "y" ; then - NATION="at" - NATION_MACRO="ISDN_AT" -- AC_DEFINE(ISDN_AT) -+ AC_DEFINE(ISDN_AT, 1, [Austrian ISDN]) - fi - if test "$CONFIG_ISDN_LOG_CH" = "y" ; then - NATION="ch" - NATION_MACRO="ISDN_CH" -- AC_DEFINE(ISDN_CH) -+ AC_DEFINE(ISDN_CH, 1, [Swiss ISDN]) - fi - if test "$CONFIG_ISDN_LOG_NL" = "y" ; then - NATION="nl" - NATION_MACRO="ISDN_NL" -- AC_DEFINE(ISDN_NL) -+ AC_DEFINE(ISDN_NL, 1, [Dutch ISDN]) - fi - if test "$CONFIG_ISDN_LOG_LU" = "y" ; then - NATION="lu" - NATION_MACRO="ISDN_LU" -- AC_DEFINE(ISDN_LU) -+ AC_DEFINE(ISDN_LU, 1, [Luxembourg ISDN]) - fi - if test "$CONFIG_ISDN_LOG_XX" = "y" ; then - NATION=$CONFIG_ISDN_LOG_CC - NATION_MACRO="ISDN_XX" -- AC_DEFINE(ISDN_XX) -+ AC_DEFINE(ISDN_XX, 1, [Other country]) - fi - - dnl Checks for programs. -@@ -132,17 +133,17 @@ - - dnl Checks for libraries. - if test -e tools/cdb/i4l_cdb.c ; then -- AC_DEFINE(USE_CDB) -+ AC_DEFINE(USE_CDB, 1, [Use CDB]) - CDBEXTRALIBS="tools/cdb/i4l_cdb.a" - DBEXT=".cdb" - RDBEXT=".cdb" - AC_MSG_RESULT(Using 'cdb' as database) - else --AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM), -- [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM), -- [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB))])]) -+AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM, 1, [Use libgdbm]), -+ AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM, 1, [Use libdbm]), -+ AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB, 1, [use libdb])))) - fi --AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT") -+AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[rdb extension]) - - dnl log database support - AC_CHECK_POSTGRES -@@ -160,7 +161,7 @@ - dnl Manual config - AC_ARG_WITH(isdnlib, - [ --with-isdnlib=DIR Set isdn library [../lib]], -- LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval")) -+ LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval",[libisdn dir])) - AC_ARG_WITH(area-lib, - [ --with-area-lib=STRING Set area library type [area]], - ALIB=$withval) -@@ -169,16 +170,16 @@ - CHARGECOUNTRY=$withval) - AC_ARG_WITH(oldconfdir, - [ --with-oldconfdir=DIR Set old config directory [/etc/isdnlog]], -- OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval")) -+ OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval", [old config dir])) - AC_ARG_WITH(oldconf, - [ --with-oldconf=NAME Set old config file name [isdnlog.conf]], -- OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval")) -+ OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval", [old config file])) - AC_ARG_WITH(datadir, - [ --with-datadir=DIR Set data directory [/usr/lib/isdn]], -- datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval")) -+ datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval", [data dir])) - AC_ARG_WITH(sport, - [ --with-sport=INT Set server port [20011]], -- SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval)) -+ SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval, [server port])) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST -@@ -198,28 +199,28 @@ - - if test "$ALIB" = "area" ; then - LIBAREA=1 -- AC_DEFINE(LIBAREA) -+ AC_DEFINE(LIBAREA, 1, [libarea]) - fi - case "$CHARGECOUNTRY" in - DE) - NATION="de" - NATION_MACRO="ISDN_DE" -- AC_DEFINE(ISDN_DE) -+ AC_DEFINE(ISDN_DE, 1, [German ISDN]) - ;; - AT) - NATION="at" - NATION_MACRO="ISDN_AT" -- AC_DEFINE(ISDN_AT) -+ AC_DEFINE(ISDN_AT, 1, [Austrian ISDN]) - ;; - CH) - NATION="ch" - NATION_MACRO="ISDN_CH" -- AC_DEFINE(ISDN_CH) -+ AC_DEFINE(ISDN_CH, 1, [Swiss ISDN]) - ;; - NL) - NATION="nl" - NATION_MACRO="ISDN_NL" -- AC_DEFINE(ISDN_NL) -+ AC_DEFINE(ISDN_NL, 1, [Dutch ISDN]) - ;; - esac - ---- isdn4k-utils/vbox3/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/vbox3/configure.in 2013-11-23 12:58:32.615668404 +0100 -@@ -17,11 +17,9 @@ - ## programs ############################################################### - - AC_PROG_CC --AC_PROG_CC_WORKS --AC_PROG_CC_GNU - - AC_PROG_RANLIB --AM_PROG_INSTALL -+AC_PROG_INSTALL - - ## libraries ############################################################## - ---- isdn4k-utils/vbox3/vboxgetty/Makefile.am.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/vbox3/vboxgetty/Makefile.am 2013-11-23 12:58:32.615668404 +0100 -@@ -12,7 +12,7 @@ - - ## vboxgetty ############################################################## - --DEFS += -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"' -+DEFS = -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"' - - INCLUDES = $(all_includes) $(tcl_include) - ---- isdn4k-utils/vbox/aclocal.m4.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/vbox/aclocal.m4 2013-11-23 12:58:32.615668404 +0100 -@@ -103,15 +103,7 @@ - - HAVE_TCL_INCL="y" - LINK_TCL_INCL="${gnd_tcl_inc_dir}" -- fi -- else -- AC_MSG_CHECKING("for tcl header in /usr/include/tcl8.3/tcl.h") -- if (test -e "/usr/include/tcl8.3/tcl.h") -- then -- AC_MSG_RESULT("yes") -- HAVE_TCL_INCL="y" -- LINK_TCL_INCL="-I/usr/include/tcl8.3" -- else -+ else - AC_MSG_RESULT("no") - fi - fi diff --git a/isdn4k-utils-capiinit.patch b/isdn4k-utils-capiinit.patch deleted file mode 100644 index 2b130fc..0000000 --- a/isdn4k-utils-capiinit.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- isdn4k-utils/capiinit/capiinit.c.capi 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capiinit/capiinit.c 2013-11-23 13:24:33.099608191 +0100 -@@ -1248,6 +1248,7 @@ - if (check_procfs() < 0) return -1; - if (check_for_kernelcapi() < 0) return -1; - if (check_for_capi() < 0) return -1; -+ sleep(5); /* wait until the device node is created successfully by udev */ - if (check_for_devcapi() < 0) return -1; - if (check_for_capifs() < 0) return 0; /* only warning */ - if (check_for_capifs_mounted() < 0) return -1; -@@ -1492,8 +1493,8 @@ - unload_module("capiutil"); - if ((mp = mounted("capifs")) != 0 && strcmp(mp, "/dev/capi") == 0) - system("umount /dev/capi"); -- if (filesystem_available("capifs")) -- unload_filesystem("capifs"); -+ /*if (filesystem_available("capifs")) -+ unload_filesystem("capifs"); */ - } - if (cardname && cname[0] == 0) { - fprintf(stderr,"ERROR: card \"%s\" not found\n", cardname); ---- isdn4k-utils/capiinit/capi.conf.capi 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capiinit/capi.conf 2013-11-23 13:24:33.098608215 +0100 -@@ -1,10 +1,10 @@ - # card file proto io irq mem cardnr options - #b1isa b1.t4 DSS1 0x150 7 - - P2P --b1pci b1.t4 DSS1 - - - - --c4 c4.bin DSS1 - - - - --c4 - DSS1 - - - - --c4 - DSS1 - - - - P2P --c4 - DSS1 - - - - P2P -+#b1pci b1.t4 DSS1 - - - - -+#c4 c4.bin DSS1 - - - - -+#c4 - DSS1 - - - - -+#c4 - DSS1 - - - - P2P -+#c4 - DSS1 - - - - P2P - #c2 c2.bin DSS1 - - - - - #c2 - DSS1 - - - - - #t1isa t1.t4 DSS1 0x340 9 - 0 diff --git a/isdn4k-utils-man.patch b/isdn4k-utils-man.patch deleted file mode 100644 index eeb23c1..0000000 --- a/isdn4k-utils-man.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- isdn4k-utils/xmonisdn/Makefile.in.man 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/xmonisdn/Makefile.in 2013-11-23 12:57:21.280407677 +0100 -@@ -51,7 +51,7 @@ - CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(I4LU_DEFINES)" - rm -rf X11 - --xmonisdn.man: xmonisdn.man.in Makefile -+xmonisdn.man: xmonisdn.man.in - MANDATE=`grep CHECKIN $< | awk '{print $$4}'`; \ - XUP=`echo ${CONFIG_XMONISDN_UPCMD}|sed 's/&/\\\&/g'`; \ - XDOWN=`echo ${CONFIG_XMONISDN_DOWNCMD}|sed 's/&/\\\&/g'`; \ -@@ -62,7 +62,7 @@ - -e "s,\@CONFIG_XMONISDN_DOWNCMD\@,$${XDOWN},g" \ - < $< > $@ - --config: -+config: xmonisdn.man - @cp Makefile.in GNUmakefile - @xmkmf - diff --git a/isdn4k-utils-mkzonedb.patch b/isdn4k-utils-mkzonedb.patch deleted file mode 100644 index aa603c8..0000000 --- a/isdn4k-utils-mkzonedb.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.crash isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c ---- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.crash 2014-07-31 11:31:57.000000000 +0200 -+++ isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c 2014-07-31 11:35:12.000000000 +0200 -@@ -362,6 +362,7 @@ int main (int argc, char *argv[]) - if (verbose) - stdoutisatty = isatty(fileno(stdout)); - -+ if (!rf || !df) usage(argv); - read_rzfile(rf); - make_table(); - write_db(df); diff --git a/isdn4k-utils-redhat.patch b/isdn4k-utils-redhat.patch deleted file mode 100644 index 0d89a24..0000000 --- a/isdn4k-utils-redhat.patch +++ /dev/null @@ -1,772 +0,0 @@ ---- isdn4k-utils/.config.rpm.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/.config.rpm 2013-11-23 12:47:59.064117681 +0100 -@@ -5,16 +5,16 @@ - # - # Code maturity level options - # --CONFIG_EXPERIMENTAL=y -+# CONFIG_EXPERIMENTAL is not set - - # - # General configuration - # - CONFIG_BUILDX11=y --CONFIG_KERNELDIR='/usr/src/linux' -+CONFIG_KERNELDIR='/usr/src/linux-2.4' - CONFIG_BINDIR='/usr/bin' --CONFIG_SBINDIR='/sbin' --CONFIG_MANDIR='/usr/man' -+CONFIG_SBINDIR='/usr/sbin' -+CONFIG_MANDIR='/usr/share/man' - CONFIG_RUNDIR='/var/run' - CONFIG_LOCKDIR='/var/lock' - CONFIG_LOCKFILE='LCK..' -@@ -23,11 +23,9 @@ - CONFIG_CALLERIDFILE='callerid.conf' - CONFIG_USERCONFFILE='~/.isdn' - CONFIG_COUNTRYCODE='49' --CONFIG_AREACODE='' -+CONFIG_AREACODE='9999' - CONFIG_COUNTRY_PREFIX='+' - CONFIG_AREA_PREFIX='0' --CONFIG_DATADIR='/usr/lib/isdn' --CONFIG_LIB_AREACODE=y - - # - # Runtime configuration tools -@@ -36,18 +34,20 @@ - CONFIG_ISDNCTRL_CONF=y - CONFIG_ISDNCTRL_TIMRU=y - CONFIG_IPROFD=y -+#CONFIG_DIVERTCTRL=y - - # - # Card configuration tools - # --# CONFIG_TELESCTRL is not set -+CONFIG_TELESCTRL=y - CONFIG_HISAXCTRL=y - CONFIG_ICNCTRL=y - # CONFIG_ICNCTRL_DEBUG is not set - CONFIG_PCBITCTL=y - CONFIG_AVMCAPICTRL=y -+#CONFIG_EICONCTRL=y - CONFIG_LOOPCTRL=y --CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop' -+CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop' - # CONFIG_LOOPCTRL_DEBUG is not set - - # -@@ -64,14 +64,20 @@ - CONFIG_ISDNLOG_USERFILE='isdnlog.users' - CONFIG_ISDNLOG_CHARGEFILE='charge.dat' - CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log' --CONFIG_ISDNLOG_RELOADCMD='reload' --CONFIG_ISDNLOG_STOPCMD='stop' -+CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart' -+CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop' - CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot' - CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog' - CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf' - # CONFIG_ISDNLOG_POSTGRES is not set - # CONFIG_ISDNLOG_MYSQLDB is not set -+# CONFIG_ISDNLOG_ORACLE is not set - CONFIG_ISDN_LOG_DE=y -+CONFIG_ISDN_LOG_CC_DE=y -+CONFIG_ISDN_LOG_DEST_DE=y -+# CONFIG_ISDN_LOG_DEST_AT is not set -+# CONFIG_ISDN_LOG_DEST_NL is not set -+# CONFIG_ISDN_LOG_DEST_CH is not set - CONFIG_IPPPSTATS=y - CONFIG_XISDNLOAD=y - CONFIG_XMONISDN=y -@@ -79,8 +85,8 @@ - # - # Options for xmonisdn - # --CONFIG_XMONISDN_UPCMD='/sbin/netup' --CONFIG_XMONISDN_DOWNCMD='/sbin/netdown' -+CONFIG_XMONISDN_UPCMD='/sbin/ifup' -+CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown' - - # - # Applications -@@ -94,23 +100,22 @@ - VBOX_LOGDIR='/var/log/vbox' - VBOX_PIDDIR='/var/run' - VBOX_LOCKDIR='/var/lock' --VBOX_DOCDIR='/usr/doc/vbox' --VBOX_TCL='tcl8.0' -+VBOX_DOCDIR='/usr/share/doc/vbox' -+VBOX_TCL='tcl8.5' -+# VBOX_SUSPEND_ID is not set - CONFIG_IPPPD=y - - # - # Options for ipppd - # --CONFIG_IPPPD_MSCHAP=y -+# CONFIG_IPPPD_MSCHAP is not set -+CONFIG_IPPP_FILTER=y - # CONFIG_IPPPD_RADIUS is not set - # CONFIG_RADIUS_WTMP_LOGGING is not set - RADIUS_CLIENT_CONFIG_FILE='' - CONFIG_CAPIFAX=y - CONFIG_RCAPID=y - --# --# Documentation --# --CONFIG_GENMAN=y --CONFIG_FAQ=y --CONFIG_FAQDIR='/usr/doc/faq/isdn4linux' -+# CAPI plugins -+CONFIG_PPPDCAPIPLUGIN=y -+ ---- isdn4k-utils/ipppd/ccp.c.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/ipppd/ccp.c 2013-11-23 12:47:59.064117681 +0100 -@@ -41,7 +41,7 @@ - - #include "compressions.h" - --#if 0 -+#if HAVE_LZSCOMP_H - #include <linux/isdn_lzscomp.h> - #else - #include "../ipppcomp/isdn_lzscomp.h" ---- isdn4k-utils/ipppd/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/ipppd/Makefile.in 2013-11-23 12:49:30.400890185 +0100 -@@ -15,10 +15,10 @@ - MANDIR := @CONFIG_MANDIR@ - CC := @CC@ - INSTALL := @INSTALL@ --INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d --INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0 --INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0 --INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0 -+INSTALL_DIR := $(INSTALL) -m 0755 -d -+INSTALL_SBIN := $(INSTALL) -m 0700 -+INSTALL_BIN := $(INSTALL) -m 0755 -+INSTALL_DATA := $(INSTALL) -m 0644 - RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@ - - ifeq (@CONFIG_IPPPD_MSCHAP@,y) -@@ -73,7 +73,7 @@ - - DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@ - COMPILE_FLAGS = @CFLAGS@ --CFLAGS = -O2 -fomit-frame-pointer -Wall -DREQ_SYSOPTIONS=0 -+CFLAGS = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0 - VER = 2.2.0 - - # it's a hack ---- isdn4k-utils/loop/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/loop/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -5,16 +5,16 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/loopctrl - DEFS = - LDFLAGS = -L../lib @LIBS@ - PROGRAM = loopctrl - MODULES = loopctrl.o - MANPAGE = loopctrl.8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - ifeq (../.config,$(wildcard ../.config)) ---- isdn4k-utils/imontty/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/imontty/Makefile 2013-11-23 12:47:59.062117731 +0100 -@@ -15,14 +15,14 @@ - # Manual config standalone - # - CONFIG_SBINDRIR := /sbin -- MAN8DIR := /usr/man/man8 -+ MAN8DIR := /usr/share/man/man8 - endif - - INSTALL=install --INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_MAN=$(INSTALL) -m 0644 - MANPAGE=imontty.8 - --CCFLAGS=-O2 -+CCFLAGS=$(RPM_OPT_FLAGS) -I$(CONFIG_KERNELDIR)/include - #CCFLAGS=-I$(ISDN_INCLUDE) -g - - # nothing to change behind this line ---- isdn4k-utils/iprofd/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/iprofd/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -5,8 +5,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include - LDFLAGS = -L../lib @LIBS@ - PROGRAM = iprofd - MODULES = iprofd.o -@@ -15,8 +15,8 @@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - CC = @CC@ ---- isdn4k-utils/avmb1/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/avmb1/Makefile.in 2013-11-23 12:47:59.061117756 +0100 -@@ -5,7 +5,7 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 -+CFLAGS = $(RPM_OPT_FLAGS) - LDFLAGS = -L../lib @LIBS@ - INCLUDES = -I. - PROGRAMS = avmcapictrl -@@ -15,8 +15,8 @@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - CC = @CC@ ---- isdn4k-utils/imon/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/imon/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -7,8 +7,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include - LDFLAGS = -L../lib @LIBS@ - PROGRAM = imon - MODULES = imon.o -@@ -18,8 +18,8 @@ - SBINDIR = @CONFIG_SBINDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - CC = @CC@ ---- isdn4k-utils/act2000/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/act2000/Makefile.in 2013-11-23 12:47:59.061117756 +0100 -@@ -5,8 +5,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/act2000 - DEFS = - LDFLAGS = -L../lib @LIBS@ - PROGRAM = actctrl -@@ -18,9 +18,9 @@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_DATA = $(INSTALL) -m 0644 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - CC = @CC@ ---- isdn4k-utils/isdnctrl/Makefile.in.redhat 2013-11-23 12:47:59.062117731 +0100 -+++ isdn4k-utils/isdnctrl/Makefile.in 2013-11-23 12:50:53.592861497 +0100 -@@ -5,8 +5,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include - LDFLAGS = @LIBS@ - PROGRAM = isdnctrl - MODULES = isdnctrl.o -@@ -15,8 +15,8 @@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - CC = @CC@ -DVERSION=\"@I4LVERSION@\" - prefix = @prefix@ - exec_prefix = @exec_prefix@ ---- isdn4k-utils/xisdnload/Imakefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/xisdnload/Imakefile 2013-11-23 12:47:59.064117681 +0100 -@@ -21,7 +21,7 @@ - OBJS = xisdnload.o - OSMAJORVERSION = OSMajorVersion - OSMINORVERSION = OSMinorVersion -- DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER -+ DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER - - AllTarget(xisdnload) - NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter) ---- isdn4k-utils/icn/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/icn/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -5,8 +5,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/icn - DEFS = - LDFLAGS = -L../lib @LIBS@ - PROGRAM = icnctrl -@@ -17,9 +17,9 @@ - DATADIR = @CONFIG_DATADIR@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_DATA = $(INSTALL) -m 0644 -+INSTALL_MAN = $(INSTALL) -m 0644 - CC = @CC@ - COPTS = - ---- isdn4k-utils/areacode/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/areacode/Makefile.in 2013-11-23 12:47:59.061117756 +0100 -@@ -12,7 +12,7 @@ - # only ones that _really_ exist on _every_ system. - # - BUILDOPTS := $(DATAOPTS) -- INSTALLOPTS := $(DATAOPTS) INSTALL="install -o 0 -g 0 -m 644" -+ INSTALLOPTS := $(DATAOPTS) INSTALL="install -m 644" - endif - - all: .depend ---- isdn4k-utils/rcapid/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/rcapid/Makefile.am 2013-11-23 12:47:59.064117681 +0100 -@@ -8,7 +8,7 @@ - stamp-h.in comperr - - INCLUDES = -I../capi20 $(all_includes) --CFLAGS = -Wall -O2 -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - ---- isdn4k-utils/isdnlog/samples/callerid.conf.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/samples/callerid.conf 2013-11-23 12:47:59.063117706 +0100 -@@ -2,38 +2,31 @@ - # - # More information: See the isdnlog documentation - -+#INTERFACE = ippp0 # Isdn network interface. This information is required -+ # with the "-hx" / hangup="value" option. -+ -+ - [MSN] - NUMBER = 4711 - ALIAS = Phone - SI = 1 - ZONE = 1 --START = { -- [FLAG] -- FLAGS = I|O|R|C|B|A|E|H -- PROGRAM = /bin/myprog \$1 \$2 \$3 Phone --} -+#START = { -+# [FLAG] -+# FLAGS = I|O|R|C|B|A|E|H -+# PROGRAM = /bin/myprog \$1 \$2 \$3 Phone -+#} - - [MSN] - NUMBER = 4711 - ALIAS = HDLC - SI = 7 - ZONE = 1 --START = { -- [FLAG] -- FLAGS = I|O|R|C|B|A|E| -- PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter --} -- --[MSN] --NUMBER = 4712 --ALIAS = Modem --SI = 1 --ZONE = 1 --START = { -- [FLAG] -- FLAGS = I|O|R|C|B|A|E|H -- PROGRAM = /bin/myprog \$1 \$2 \$3 Modem --} -+#START = { -+# [FLAG] -+# FLAGS = I|O|R|C|B|A|E| -+# PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter -+#} - - [NUMBER] - NUMBER = 01910 ---- isdn4k-utils/isdnlog/tools/cdb/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/cdb/Makefile.in 2013-11-23 12:51:38.509766289 +0100 -@@ -20,7 +20,7 @@ - BINDIR:=$(DESTDIR)@prefix@/bin - INCDIR:=$(DESTDIR)@prefix@/include - --CFLAGS:=-Wall -O2 -+CFLAGS:=-Wall $(RPM_OPT_FLAGS) - - all: depend $(FILES) - -@@ -45,7 +45,7 @@ - install-dirs: - install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) $(INCDIR) - --install: -+install: install-dirs - true - # install -m0755 $(BINS) $(BINDIR) - # install -m0644 $(MAN1) $(MAN1DIR) ---- isdn4k-utils/isdnlog/tools/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/Makefile 2013-11-23 12:47:59.065117655 +0100 -@@ -1,4 +1,4 @@ --CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib -+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib - #CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog - - all: rate-at ---- isdn4k-utils/isdnlog/tools/dest/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/dest/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -6,7 +6,7 @@ - -include ../../../.config - BZIP2 = @BZIP2@ - SHELL = /bin/sh --CFLAGS = -Wall -g -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - INCLUDES = - LDFLAGS = @DBMLIB@ - export DBEXT = @DBEXT@ -@@ -20,9 +20,9 @@ - SBINDIR = @CONFIG_SBINDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 -+INSTALL_DATA = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - DATADIR = @datadir@ ---- isdn4k-utils/isdnlog/tools/zone/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/zone/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -5,7 +5,7 @@ - # - BZIP2 = @BZIP2@ - SHELL = /bin/sh --CFLAGS = -Wall -g -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - INCLUDES = - LDFLAGS = @DBMLIB@ - CDBEXTRALIBS = @CDBEXTRALIBS@ -@@ -20,8 +20,8 @@ - SBINDIR = @CONFIG_SBINDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - #CC = @CC@ -V2.7.2.3 ---- isdn4k-utils/isdnlog/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -1659,10 +1659,10 @@ - # autoconf isdnlog specific stuff - # - INSTALL := @INSTALL@ --INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d --INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0 --INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0 --INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0 -+INSTALL_DIR := $(INSTALL) -m 0755 -d -+INSTALL_SBIN := $(INSTALL) -m 0700 -+INSTALL_BIN := $(INSTALL) -m 0755 -+INSTALL_DATA := $(INSTALL) -m 0644 - - BZIP2 := @BZIP2@ - BUNZIP2 := $(BZIP2) -f -d -@@ -1717,9 +1717,9 @@ - SUBDIRS += $(LIBISDNDIR) - endif - --# export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce -+# export CFLAGS = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce - --export CFLAGS = -Wall -pipe -+export CFLAGS = -Wall $(RPM_OPT_FLAGS) - ifndef _CC - export _CC = gcc - endif ---- isdn4k-utils/capiinfo/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capiinfo/Makefile.am 2013-11-23 12:47:59.061117756 +0100 -@@ -8,7 +8,7 @@ - stamp-h.in comperr - - INCLUDES = -I../capi20 $(all_includes) --CFLAGS = -Wall -O2 -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - ---- isdn4k-utils/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/Makefile 2013-11-23 12:47:59.065117655 +0100 -@@ -16,8 +16,8 @@ - # Following line is important for lib and isdnlog (sl). - export ROOTDIR=$(shell pwd) - --ifeq (.config,$(wildcard .config)) --include .config -+ifeq (.config.h,$(wildcard .config.h)) -+include .config.h - do-it-all: subtargets - else - CONFIGURATION = config -@@ -129,14 +129,8 @@ - - install: - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done -- @: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \ -- then \ -- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \ -- else \ -- sh scripts/makedev.sh $(DESTDIR) ; \ -- fi - --uninstall: rootperm -+uninstall: - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done - - # ---- isdn4k-utils/divertctrl/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/divertctrl/Makefile.in 2013-11-23 12:47:59.061117756 +0100 -@@ -5,16 +5,16 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/divert - DEFS = - LDFLAGS = -L../lib @LIBS@ - PROGRAM = divertctrl - MODULES = divertctrl.o - MANPAGE = divertctrl.8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - ifeq (../.config,$(wildcard ../.config)) ---- isdn4k-utils/capifax/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capifax/Makefile.am 2013-11-23 12:47:59.061117756 +0100 -@@ -8,7 +8,7 @@ - stamp-h.in - - INCLUDES = -I../capi20 $(all_includes) --CFLAGS = -Wall -O2 -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - ---- isdn4k-utils/capiinit/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capiinit/Makefile.am 2013-11-23 12:47:59.061117756 +0100 -@@ -8,7 +8,7 @@ - stamp-h.in comperr core - - INCLUDES = $(all_includes) --CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g -+CFLAGS = -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS) - LDFLAGS = $(all_libraries) - LDADD = - ---- isdn4k-utils/hisax/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/hisax/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -6,7 +6,7 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -I. -I@CONFIG_KERNELDIR@/include - LDFLAGS = -L../lib @LIBS@ - PROGRAMS = - MODULES = hisaxctrl.o -@@ -16,9 +16,9 @@ - DATADIR = @CONFIG_DATADIR@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_DATA = $(INSTALL) -m 0644 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - ifeq ("@CONFIG_HISAXCTRL@","y") ---- isdn4k-utils/doc/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/doc/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -9,7 +9,7 @@ - SED = @SED@ - MANDIR = @CONFIG_MANDIR@ - MANPAGES = ttyI.4 isdninfo.4 isdn_audio.4 isdnctrl.4 isdn_cause.7 --INSTALL_MAN = @INSTALL@ -o 0 -g 0 -m 0644 -+INSTALL_MAN = @INSTALL@ -m 0644 - prefix = @prefix@ - - %.1: %.man ---- isdn4k-utils/eicon/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/eicon/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -7,8 +7,8 @@ - # - - SHELL = /bin/sh --CFLAGS = -Wall -O2 -DUNIX -DLINUX --INCLUDES = -I. -Iinclude -+CFLAGS = -Wall -DUNIX -DLINUX $(RPM_OPT_FLAGS) -+INCLUDES = -I. -Iinclude -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/eicon - LDFLAGS = -L../lib @LIBS@ - PROGRAMS = - PROGRAM = eiconctrl -@@ -23,9 +23,9 @@ - DATA_DIR = @CONFIG_DATADIR@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_DATA = $(INSTALL) -m 0644 -+INSTALL_MAN = $(INSTALL) -m 0644 - CC = @CC@ - COPTS = -DDATADIR=\"$(shell echo $(DESTDIR)$(DATA_DIR))\" - ---- isdn4k-utils/vbox/examples/vboxgetty.conf.example.redhat 2013-11-23 12:47:59.064117681 +0100 -+++ isdn4k-utils/vbox/examples/vboxgetty.conf.example 2013-11-23 12:53:01.601740005 +0100 -@@ -20,12 +20,12 @@ - - # Settings for port ttyI6 - --port /dev/ttyI6 -- modeminit ATZ&B512&E000000 -- user vboxdaemonuser -- group users -- spooldir /var/spool/vbox/ttyI6 -- vboxconfig /home/vboxdaemonuser/.vbox.conf -+#port /dev/ttyI6 -+# modeminit ATZ&B512&E000000 -+# user vboxdaemonuser -+# group users -+# spooldir /var/spool/vbox/ttyI6 -+# vboxconfig /home/vboxdaemonuser/.vbox.conf - - # Settings for port ttyI7 - ---- isdn4k-utils/vbox/examples/vboxd.conf.example.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/vbox/examples/vboxd.conf.example 2013-11-23 12:52:33.205432705 +0100 -@@ -5,7 +5,7 @@ - # login (server startup) time. If access is 'yes' the host can login - # and count messages without special access. - --L:localhost:Y -+#L:localhost:Y - L:*:N - - # Full access list -@@ -15,7 +15,7 @@ - - # One user in this file can be configured by the `debconf' system, the next one. - # Remove this comment if you don't want any configuration to happen. --A:localhost:RW:username:*invalid*password*:/var/spool/vbox/ttyI6:incoming -+# A:localhost:RW:username:*invalid*password*:/var/spool/vbox/ttyI6:incoming - # A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming - - A:*:!:!:!:!:! ---- isdn4k-utils/ipppstats/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/ipppstats/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -6,14 +6,14 @@ - MANDIR = @CONFIG_MANDIR@ - CC = @CC@ - INSTALL = @INSTALL@ --INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0 --INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0 --INSTALL_DIR = $(INSTALL) -m 755 -o 0 -g 0 -d -+INSTALL_SBIN = $(INSTALL) -m 755 -+INSTALL_DATA = $(INSTALL) -m 644 -+INSTALL_DIR = $(INSTALL) -m 755 -d - - PPPSTATSRCS = ipppstats.c - PPPSTATOBJS = ipppstats.o - --CFLAGS = -fomit-frame-pointer -O2 -+CFLAGS = $(RPM_OPT_FLAGS) -I@CONFIG_KERNELDIR@/include - - all: ipppstats - ---- isdn4k-utils/lib/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/lib/Makefile 2013-11-23 12:47:59.065117655 +0100 -@@ -28,7 +28,7 @@ - # USER CONFIGURATION AREA - ###################################################################### - --CFLAGS = -g -Wall -pipe #-O6 -+CFLAGS = $(RPM_OPT_FLAGS) - DEFS = - ifndef _CC - export _CC = gcc ---- isdn4k-utils/lib/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/lib/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -11,7 +11,7 @@ - # Install as root with numeric Id's, since these are the - # only ones that _really_ exist on _every_ system. - # -- INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644 -+ INSTALLOPTS += INSTALL= install -m 644 - endif - - all: .depend diff --git a/isdn4k-utils-sh-linux.patch b/isdn4k-utils-sh-linux.patch deleted file mode 100644 index 225574b..0000000 --- a/isdn4k-utils-sh-linux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- isdn4k-utils/ipppd/main.c.sh-support 2013-11-23 13:19:37.218825637 +0100 -+++ isdn4k-utils/ipppd/main.c 2013-11-23 13:21:21.585279930 +0100 -@@ -1298,7 +1298,7 @@ - case 'r': - f = va_arg(args, char *); - a = va_arg(args, va_list); --#ifdef __alpha__ /* always do this? */ -+#if defined(__alpha__) || defined(__sh__) || defined ( __arm__) /* always do this? */ - n = fmtmsg(buf, buflen + 1, f, a); - #else - n = vfmtmsg(buf, buflen + 1, f, a); diff --git a/isdn4k-utils-statfs.patch b/isdn4k-utils-statfs.patch deleted file mode 100644 index 7338a23..0000000 --- a/isdn4k-utils-statfs.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- isdn4k-utils-CVS-2005-03-09/vbox/src/vboxgetty.c.old 2000-11-30 16:35:20.000000000 +0100 -+++ isdn4k-utils-CVS-2005-03-09/vbox/src/vboxgetty.c 2005-04-20 16:30:31.000000000 +0200 -@@ -434,7 +434,7 @@ - static int check_spool_space(unsigned long need) - { - struct statfs stat; -- unsigned long have; -+ unsigned long long have; - - log(L_DEBUG, "Checking free space on \"%s\"...\n", setup.spool); - -@@ -449,7 +449,7 @@ - { - have = (stat.f_bfree * stat.f_bsize); - -- log_line(L_JUNK, "%ld bytes available; %ld bytes needed... ", have, need); -+ log_line(L_JUNK, "%lld bytes available; %ld bytes needed... ", have, need); - - if (have >= need) - { - diff --git a/isdn4k-utils-strict-aliasing.patch b/isdn4k-utils-strict-aliasing.patch deleted file mode 100644 index c66390f..0000000 --- a/isdn4k-utils-strict-aliasing.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up isdn4k-utils-3.27_20151118/ipppd/Makefile.in.than isdn4k-utils-3.27_20151118/ipppd/Makefile.in ---- isdn4k-utils-3.27_20151118/ipppd/Makefile.in.than 2015-11-18 22:33:13.351145388 +0100 -+++ isdn4k-utils-3.27_20151118/ipppd/Makefile.in 2015-11-18 22:33:24.649039181 +0100 -@@ -73,7 +73,7 @@ endif - - DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@ - COMPILE_FLAGS = @CFLAGS@ --CFLAGS = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0 -+CFLAGS = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0 -fno-strict-aliasing - VER = 2.2.0 - - # it's a hack -diff -up isdn4k-utils-3.27_20151118/rcapid/Makefile.am.than isdn4k-utils-3.27_20151118/rcapid/Makefile.am ---- isdn4k-utils-3.27_20151118/rcapid/Makefile.am.than 2015-11-18 22:34:20.527513865 +0100 -+++ isdn4k-utils-3.27_20151118/rcapid/Makefile.am 2015-11-18 22:34:36.784361034 +0100 -@@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = configure aclo - stamp-h.in comperr - - INCLUDES = -I../capi20 $(all_includes) --CFLAGS = -Wall $(RPM_OPT_FLAGS) -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -fno-strict-aliasing - LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - -diff -up isdn4k-utils-3.27_20151118/rcapid/Makefile.in.than isdn4k-utils-3.27_20151118/rcapid/Makefile.in -diff -up isdn4k-utils-3.27_20151118/vbox/Makefile.in.than isdn4k-utils-3.27_20151118/vbox/Makefile.in diff --git a/isdn4k-utils-true.patch b/isdn4k-utils-true.patch deleted file mode 100644 index b37c9f1..0000000 --- a/isdn4k-utils-true.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- isdn4k-utils/imon/imon.c.true 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/imon/imon.c 2013-11-23 13:12:03.435893932 +0100 -@@ -73,6 +73,10 @@ - - #include <linux/isdn.h> - -+#ifndef TRUE -+#define TRUE 1 -+#endif -+ - #define KEY_Q 81 - #define KEY_q 113 - diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec deleted file mode 100644 index 7cb7b99..0000000 --- a/isdn4k-utils.spec +++ /dev/null @@ -1,1021 +0,0 @@ -%global app_defaults_dir %{_datadir}/X11/app-defaults -%global gitdate 20151118 - -Summary: Utilities for configuring an ISDN subsystem -Name: isdn4k-utils -Version: 3.27 -Release: 18%{?dist} -License: GPLv2+ and GPL+ and MIT and BSD and zlib -Url: http://www.isdn4linux.de/ - -# license issue, remove the isdn_lzscomp.c and firmwares -# and isdnlog/tools/telrate (non-free) -# git clone git://git.misdn.eu/isdn4k-utils.git -# rm -f isdn4k-utils/icn/firmware/* -# rm -f isdn4k-utils/act2000/firmware/* -# rm -f isdn4k-utils/eicon/firmware/* -# rm -rf isdn4k-utils/.git -# tar cvJf isdn4k-utils-%{version}_%{gitdate}.tar.xz isdn4k-utils -Source0: isdn4k-utils-%{version}_%{gitdate}.tar.xz -Source2: isdn.init -Source7: capi20.conf -Source8: capi.service -Source9: capiinit.8 - -Source10: 40-isdn.rules -Source11: isdn.service - -Patch0: isdn4k-utils-redhat.patch -Patch1: isdn4k-utils-CVS-2009-10-20-lib64.patch -Patch3: isdn4k-utils-man.patch -Patch4: isdn4k-utils-autoconf25x.patch -Patch5: isdn4k-utils-true.patch - -Patch11: isdn4k-utils-statfs.patch -Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch -Patch13: isdn4k-utils-capiinit.patch -Patch18: isdn4k-utils-sh-linux.patch -Patch19: isdn4k-utils-autoconf-2.6.4-quoting.patch -Patch22: isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch -Patch23: isdn-manpages.patch -Patch24: isdn-nofirmware.patch -Patch27: isdn4k-utils-strict-aliasing.patch -Patch28: isdn4k-fix-Werror-format-security-ftbfs.patch -Patch29: vbox-tcl-8.6.patch -Patch30: isdn4k-utils-mkzonedb.patch -Patch31: isdn4k-utils-3.27_20151118-perl-wld-modul.patch -Patch32: isdn4k-utils-3.27_20151118-help-text.patch - -Requires: udev >= 039-10.14.EL4 -Requires: hwdata >= 0.146.18.EL-1 -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -Requires: %{name}-data = %{version}-%{release} - -BuildRequires: gcc -BuildRequires: openjade -BuildRequires: linuxdoc-tools -BuildRequires: ncurses-devel -BuildRequires: tcl-devel -BuildRequires: libpcap-devel -BuildRequires: libICE-devel -BuildRequires: libSM-devel -BuildRequires: libX11-devel -BuildRequires: libXaw-devel -BuildRequires: libXmu-devel -BuildRequires: libXpm-devel -BuildRequires: libXt-devel -BuildRequires: libXext-devel -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: imake -BuildRequires: libtool -BuildRequires: ppp-devel -BuildRequires: systemd -BuildRequires: perl-podlators - -ExcludeArch: s390 s390x - -%description -The isdn4k-utils package contains a collection of utilities needed for -configuring an ISDN subsystem. - -%package data -Summary: data files -BuildArch: noarch - -%description data -The isdn4k-utils-data package contains data needed for configuring an ISDN subsystem. - -%package devel -Summary: Header files for capi development -Requires: %{name} = %{version}-%{release} - -%description devel -The isdn4k-utils-devel package contains the header files required to develop -capi applications. - -%package static -Summary: Static library for capi development -Requires: %{name} = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} - -%description static -The isdn4k-utils-devel package contains the capi static library required to -develop capi applications. - -%package vboxgetty -Summary: ISDN voice box (getty) -Requires: %{name}, tcl - -%description vboxgetty -The vboxgetty package contains vboxgetty and vboxputty, needed for an -ISDN voice box. - -%package -n xisdnload -Summary: An ISDN connection load average display for the X Window System -Requires: %{name} - -%description -n xisdnload -The xisdnload utility displays a periodically updated histogram of the -load average over your ISDN connection. - -%package doc -Summary: Documentation for isdn4k-utils -Requires: %{name} - -%description doc -The isdn4k-utils-doc package contains the documentation for isdn4k-utils. - -%prep -%setup -q -n %{name}-%{version}_%{gitdate} -%patch0 -p1 -b .redhat -%patch1 -p1 -b .lib64 - -%patch3 -p1 -b .man -%patch4 -p1 -b .ac25x -%patch5 -p1 -b .true - -%patch11 -p1 -b .statfs -%patch12 -p1 -b .xmon -%patch13 -p1 -b .capi -%patch18 -p1 -b .sh-support -%patch19 -p1 -b .quote -%patch22 -p1 -b .vboxgetty-config -%patch23 -p1 -b .manpages -%patch24 -p1 -b .nofw -%patch27 -p1 -b .strict-aliasing -%patch28 -p1 -b .Werror-format-security -%patch29 -p1 -b .tcl8.6 -%patch30 -p1 -b .mkzonedb-crash -%patch31 -p1 -b .perl-wld-modul -%patch32 -p1 -b .help-text - -# autoreconf for new autofoo -for i in */configure; do - cd `dirname $i` - autoreconf --force --install - cd .. -done - -# fix utf8 issue -for f in vbox/doc/de/vbox.txt.in imontty/imontty.8.in FAQ/tutorial/EN-i4l.sgml \ - isdnlog/README isdnlog/tools/rate-files.man \ - Mini-FAQ/isdn-faq.txt vbox/doc/de/vbox.sgml.in ; do - iconv -f iso-8859-1 -t utf-8 < $f > ${f}_ - mv ${f}_ $f -done - -%build -export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" - -mv .config.rpm .config -echo CONFIG_GENMAN=y >>.config -echo CONFIG_FAQ=y >>.config -echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >>.config -echo "CONFIG_DATADIR='%{_datadir}/isdn'" >>.config -echo "CONFIG_LIBDIR='%{_libdir}'" >>.config -echo "CONFIG_FIRMWAREDIR='%{_datadir}/isdn'" >>.config -echo "CONFIG_CARD_SBINDIR='%{_sbindir}'" >>.config -sed -e "s,',,g" .config > .config.h - -make subconfig -make - -%install -mkdir -p %{buildroot}/dev \ - %{buildroot}/etc/{rc.d/init.d,ppp,isdn} \ - %{buildroot}/var/{log/vbox,spool/vbox,lock/isdn} \ - %{buildroot}%{_sbindir} \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man1 \ - %{buildroot}%{_mandir}/man4 \ - %{buildroot}%{_mandir}/man8 - -make install DESTDIR=%{buildroot} \ - DATADIR=%{_datadir}/isdn \ - XAPPLOADDIR=%{app_defaults_dir} \ - MANPATH=%{_mandir} \ - MANSUFFIX=1 - -touch %{buildroot}/etc/ppp/ioptions - -if [ -f %{buildroot}/etc/isdn/isdn.conf.new ] ; then - mv -f %{buildroot}/etc/isdn/isdn.conf.new %{buildroot}/etc/isdn/isdn.conf -fi - -# copy config files for isdnlog -mkdir -p %{buildroot}%{_datadir}/isdn -cp -f isdnlog/*.dat %{buildroot}%{_datadir}/isdn/ -chmod 644 %{buildroot}%{_datadir}/isdn/*.dat - -# delete files to avoid conflicts and don't package *.la files -rm -rf %{buildroot}/etc/isdn/stop \ - %{buildroot}/etc/drdsl/adsl.conf \ - %{buildroot}%{_bindir}/cdb* \ - %{buildroot}%{_includedir}/freecdb.h \ - %{buildroot}%{_includedir}/freecdbmake.h \ - %{buildroot}%{_libdir}/*.la \ - %{buildroot}%{_libdir}/capi/*.la \ - %{buildroot}%{_libdir}/capi/*.so \ - %{buildroot}%{_mandir}/man1/cdb* \ - %{buildroot}%{_mandir}/man3 \ - %{buildroot}%{_mandir}/man5/vboxtcl.5* \ - %{buildroot}%{_docdir}/isdn4k-utils \ - %{buildroot}%{_docdir}/vbox \ - %{buildroot}/usr/X11R6 \ - %{buildroot}/usr/lib*/X11 - -# install isdn startup script -mkdir -p %{buildroot}%{_libexecdir} -install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/isdn -install -m0755 -d %{buildroot}%{_unitdir} -install -m0644 %{SOURCE11} %{buildroot}%{_unitdir}/isdn.service -install -m0644 %{SOURCE8} %{buildroot}%{_unitdir}/capi.service - -mv %{buildroot}%{_mandir}/man8/.isdnctrl_conf.8 \ - %{buildroot}%{_mandir}/man8/isdnctrl_conf.8 - -# move doc file to avoid conflict -mv isdnlog/README isdnlog/README.isdnlog - -# install man page for capiinit -install -m644 %{SOURCE9} %{buildroot}%{_mandir}/man8/ - -# install config file for capi -mkdir -p $RPM_BUILD_ROOT/etc -install -m 644 capiinit/capi.conf $RPM_BUILD_ROOT/etc -install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc - -# add comment -echo "# config files" >> %{buildroot}/etc/ppp/ioptions - -# install 40-isdn.rules, it's dropped from udev in F14 and later -%if 0%{?fedora} < 21 || 0%{?rhel} > 6 - mkdir -p %{buildroot}%{_udevdir} - install -m 644 %{SOURCE10} %{buildroot}%{_udevdir}/ -%endif - -mv %{buildroot}/pppd %{buildroot}%{_libdir} - -# fix file permission -chmod 755 %{buildroot}%{_bindir}/* %{buildroot}%{_sbindir}/* -chmod 644 %{buildroot}%{_mandir}/man*/* - -%post -/sbin/ldconfig -%systemd_post isdn.service - -%preun -%systemd_preun isdn.service - -%postun -/sbin/ldconfig -%systemd_postun_with_restart isdn.service - -%files -%dir /etc/isdn -%dir /var/spool/vbox -%dir /var/log/vbox -%dir %{_datadir}/isdn -%dir %{_libdir}/capi -%verify(not md5 size mtime) %config(noreplace) /etc/isdn/* -%verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions -%config(noreplace) /etc/ppp/peers/* -%config(noreplace) /etc/capi.conf -%config(noreplace) /etc/capi20.conf -%if 0%{?fedora} < 21 || 0%{?rhel} > 6 -%{_udevdir}/40-isdn.rules -%endif -%{_libdir}/*.so.* -%{_libdir}/capi/*.so.* -%{_sbindir}/avmcapictrl -%{_sbindir}/hisaxctrl -%{_sbindir}/icnctrl -%{_sbindir}/isdnctrl -%{_libexecdir}/isdn -%{_unitdir}/isdn.service -%{_unitdir}/capi.service -%{_bindir}/* -%{_sbindir}/capiinit -%{_sbindir}/imon -%{_sbindir}/imontty -%{_sbindir}/ipppd -%{_sbindir}/ipppstats -%{_sbindir}/iprofd -%{_sbindir}/isdnlog -%{_sbindir}/loopctrl -%{_sbindir}/mkzonedb -%{_sbindir}/rcapid -%{_sbindir}/vboxd -%{_sbindir}/vboxmail -%dir %{_datadir}/isdn -%{_libdir}/pppd -%doc gpl-2.0.txt README isdnlog/README.* -%doc isdnlog/tools/zone/de/01033/zred.dtag.bz2 -%{_mandir}/man1/* -%{_mandir}/man4/* -%{_mandir}/man5/* -%{_mandir}/man7/* -%{_mandir}/man8/* -%exclude %{_mandir}/man1/xmonisdn.1* -%exclude %{_mandir}/man1/xisdnload.1* -%exclude %{_mandir}/man5/vboxgetty.conf.5* -%exclude %{_mandir}/man8/vboxgetty.8* -%exclude %{_mandir}/man8/vboxputty.8* -%exclude %{_bindir}/xisdnload -%exclude %{_bindir}/xmonisdn - -%files vboxgetty -%doc vbox/examples/vboxgetty*.example -%{_mandir}/man5/vboxgetty.conf.5* -%{_mandir}/man8/vboxgetty.8* -%{_mandir}/man8/vboxputty.8* -%{_sbindir}/vboxgetty -%{_sbindir}/vboxputty - -%files devel -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc - -%files static -%{_libdir}/*.a - -%files -n xisdnload -%doc xmonisdn/README -%{app_defaults_dir}/* -%{_mandir}/man1/xisdnload.1* -%{_mandir}/man1/xmonisdn.1* -%{_bindir}/xisdnload -%{_bindir}/xmonisdn - -%files data -%{_datadir}/isdn/*.dat -%{_datadir}/isdn/dest.cdb -%ghost %{_datadir}/isdn/zone-de-dtag.cdb - -%files doc -%doc isdnlog/FAQ -%doc vbox/examples/vbox.conf.example -%doc vbox/examples/vboxd.conf.example -%doc vbox/examples/vboxrc.example -%doc vbox/examples/standard.tcl.example -%doc vbox/examples/timeout.msg.example -%doc vbox/examples/beep.msg* -%doc vbox/examples/timeout* -%doc FAQ/tutorial/* FAQ/i4lfaq* Mini-FAQ/isdn-faq.txt -%lang(de) %doc vbox/doc/de/vbox.sgml vbox/doc/de/vbox.txt - - -%changelog -* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 3.27-16 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Sun Oct 14 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.27-15 -- Package cleanups, drop long retired sys-v scripts migration - -* Mon Oct 08 2018 Than Ngo <than(a)redhat.com> - 3.27-14 -- fixed 1635832, help text descriptions - -* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Jun 23 2018 Than Ngo <than(a)redhat.com> - 3.27-12 -- fixed 1592360, drop requirements on initscripts - -* Wed Mar 07 2018 Adam Williamson <awilliam(a)redhat.com> - 3.27-11 -- Rebuild to fix GCC 8 mis-compilation - See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") - -* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Bjrn Esser <besser82(a)fedoraproject.org> - 3.27-9 -- Rebuilt for switch to libxcrypt - -* Tue Aug 08 2017 Than Ngo <than(a)redhat.com> - 3.27-8 -- fixes, wld.pm cannot be located - -* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jul 04 2016 Than Ngo <than(a)redhat.com> - 3.27-4 -- fix file permission - -* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Nov 19 2015 Dennis Gilmore <dennis(a)ausil.us> - 3.27-2 -- mark %%{_datadir}/isdn as a directory in the file list for isdn4k-utils -- fixes duplication of files making isdn4k-utils-data uninstallable - -* Wed Nov 18 2015 Than Ngo <than(a)redhat.com> - 3.27-1 -- update to 3.27 -- change to msidn.org git tree, thanks to Thomas Sailer - -* Fri Jul 10 2015 Than Ngo <than(a)redhat.com> - 3.2-101 -- bz#1239582, fix build failure with new gcc5 -- fix warnings in changelog - -* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-100 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-99 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Jul 30 2014 Than Ngo <than(a)redhat.com> - 3.2-98 -- fixed #1045909, multilib issue -- fixed #913721, udev rules are installed into wrong directory -- fixed #1073894, service files are installed with unnecessary executable perms -- fixed #1052058, mkzonedb killed by SIGSEGV - -* Wed Jun 18 2014 Than Ngo <than(a)redhat.com> - 3.2-97 -- fix bz#1106807, FTBFS - -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-96 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Jaroslav karvada <jskarvad(a)redhat.com> - 3.2-95 -- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 - -* Tue Jan 28 2014 Kyle McMartin <kyle(a)fedoraproject.org> - 3.2-94 -- isdn4k-fix-ipppd.patch: fix build on aarch64 (and future arches) -- isdn4k-fix-Werror-format-security-ftbfs.patch: fix FTBFS with - -Werror=format-security by explicitly using string types. (rhbz#1037140) - -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-93 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Apr 25 2013 Than Ngo <than(a)redhat.com> - 3.2-92 -- build with -fno-strict-aliasing - -* Wed Apr 03 2013 Than Ngo <than(a)redhat.com> - 3.2-91 -- add rhel condition - -* Fri Mar 01 2013 Than Ngo <than(a)redhat.com> - 3.2-90 -- add BR perl-podlators for pod2man - -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-89 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jan 4 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.2-88 -- apply fixes to remove additional non-free items - -* Thu Nov 15 2012 Than Ngo <than(a)redhat.com> - 3.2-87 -- bz#875538, fix symbol lookup error -- bz#850173, Scriptlets replaced with new systemd macros - -* Mon Oct 08 2012 Than Ngo <than(a)redhat.com> - 3.2-86 -- drop support for < f14 - -* Mon Aug 20 2012 Than Ngo <than(a)redhat.com> - 3.2-85 -- add missing %% symbol for triggerun - -* Fri Jul 20 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> - 3.2-84 -- revert ARM arch exclusion -- add simple patch to fix building on ARM -- cleanup spec - -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-82 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jan 25 2012 Harald Hoyer <harald(a)redhat.com> 3.2-81 -- install everything in /usr - https://fedoraproject.org/wiki/Features/UsrMove - -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-80 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Aug 15 2011 Kalev Lember <kalevlember(a)gmail.com> - 3.2-79 -- Rebuilt for rpm bug #728707 - -* Thu Jul 21 2011 Than Ngo <than(a)redhat.com> - 3.2-78 -- install correct service scripts - -* Thu Jul 21 2011 Than Ngo <than(a)redhat.com> - 3.2-77 -- bz#717397, systemd unit file for isdn service -- drop triggerpostun - -* Tue Jul 12 2011 Toshio Kuratomi <toshio(a)fedoraproject.org> - 3.2-76 -- Apply systemd unit file for capi service - -* Wed Mar 16 2011 Than Ngo <than(a)redhat.com> - 3.2-75 -- apply patch to fix man pages, thanks to John Bradshaw - bz#673794, bz#665079, bz#663637, bz#675715, bz#669053, bz#675676, bz#669081, - bz#675604, bz#675679, bz#664335, bz#674204, bz#669091 - -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-74 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Sep 29 2010 jkeating - 3.2-73 -- Rebuilt for gcc bug 634757 - -* Mon Sep 20 2010 Than Ngo <than(a)redhat.com> - 3.2-72 -- bz#545469, put vboxgetty config file in correct directory -- fix wrong exit status in startup scrripts - -* Fri May 14 2010 Than Ngo <than(a)redhat.com> - 3.2-71 -- fix bz#566909, thanks to Louis Lagendijk - - own LIBDIR/capi - - fix loading of plugins - - remove chkconfig capi off - -* Tue May 04 2010 Than Ngo <than(a)redhat.com> - 3.2-70 -- enable capi.new -- add 40-isdn.rules, it's dropped from udev in F14 and later -- fix multilib issue -- add subpackage doc - -* Mon May 03 2010 Than Ngo <than(a)redhat.com> - 3.2-69 -- fix quotation issue with autoconf-2.64 -- fix bz#556056, split off -static subpackage -- fix bz#539020, FTBFS - -* Fri Jan 15 2010 Than Ngo <than(a)redhat.com> - 3.2-68 -- fix license -- cleanup - -* Wed Oct 28 2009 Than Ngo <than(a)redhat.com> - 3.2-67 -- drop useless BR libXp-devel - -* Mon Oct 19 2009 Than Ngo <than(a)redhat.com> - 3.2-66 -- add missing man pages -- add upstream fixes - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-65 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Feb 27 2009 Than Ngo <than(a)redhat.com> 3.2-64 -- fix build problem - -* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-63 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Jan 19 2009 Than Ngo <than(a)redhat.com> - 3.2-62 -- fix #398121, capiplugin.so uses non-existent libcapi20.so -- fix CAPI overflow -- fix #471712, add sh architecture support - -* Mon Oct 27 2008 Than Ngo <than(a)redhat.com> 3.2-61 -- bz450370, fix multilib issue - -* Thu Oct 02 2008 Than Ngo <than(a)redhat.com> 3.2-60 -- rebuild - -* Tue Aug 05 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 3.2-59 -- fix license tag - -* Mon Mar 03 2008 Than Ngo <than(a)redhat.com> 3.2-58 -- fix build issue with new gcc - -* Fri Feb 15 2008 Than Ngo <than(a)redhat.com> 3.2-57 -- rebuild against gcc 4.3 - -* Mon Jan 07 2008 Than Ngo <than(a)redhat.com> 3.2-56 -- rebuilt - -* Thu Sep 27 2007 Than Ngo <than(a)redhat.com> - 3.2-55 -- fix build issue with glibc - -* Thu Feb 08 2007 Than Ngo <than(a)redhat.com> 3.2-54.fc7 -- rebuild - -* Wed Nov 29 2006 Karsten Hopp <karsten(a)redhat.com> 3.2-53.fc7 -- rebuild with new libpcap - -* Mon Nov 13 2006 Than Ngo <than(a)redhat.com> - 3.2-52.fc7 -- fix #213233, require main package with %%{version}-%%{release} - -* Mon Oct 30 2006 Than Ngo <than(a)redhat.com> 3.2-51 -- move .so in -devel #203627 - -* Wed Jul 19 2006 Than Ngo <than(a)redhat.com> 3.2-50 -- add pppd 2.4.4 -- use isdn-header files from upstream - -* Fri Jul 14 2006 Jesse Keating <jkeating(a)redhat.com> - 3.2-49 -- rebuild -- add missing br automake libtool - -* Wed May 31 2006 Than Ngo <than(a)redhat.com> 3.2-47 -- add requires on libpcap-devel - -* Mon May 15 2006 Than Ngo <than(a)redhat.com> 3.2-46 -- fix #191754, buildrequire on libXext-devel - -* Tue Apr 25 2006 Adam Jackson <ajackson(a)redhat.com> 3.2-45 -- Rebuild for updated imake build rules - -* Tue Apr 25 2006 Than Ngo <than(a)redhat.com> 3.2-44 -- add capi service - -* Wed Apr 19 2006 Than Ngo <than(a)redhat.com> 3.2-43 -- update to CVS-2006-02-13 -- add support capi #169902 - -* Thu Mar 30 2006 Than Ngo <than(a)redhat.com> 3.2-42 -- support pppd 2.4.3 #187218 - -* Fri Mar 10 2006 Than Ngo <than(a)redhat.com> 3.2-41 -- add missing symlink for capi plugins #165198 - -* Wed Mar 01 2006 Karsten Hopp <karsten(a)redhat.de> 3.2-40 -- Buildrequires: libXp-devel - -* Fri Feb 17 2006 Than Ngo <than(a)redhat.com> 3.2-39 -- fix rpm file conflict #181854 - -* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 3.2-38.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 3.2-38.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Sun Dec 18 2005 Than Ngo <than(a)redhat.com> 3.2-38 -- add correct app-defaults directory - -* Fri Dec 16 2005 Jesse Keating <jkeating(a)redhat.com> -- rebuilt for new gcj - -* Wed Nov 16 2005 Than Ngo <than(a)redhat.com> 3.2-36 -- fix for modular X - -* Mon Nov 14 2005 Than Ngo <than(a)redhat.com> 3.2-35 -- fix for modular X - -* Sat Nov 12 2005 Florian La Roche <laroche(a)redhat.com> -- rebuild - -* Tue Sep 13 2005 Than Ngo <than(a)redhat.com> 3.2-33 -- cleanup %%post - -* Wed Jul 27 2005 Than Ngo <than(a)redhat.com> 3.2-32 -- rebuilt - -* Tue Jul 19 2005 Than Ngo <than(a)redhat.com> 3.2-31 -- buildrequires on libpcap - -* Mon Jul 18 2005 Than Ngo <than(a)redhat.com> 3.2-30 -- rebuild to fix broken dependencies - -* Mon Jun 20 2005 Than Ngo <than(a)redhat.com> 3.2-29 -- workaround for loading isdn module at system startup #160831 - -* Fri May 27 2005 Bill Nottingham <notting(a)redhat.com> 3.2-28 -- remove setuid bit from vboxbeep - -* Wed Apr 20 2005 Martin Stransky <stransky(a)redhat.com> 3.2-27 -- fix for large filesystems (#155441) - -* Wed Mar 09 2005 Than Ngo <than(a)redhat.com> 3.2-26 -- update cvs snapshot -- fix gcc4 build problem - -* Sat Mar 05 2005 Than Ngo <than(a)redhat.com> 3.2-25 -- rebuilt - -* Wed Feb 16 2005 Than Ngo <than(a)redhat.com> 3.2-24 -- update cvs snapshot -- use RPM_OPT_FLAGS - -* Wed Feb 02 2005 Than Ngo <than(a)redhat.com> 3.2-23 -- fix typo in isdn startup script - -* Tue Jan 25 2005 Than Ngo <than(a)redhat.com> 3.2-22 -- fix the bug in isdn startup script, #146057 - -* Wed Dec 01 2004 Than Ngo <than(a)redhat.com> 3.2-21 -- fix some minor build problems #140941 - -* Sat Nov 20 2004 Miloslav Trmac <mitr(a)redhat.com> 3.2-20 -- Convert imontty.8 to UTF-8 - -* Thu Nov 18 2004 Than Ngo <than(a)redhat.com> 3.2-19 -- update cvs snapshot -- workaround, add capi devices - -* Tue Oct 05 2004 Than Ngo <than(a)redhat.com> 3.2-18.p1.1 -- add workaround for #134525 - -* Wed Sep 01 2004 Than Ngo <than(a)redhat.com> 3.2-17.p1.1 -- get rid of CVS files, #131430 - -* Thu May 13 2004 Than Ngo <than(a)redhat.com> 3.2-16.p1.1 -- fix build problem with gcc-3.4 -- fix typo bug in isdnlog, bug #120568 -- fix capiplugin for working with pppd 2.4.2, bug #125723 - -* Thu May 13 2004 Than Ngo <than(a)redhat.com> 3.2-15.p1.1 -- add patch to enable PIE build of userisdnctl - -* Tue May 11 2004 Than Ngo <than(a)redhat.com> 3.2-14.p1.1 -- fixed usage message in isdndial, bug #122987 - -* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Wed Feb 25 2004 Than Ngo <than(a)redhat.com> 3.2-13.p1 -- rebuilt - -* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Wed Feb 11 2004 Than Ngo <than(a)redhat.com> 3.2-11.p1 -- add fix to get isdnlog working with Fritz!Card PCI V2.0, bug #115205 - -* Wed Jan 21 2004 Than Ngo <than(a)redhat.com> 3.2-10.p1 -- fix build problem with new libpcap - --* Wed Jan 14 2004 Than Ngo <than(a)redhat.com> 3.2-9.p1 -- fixed permission problem - -* Thu Dec 18 2003 Than Ngo <than(a)redhat.com> 3.2-8.p1 -- fixed conflict problem with redhat-config-network - -* Mon Dec 15 2003 Than Ngo <than(a)redhat.com> 3.2-7.p1 -- add patch to build against new glibc - -* Fri Dec 12 2003 Jens Petersen <petersen(a)redhat.com> - 3.2-6.p1 -- rebuild for tcl 8.4 - -* Thu Oct 23 2003 Than Ngo <than(a)redhat.com> 3.2-5.p1 -- fix ISDN script to work with new redhat-config-network - -* Wed Oct 22 2003 Than Ngo <than(a)redhat.com> 3.2-4.p1 -- allow using nickname -- cleanup isdn script - -* Fri Oct 10 2003 Than Ngo <than(a)redhat.com> 3.2-3.p1 -- fixed wrong version of xisdnload (bug #106616) - -* Tue Sep 30 2003 Than Ngo <than(a)redhat.com> 3.2-2.p1 -- cleanup specfile - -* Tue Sep 30 2003 Than Ngo <than(a)redhat.com> 3.2-1.p1 -- 3.2p1 -- support IPPP_FILTER (bug #104928) - -* Mon Aug 11 2003 Than Ngo <than(a)redhat.com> 3.1-77 -- rebuilt - -* Mon Aug 11 2003 Than Ngo <than(a)redhat.com> 3.1-76 -- add patch to build isdn4k-utils without kernel-source (bug #101751) -- cleanup (bug #79641) - -* Mon Aug 11 2003 Than Ngo <than(a)redhat.com> 3.1-75 -- rebuilt - -* Mon Aug 11 2003 Than Ngo <than(a)redhat.com> 3.1-74 -- add tcl-devel in buildrequires (bug #102034) - -* Mon Jun 30 2003 Than Ngo <than(a)redhat.com> 3.1-73 -- added missing example files (bug #81687) -- move vboxgetty man page in vboxgetty subpackage - -* Thu Jun 19 2003 Than Ngo <than(a)redhat.com> 3.1-71 -- get rid of ipppcomp - -* Tue Jun 10 2003 Than Ngo <than(a)redhat.com> 3.1-69 -- fix incorrect error messages (bug #96931) - -* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Wed May 28 2003 Than Ngo <than(a)redhat.com> 3.1-66.1 -- fix buildrequires problem - -* Fri May 23 2003 Than Ngo <than(a)redhat.com> 3.1-65 -- add usage fix - -* Thu May 22 2003 Jeremy Katz <katzj(a)redhat.com> 3.1-63 -- fix build with gcc 3.3 - -* Mon Feb 3 2003 Than Ngo <than(a)redhat.com> 3.1-62 -- remove excludearch x86_64 -- add fPIC patch for x86_64 - -* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com> -- rebuilt - -* Tue Dec 10 2002 Tim Powers <timp(a)redhat.com> 3.1-60 -- rebuild to fix broken tcltk deps - -* Fri Nov 8 2002 Than Ngo <than(a)redhat.com> 3.1-59 -- fix build problem -- for the present exclude x86_64, it needs kernel-source rpm for building - -* Mon Jul 01 2002 Than Ngo <than(a)redhat.com> 3.1-58 -- add userisdnctl, isdnup - -* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com> -- automated rebuild - -* Tue Jun 18 2002 Than Ngo <than(a)redhat.com> 3.1-56 -- don't forcibly strip binaries - -* Fri Jun 14 2002 Than Ngo <than(a)redhat.com> 3.1-55 -- fix a bug in pppdcapi plugin for working with pppd-2.4.1 (bug #64279) - -* Thu May 23 2002 Bernhard Rosenkraenzer <bero(a)redhat.com> 3.1-54 -- Update -- Fix build with gcc 3.1 -- Fix build with current auto* tools - -* Mon Apr 8 2002 Than Ngo <than(a)redhat.com> 3.1-53 -- fix bug in loading hisax modul for Card Elsa Quickstep 1000 (bug #62892) - -* Fri Feb 22 2002 Than Ngo <than(a)redhat.com> 3.1-52 -- fix bug in isdnlog (bug #60013) -- fix bug in imon - -* Thu Feb 21 2002 Than Ngo <than(a)redhat.com> 3.1-51 -- fix bad memory allocation (enrico.scholz(a)informatik.tu-chemnitz.de), bug #60179 - -* Tue Feb 19 2002 Bernhard Rosenkraenzer <bero(a)redhat.com> 3.1-50 -- new upstream, needed to switch isdnlog to EUR currency for contries that - have it -- fix installation of pppcapiplugin man page -- don't build against 2.4.5 kernel headers, they're not compatible with - 2.4.17. - -* Wed Jan 09 2002 Tim Powers <timp(a)redhat.com> -- automated rebuild - -* Wed Dec 05 2001 Than Ngo <than(a)redhat.com> 3.1-48 -- new upstream -- remove some unused patch files -- move pppcapiplugin to /usr/lib/pppd, The plugin option now looks in here -- devel sub package -- buildreqquires: linuxdoc-tools - -* Mon Oct 29 2001 Than Ngo <than(a)redhat.com> 3.1-47 -- fixed symlinks bugs (bug #55306) -- fix a bug in converting of old isdn configuration (bug #55083) -- some hacks for ASUS COM ISDNLink ISA PnP - -* Tue Aug 28 2001 Than Ngo <than(a)redhat.com> 3.1-46 -- some hacks for Teles 16.3 PnP -- fix order of isdn script - -* Tue Aug 21 2001 Than Ngo <than(a)redhat.com> 3.1-45 -- fix bug #52044 - -* Wed Aug 8 2001 Than Ngo <than(a)redhat.com> -- use hardlinks instead softlinks - -* Mon Jul 02 2001 Than Ngo <than(a)redhat.com> -- make isdnctrl executable by normal users (Bug #30803) -- fix a minor bug in triggerpostun -- fix rebuild problem in beehive if kernel-source is missed - -* Tue Jun 26 2001 Than Ngo <than(a)redhat.com> -- split package into isdn4k-utils, isdn4k-utils-vboxgetty, xisdnload -- convert old isdn configuration format into new format -- add startup script for loading module and starting isdnlog - -* Tue Jun 19 2001 Than Ngo <than(a)redhat.com> -- buildprereq: XFree86-devel ncurses-devel tcl (Bug #45048) - -* Tue Jun 19 2001 Than Ngo <than(a)redhat.com> -- fix to build against kernel-2.4.5 -- fix to build against XFree86-4.1.x -- exclude s390, s390x - -* Mon Feb 12 2001 Than Ngo <than(a)redhat.com> -- clean up specfile - -* Sat Feb 10 2001 Than Ngo <than(a)redhat.com> -- fixed for building against new glibc -- added missing files: divertctrl, eiconctrl, actctrl - -* Thu Feb 08 2001 Than Ngo <than(a)redhat.com> -- fixed file conflicts - -* Wed Feb 07 2001 Than Ngo <than(a)redhat.com> -- updated ipppd, isdnctrl for working with kernel-2.4 -- added missing BuildRequires - -* Tue Feb 06 2001 Than Ngo <than(a)redhat.com> -- rebuild against to fix version mismatch in isdnlog - -* Mon Nov 20 2000 Than Ngo <than(a)redhat.com> -- rebuilt to fix bad dir perms - -* Wed Nov 01 2000 Than Ngo <than(a)redhat.com> -- added ibod, a ISDN MPPP bandwidth on demand daemon - -* Thu Aug 3 2000 Than Ngo <than(a)redhat.de> -- add more documents -- and missing config files to isdnlog -- some fixes in vbox, isdnlog, vboxgetty -- mark ioptions as %%config(noreplace) -- add pppdcapiplugin -- add missing /sbin/ldconfig in %%post and %%postun -- fix to build on ia64 - -* Thu Jul 13 2000 Than Ngo <than(a)redhat.de> -- fix to build as nonroot - -* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com> -- automatic rebuild - -* Fri Jun 30 2000 Than Ngo <than(a)redhat.de> -- add documents in %%doc instead make install doc - -* Thu Jun 29 2000 Than Ngo <than(a)redhat.de> -- add some header files for isdn4k-utils - (don't need kernel-sources anymore) -- update to v3.1pre1 - -* Fri Jun 16 2000 Than Ngo <than(a)redhat.de> -- rebuilt for 7.0 -- FHS fixes -- fix dependencies problem with new tcltk -- fix to built with kernel-2.4 - -* Fri Apr 28 2000 Florian La Roche <Florian.LaRoche(a)redhat.com> -- add /usr/lib/isdn to filelist - -* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero(a)redhat.com> -- fix compilation with kernel 2.4.x -- rebuild with new ncurses and Tcl -- enable building of eurofile and divertctl stuff - -* Tue Mar 7 2000 Jeff Johnson <jbj(a)redhat.com> -- rebuild for sparc baud rates > 38400. - -* Tue Feb 29 2000 Ngo Than <than(a)redhat.de> -- move isdn.init in isdn4k-utils package to isdn-config package - -* Mon Feb 21 2000 Ngo Than <than(a)redhat.de> -- added small to fix problem for startup and shuttdown isdn - -* Wed Feb 16 2000 Ngo Than <than(a)redhat.com> -- added small patch for ipppd, it can handle default route - -* Fri Feb 11 2000 Florian La Roche <Florian.LaRoche(a)redhat.com> -- remove execute bit from /etc/ppp/ioptions -- do not create /dev/isdnctrl if it already exists - -* Fri Feb 11 2000 Florian La Roche <Florian.LaRoche(a)redhat.com> -- remove suid-root from /usr/bin/vboxbeep - -* Fri Feb 11 2000 Florian La Roche <Florian.LaRoche(a)redhat.com> -- use relative instead of absolute link in postinstall script -- use only one patch-file for the config file -- change from 0700 to 0755 perms -- change Makefiles instead of moving things around in the spec file -- include the manpages of the X11 progs only in the xisdnload rpm - -* Thu Feb 03 2000 Ngo Than <than(a)redhat.de> -- fix pap and chap problem in isdn.init - -* Tue Feb 01 2000 Ngo Than <than(a)redhat.de> -- added new isdn.init for rhisdn. - -* Mon Jan 17 2000 Karsten Hopp <karsten(a)redhat.de> -- uses now configured network and netmask - -* Thu Jan 06 2000 Karsten Hopp <karsten(a)redhat.de> -- Configures DNS if no nameserver entry in resolv.conf -- needed for dial-on-demand - -* Mon Jan 03 2000 Karsten Hopp <karsten(a)redhat.de> -- isdnconfig moved into separate spec-file - -* Tue Dec 21 1999 Karsten Hopp <karsten(a)redhat.de> -- updated isdn4k-utils -- several bugfixes isdnconfig - -* Thu Sep 30 1999 Karsten Hopp <karsten(a)redhat.de> -- added isdnconfig script and related files - -* Sat Sep 25 1999 Bill Nottingham <notting(a)redhat.com> -- bang on init script - -* Mon Sep 20 1999 Cristian Gafton <gafton(a)redhat.com> -- fix dangling symlink - -* Mon Sep 13 1999 Bill Nottingham <notting(a)redhat.com> -- strip binaries -- chkconfig --del in %%preun, not %%postun - -* Tue Sep 07 1999 Cristian Gafton <gafton(a)redhat.com> -- fix some of the german exclusive language in the init script - -* Sun Aug 29 1999 Cristian Gafton <gafton(a)redhat.com> -- imported into Red Hat Linux diff --git a/sources b/sources deleted file mode 100644 index 8715dc0..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -45e047c31ebbdfd2865532a80393223b capiinit.8 -8b4733559b1c4de3d7716af4dbbbb354 isdn4k-utils-3.27_20151118.tar.xz diff --git a/vbox-tcl-8.6.patch b/vbox-tcl-8.6.patch deleted file mode 100644 index ed0693a..0000000 --- a/vbox-tcl-8.6.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -up isdn4k-utils-3.27_20151118/ipppd/main.c.than isdn4k-utils-3.27_20151118/ipppd/main.c ---- isdn4k-utils-3.27_20151118/ipppd/main.c.than 2015-11-18 21:13:04.575352833 +0100 -+++ isdn4k-utils-3.27_20151118/ipppd/main.c 2015-11-18 21:39:36.637385767 +0100 -@@ -1297,12 +1297,13 @@ int vfmtmsg(char *buf,int buflen,char *f - break; - case 'r': - f = va_arg(args, char *); -- a = va_arg(args, va_list); -+ va_copy(a, args); - #if defined(__alpha__) || defined(__sh__) || defined ( __arm__) /* always do this? */ - n = fmtmsg(buf, buflen + 1, f, a); - #else - n = vfmtmsg(buf, buflen + 1, f, a); - #endif -+ va_end(a); - buf += n; - buflen -= n; - continue; -diff -up isdn4k-utils-3.27_20151118/isdnlog/isdnrep/isdnrep.c.than isdn4k-utils-3.27_20151118/isdnlog/isdnrep/isdnrep.c -diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c.than isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c ---- isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c.than 2015-11-18 21:10:11.454980332 +0100 -+++ isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c 2015-11-18 21:10:53.089588917 +0100 -@@ -1134,11 +1134,11 @@ char *prefix2provider_variant(int pref - return s; - } - --inline int getNProvider( void ) { -+extern inline int getNProvider( void ) { - return nProvider; - } - --inline int isProviderBooked( int i) { -+extern inline int isProviderBooked( int i) { - return Provider[i].booked; - } - -diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/rate.h.than isdn4k-utils-3.27_20151118/isdnlog/tools/rate.h -diff -up isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c.than isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c ---- isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c.than 2015-11-18 21:45:31.798046888 +0100 -+++ isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c 2015-11-18 21:45:44.743925189 +0100 -@@ -4,6 +4,8 @@ - ** Copyright 1996-1998 Michael 'Ghandi' Herold <michael(a)abadonna.mayn.de> - */ - -+#define USE_INTERP_ERRORLINE -+ - #ifdef HAVE_CONFIG_H - # include "../config.h" - #endif -diff -up isdn4k-utils-3.27_20151118/vbox/Makefile.in.than isdn4k-utils-3.27_20151118/vbox/Makefile.in ---- isdn4k-utils-3.27_20151118/vbox/Makefile.in.than 2015-11-18 21:51:41.090575154 +0100 -+++ isdn4k-utils-3.27_20151118/vbox/Makefile.in 2015-11-18 21:52:12.312281654 +0100 -@@ -53,7 +53,7 @@ INSTALL_DIRS = @INSTALL@ -d - #----------------------------------------------------------------------------# - - CC = @CC@ --VBOX_CFLAGS = @CFLAGS@ @LINK_NCURSES_INCL@ @LINK_TCL_INCL@ -Wall -fno-strict-aliasing -fpie -+VBOX_CFLAGS = -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE @CFLAGS@ @LINK_NCURSES_INCL@ @LINK_TCL_INCL@ -Wall -fno-strict-aliasing -fpie - LDFLAGS = @LDFLAGS@ -pie - - #----------------------------------------------------------------------------# -diff -up isdn4k-utils-3.27_20151118/vbox/src/script.c.than isdn4k-utils-3.27_20151118/vbox/src/script.c ---- isdn4k-utils-3.27_20151118/vbox/src/script.c.than 2015-11-18 21:40:49.833697651 +0100 -+++ isdn4k-utils-3.27_20151118/vbox/src/script.c 2015-11-18 21:45:17.911177444 +0100 -@@ -4,6 +4,9 @@ - ** Copyright (C) 1996, 1997 Michael 'Ghandi' Herold - */ - -+#define USE_INTERP_RESULT -+#define USE_INTERP_ERRORLINE -+ - #include "config.h" - - #if TIME_WITH_SYS_TIME

1 0

Architecture specific change in rpms/isdn4k-utils.git
by githook-noreply＠fedoraproject.org 25 Sep '19

25 Sep '19

The package rpms/isdn4k-utils.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/isdn4k-utils.git/commit/?id=d4d3819…. Change: -ExcludeArch: s390 s390x Thanks. Full change: ============ commit d4d38192af4d131912f2e6794c14972611e01452 Author: Than Ngo <than(a)redhat.com> Date: Wed Sep 25 13:32:11 2019 +0200 isdn4k-utils is retired because upstream is dead and isdn support is dropped in kernel-5.3 and later diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f8c9d38..0000000 --- a/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -ibod-1.4-src.tar.gz -isdn4k-utils-CVS-2003-09-23.tar.bz2 -kernel-header-2.4-1.tar.bz2 -libpcap-0.7.2.tar.gz -isdn4k-utils-CVS-2004-11-18.tar.bz2 -isdn-header-1.tar.bz2 -isdn4k-utils-CVS-2005-02-16.tar.bz2 -isdn4k-utils-CVS-2005-03-09.tar.bz2 -isdn4k-utils-CVS-2006-02-13.tar.bz2 -isdn4k-utils-ppp-2.4.4.tar.bz2 -isdn4k-utils-CVS-2006-07-20.tar.bz2 -isdn4k-utils-CVS-2009-10-20.tar.bz2 -isdn4k-utils-CVS-2009-10-20-patched.tar.bz2 -isdn4k-utils-CVS-2010-05-01-patched.tar.bz2 -/isdn4k-utils-3.27_20151118.tar.xz diff --git a/40-isdn.rules b/40-isdn.rules deleted file mode 100644 index 1a31cb6..0000000 --- a/40-isdn.rules +++ /dev/null @@ -1,4 +0,0 @@ -# do not edit this file, it will be overwritten on update - -SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", GROUP="dialout" -SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n" diff --git a/capi.service b/capi.service deleted file mode 100644 index 32d42f0..0000000 --- a/capi.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Capi services for passiv ISDN cards -After=syslog.target - -[Service] -ExecStart=/sbin/capiinit start -ExecStop=/sbin/capiinit stop - -[Install] -WantedBy=multi-user.target diff --git a/capi20.conf b/capi20.conf deleted file mode 100644 index c0ac223..0000000 --- a/capi20.conf +++ /dev/null @@ -1,18 +0,0 @@ -# libcapi20 features autodetection of connected CAPI -# devices. In case you need to select a special device -# use the remote configuration file: -# ~/.capi20rc -# if it doesn't exist look for -# /etc/capi20.conf -# -# To set the remote machine, the above file need to have -# the following line -# REMOTE <driver> <remote hostname|ip-address> <remote port> -# -# Drivers: -# * fritzbox - Remote CAPI via FRITZ!Box -# * rcapi - Melware Remote CAPI -# -# If this doesn't exist, the library tries the old, normal way -# of using the local /dev/isdn/capi20. -# REMOTE fritzbox 192.168.178.1 5031 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5b76589 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +isdn4k-utils is retired because upstream is dead and isdn support is dropped in kernel-5.3 and later diff --git a/isdn-manpages.patch b/isdn-manpages.patch deleted file mode 100644 index 5818f44..0000000 --- a/isdn-manpages.patch +++ /dev/null @@ -1,654 +0,0 @@ ---- isdn4k-utils/ipppd/ipppd.man.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/ipppd/ipppd.man.in 2013-11-23 13:31:33.804345614 +0100 -@@ -133,7 +133,7 @@ - .TP - .B callback \fI<string> - Request the peer to call back at the location given in --<string>. Ususally this is a phone number, but it may be interpreted -+<string>. Usually this is a phone number, but it may be interpreted - differently (or ignored) depending on the \fBcallback-type\fR option. - If <string> is the empty string, \fIipppd\fR automatically tries to - negotiate a callback type that does not need a location to be specified. -@@ -332,7 +332,7 @@ - .TP - .B ipx-routing \fI<n> - Set the routing protocol to be received by this option. Use a --comma-serperated list if you want to specify more than one -+comma-separated list if you want to specify more than one - protocol. - The '\fInone\fR' - option (0) may be specified as the only instance of ipx-routing. The -@@ -367,7 +367,7 @@ - send before it rejects the options. The default value is 3. - .TP - .B ipxcp-max-terminate \fI<n> --Set the maximum nuber of IPXCP terminate request frames before the -+Set the maximum number of IPXCP terminate request frames before the - local system considers that the peer is not listening to them. The - default value is 3. - .TP -@@ -562,7 +562,7 @@ - protocols must be loaded or this option will be ignored. - .TP - .B -pred1comp --Do not accept Predictor-1 comprssion, even if the peer wants to send -+Do not accept Predictor-1 compression, even if the peer wants to send - this type of compression and support has been defined in the kernel. - .TP - .B proxyarp ---- isdn4k-utils/avmb1/avmcapictrl.man.in.manpages 2013-11-23 13:31:33.803345638 +0100 -+++ isdn4k-utils/avmb1/avmcapictrl.man.in 2013-11-23 13:33:55.238895248 +0100 -@@ -73,7 +73,7 @@ - point to point - .br - .I DN1:SPID1 DN2:SPID2 --is for the american protocols 5ESS and NI1. -+is for the North American 5ESS and NI1 protocols. - .LP - .TP 5 - .B reset [contrnr] ---- isdn4k-utils/pppdcapiplugin/capiplugin.8.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/pppdcapiplugin/capiplugin.8 2013-11-23 13:36:27.374183518 +0100 -@@ -35,12 +35,12 @@ - In this case, the party called has to reject the call and call back soon. - When using dial-on-demand it is possible let both parties setup the connection, - that means while the pppd is in dial-on-demand mode not only an outgoing --paket but also an incoming call can trigger the connection setup. This -+packet but also an incoming call can trigger the connection setup. This - can also combined with callback to assign the cost to one side only (COSO). - - .SH PPPD VERSIONS - .LP --The plugin interface of the pppd is binary incompartible between different -+The plugin interface of the pppd is binary incompatible between different - version of the pppd. So you need a different capiplugin for every version - of the pppd. The different plugins will be in the directory - /usr/lib/ppp/\fI<pppd-version>\fR. -@@ -55,7 +55,7 @@ - set up a connection and sets the global variable devnam. - The capiplugin will register a timer function that is - called every second to handle the CAPI messages while pppd is running. --To notify pppd when CAPI messages arrive, the CAPI file desciptor -+To notify pppd when CAPI messages arrive, the CAPI file descriptor - is added to the list of file descriptors which the pppd monitors for input. - Once the connection is set up the pppd will start PPP negotiation - on device devnam. When the pppd enters the DEAD phase, the connection will -@@ -63,7 +63,7 @@ - When operating in dial-on-demand mode with wakeup on incoming calls, - in phase DORMANT the plugin will setup CAPI2.0 to accept incoming calls. - To wakeup pppd when an incoming call arrives, the plugin will generate --an UDP paket to the discard port (9) of the gateway, so don't filter this paket -+an UDP packet to the discard port (9) of the gateway, so don't filter this packet - or wakeup by incoming a call will not work. - - .SH MODES OF OPERATION -@@ -258,7 +258,7 @@ - - .TP - .B clicb --The option is retained for compartiblity reasons only. -+The option is retained for compatibility reasons only. - Use option \fIcoso local\fR or \fIcoso remote\fR instead. - .br - Enable callback mode. -@@ -273,7 +273,7 @@ - before PPP negotiation starts. Default value is 0 seconds. - This option is useful when connecting with protocol \fImodem\fR. - Some Internet access servers will hang up if they receive data --immediatly after the connection is established. -+immediately after the connection is established. - - .TP - .B controller \fI<controller specification> -@@ -298,7 +298,7 @@ - .TP - .B coso remote - The costs are assigned to the remote party. --On an outcoming call the remote party will reject the call and callback. -+On an outgoing call the remote party will reject the call and callback. - - .TP - .B dialmax \fI<times> -@@ -572,10 +572,10 @@ - .LP - Do not provide option \fIcli\fR to the capiplugin. - Start a pppd for every b channel. --Authorization is checked using PAP or CHAP and the ip numbers are assigned -+Authorization is checked using PAP or CHAP and the IP addresses are assigned - according to the /etc/ppp/pap-secrets or /etc/ppp/chap-secrets file. --Assume that the server has ip number 192.168.0.1, the clients are --to be assigned the ip numbers starting from 192.168.0.2, and the hostname of the -+Assume that the server has IP address 192.168.0.1, the clients are -+to be assigned IP addresses starting from 192.168.0.2, and the hostname of the - server is "dialinserver". - Add these two lines to the /etc/inittab file: - .IP -@@ -610,8 +610,8 @@ - \fIinmsn\fR, \fIcli\fR and \fIprotocol\fI. - .LP - Start a pppd for every client. --Assume that the server has ip number 192.168.0.1 and the clients are to be --assigned the ip numbers starting from 192.168.0.2. -+Assume that the server has IP address 192.168.0.1 and the clients are to be -+assigned IP addresses starting from 192.168.0.2. - Add these three lines to the /etc/inittab file: - .IP - p0:23:respawn:/usr/sbin/pppd call incoming-cli cli 04711 192.168.0.1:192.168.0.2 -@@ -641,8 +641,8 @@ - and call back. - .LP - Start a pppd for every client. --Assume that the server has ip number 192.168.0.1 and the clients are to be --assigned the ip numbers starting from 192.168.0.2. -+Assume that the server has IP address 192.168.0.1 and the clients are to be -+assigned IP addresses starting from 192.168.0.2. - Add these three lines to the /etc/inittab file. - .IP - p0:23:respawn:/usr/sbin/pppd call incoming-cli cli 04711 cbnumber 4711 192.168.0.1:192.168.0.2 -@@ -666,8 +666,8 @@ - - .SH EXAMPLE OF A LEASED LINE CONNECTION WITH HDLC - .LP --Assume that the server has ip number 192.168.0.1 and the peer has --the ip number 192.168.0.2. -+Assume that the server has IP address 192.168.0.1 and the peer has -+the IP address 192.168.0.2. - Add this line to the /etc/inittab file: - .IP - p0:23:respawn:/usr/sbin/pppd call leased-hdlc controller 1 channels 1 192.168.0.1:192.168.0.2 -@@ -699,8 +699,8 @@ - - .SH EXAMPLE OF A LEASED LINE CONNECTION WITH V42BIS - .LP --Assume that the server has ip number 192.168.0.1 and the peer has --the ip number 192.168.0.2. -+Assume that the server has IP address 192.168.0.1 and the peer has -+the IP address 192.168.0.2. - Add this line to the /etc/inittab file for server 1 (192.168.0.1): - .IP - p0:23:respawn:/usr/sbin/pppd call leased-v42bis controller 1 channels 1 192.168.0.1:192.168.0.2 ---- isdn4k-utils/isdnctrl/isdnctrl.man.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnctrl/isdnctrl.man.in 2013-11-23 13:31:43.582106889 +0100 -@@ -39,17 +39,13 @@ - interface - .IR name " to the kernel. If " name - is omitted, the kernel will use --.BI eth X, --where --.I X --is an increasing number starting from 0. This is probably not useful with --.SM ISDN --so using a name like -+.BI ethX, -+where X is an increasing number starting from 0. This is not ideal so providing a name such as - .B isdn0 - (for raw ip interfaces) or - .B ippp0 - (for synchronous PPP interfaces) --is always recommended. -+is strongly recommended. - .TP - .BI delif " name " [force] - Removes the -@@ -66,7 +62,7 @@ - .B reset [force] - Removes all - .SM ISDN --interfaces from the kernel if it is possible. If the optional keyword -+interfaces from the kernel if possible. If the optional keyword - .B force - is appended, - .BR isdnctrl " executes" -@@ -74,9 +70,9 @@ - before removing an interface. - .TP - .BI ifdefaults " name " --resets the interface -+resets interface - .IR name --to some reasonable defaults. -+to reasonable defaults. - .TP - .BI dialmode " name " [ off | manual | auto ] - Sets the dial mode of the interface to one of: -@@ -85,7 +81,7 @@ - .B off - .br - no connection can be made; an existing connection is terminated immediately. --Incoming connections are also not possible. -+Also, incoming connections are not possible. - .LP - .B manual - .br -@@ -145,7 +141,7 @@ - .B isdnctrl addphone - repeatedly. If more than one number is set, these will be tried - one after another (the last added number is tried first, etc.). --When using a german SPV-type connection, -+When using a German SPV-type connection, - the number has to be prefixed by a capital S. - .TP - .BI addphone " name " in " num" -@@ -357,7 +353,7 @@ - .I encapsulation - is omitted, the current setting is printed. - .TP --.BI l2_prot " name " [ protocol ] -+.BI l2_prot " name " [protocol] - Set the layer-2 protocol for interface - .IR name . - Possible values for -@@ -368,7 +364,7 @@ - .I protocol - is omitted the current setting is printed. - .TP --.B l3_prot " name " [ protocol ] -+.B l3_prot " name " [protocol] - Set the layer-3 protocol for interface - .IR name . - At the moment only -@@ -385,7 +381,7 @@ - .I name - is - .BR all , --then all interfaces are listed. -+all interfaces are listed. - .TP - .BI status " name" - Show the connection status for interface ---- isdn4k-utils/isdnctrl/.isdnctrl_conf.man.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnctrl/.isdnctrl_conf.man.in 2013-11-23 13:31:43.582106889 +0100 -@@ -81,14 +81,14 @@ - CBDELAY = 5 - .TP 5 - .BI "DIALMAX = " num --Set the number of dial atempts to -+Set the number of dial attempts to - .IR num . - - .B Example: - DIALMAX = 1 - .TP 5 - .BI "HUPTIMEOUT = " seconds --Set the hanguptime to -+Set the hangup time to - .IR seconds . - - .B Example: -@@ -168,7 +168,7 @@ - .BI "PPPBIND = " num - Binds the current interface to the ippp device - .BI /dev/ippp X . --This works only for syncronous ppp. -+This works only for synchronous PPP. - The value must be a number. - - .B Example: ---- isdn4k-utils/isdnlog/isdnconf/isdnconf.1.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/isdnconf/isdnconf.1.in 2013-11-23 13:31:43.582106889 +0100 -@@ -25,10 +25,10 @@ - - You can use this program to build your own phonebook. These files are - used by many of the other ISDN utilities that use phone numbers, to --display a number symbolicly instead of as a plain number. -+display a number symbolically instead of as a plain number. - - .SH OPTIONS --Note: usage of the options -A and -D is dangerous! The -+Note: use of the options -A and -D is dangerous! The - complete structure of the file may be changed, and all comments are - removed! Make backups of your data files before trying these. - -@@ -37,7 +37,7 @@ - .TP 4 - .B \-A - Add a new entry, which is read from standard input. The following --values are asked for (here with examples): -+values are asked for (shown here with examples): - .RS - .nf - -@@ -54,7 +54,7 @@ - Time: 8-20 - Flags: (control-D here indicates end of flags) - --Alias: (control-D here indicated end of entries) -+Alias: (control-D here indicates end of entries) - - .fi - If you want another [Flags] entry, simply enter the data for another -@@ -64,7 +64,7 @@ - If you want to add another number, simply enter the data for the next - number at the Alias prompt. - --You can also pipe the data into this program; the input data then must -+You can also pipe the data into the program; the input data must - correspond to the prompts that the program gives! Note that you can - only add one number at a time then (there's no way of telling - .I isdnconf -@@ -93,7 +93,7 @@ - will display entries which match the data given. - - .B DATA OPTIONS: --(none applicable for -A) -+(not applicable for -A) - .TP 4 - .B \-n 'number' - number: match the given number. It can contain wildcards. ---- isdn4k-utils/isdnlog/tools/isdnrate.man.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/isdnrate.man 2013-11-23 13:31:43.583106864 +0100 -@@ -1,7 +1,7 @@ - .\" CHECKIN $Date: 2004/07/13 21:44:20 $ - .TH ISDNRATE 1 "@MANDATE@" -lt- - .SH NAME --isdnrate \- Print telefon rates and various info from rate\-files(5). -+isdnrate \- Print telephone rates and various info from rate\-files(5). - .SH SYNOPSIS - .BI "isdnrate \-b" best " \-d" day " \-f" from " \-h" hour " \-l" len - .B \-o -@@ -18,14 +18,14 @@ - .SH DESCRIPTION - The - .B isdnrate --program prints various information from rate\-files(5). It's main purpose --is the calculation of telefon rates from your location to an arbitrary -+program prints various information from rate\-files(5). Its main purpose -+is the calculation of telephone rates from your location to an arbitrary - destination at a certain time and of a certain length for all the providers in a rate\-file. - .P - .SS - .B NUMBER - .P --A telefon number may be -+A telephone number may be - .IP - .B 1234 - a local area number -@@ -51,7 +51,7 @@ - .B -s - is also given). - .P --Note that currently only city names in AT, DE, NL are supported plus some international capitals. -+Note that currently only city names in AT, DE and NL are supported plus some international capitals. - .br - Note also, spaces in country- or service names may be given as underscores. - .SS -@@ -88,7 +88,7 @@ - Default is now. - .P - .BI \-f from --Callers location. Default ist from -+Callers location. Default is from - .IR isdn.conf . - .P - .BI \-h hour -@@ -102,7 +102,7 @@ - .IR isdn.conf . - .P - .BI \-l len --Length of call in second. Default value is 153 secs. -+Length of call in seconds. Default is 153 seconds. - .P - .B \-o - Show only booked providers. These are providers, which are listed in -@@ -118,8 +118,8 @@ - for business providers. - .P - \fB\-r\fPv\fINN\fP --Show only providers whose vbn begins with \fINN\fP. --The vbn is also known as provider prefix consisting of VBN and provider number. -+Show only providers whose VBN begins with \fINN\fP. -+The VBN is also known as provider prefix consisting of VBN and provider number. - .P - .B \-s - Consider -@@ -141,7 +141,7 @@ - .B DISPLAY AND RUN OPTIONS - .P - .B \-C --Connect to a running isdnrate daemon. This avoids long startup times. -+Connect to a running isdnrate daemon. This avoids long start-up times. - .P - .B \-D - Start as a daemon, waiting for connections from a client. The socket -@@ -231,8 +231,8 @@ - .br - shows the rate for provider 1 and the cheapest rate to this service. - .P --Note: Various output options may not be used together. If you gave conflicting --options you'll see a warning. -+Note: Various output options may not be used together. Conflicting -+options will produce a warning. - .br - Note also: Sort by name or providernumber and - .BI -b best -@@ -242,7 +242,7 @@ - .br - And finally: Some options like - .IR \-X50 ", " \-X51 ", " \-X52 ", " \-D ", " \-V --don't require a telefon -+don't require a telephone - .IR NUMBER . - .SH FILES - .IR rate-CC.dat , -@@ -280,7 +280,9 @@ - .I isdnrate -CX -p1_2,24 +1 - .br - Show rates and zones for destination USA for providers --.IR "1_2 " and " 24" . -+.IR "1, 2" -+and -+.IR "24" . - .P - .I isdnrate -C -l60 -rv010 HAM - .br -@@ -302,7 +304,7 @@ - .br - Show rates and numbers for service - .I Internet --for a 1 minutes call. -+for a 1 minute call. - .P - .I isdnrate -CZ 19430 - .br ---- isdn4k-utils/isdnlog/isdnlog/isdn.conf.5.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/isdnlog/isdn.conf.5.in 2013-11-23 13:31:43.582106889 +0100 -@@ -124,7 +124,7 @@ - - .TP - .B REBOOTCMD --Isdnlog can use this command to reboot linux (when all else fails). -+Isdnlog can use this command to reboot Linux (when all else fails). - Default value is "@REBOOTCMD@". Optional. - - .TP ---- isdn4k-utils/isdnlog/isdnlog/isdnlog.8.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/isdnlog/isdnlog.8.in 2013-11-23 13:31:43.583106864 +0100 -@@ -107,7 +107,7 @@ - - .TP - .B \-i\fIx\fB internS0="value" --Telefon number shorter then -+Telephone numbers shorter then - .I value - are considered to be internal numbers on your PABX. - -@@ -425,7 +425,7 @@ - This needs a kernel patch to work. If the kernel patch is not found - a simulation is done. - .br --Note: depending on your telefon provider local area calls may or may not -+Note: depending on your telephone provider local area calls may or may not - be routed to alternate providers. - For changing the ISP a script is called. s. next option 'providerchange' - ---- isdn4k-utils/isdnlog/isdnrep/isdnrep.1.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/isdnrep/isdnrep.1.in 2013-11-23 13:31:43.583106864 +0100 -@@ -4,7 +4,7 @@ - - .PD 0 - .SH NAME --isdnrep \- report isdn activity -+isdnrep \- report ISDN activity - - .SH DESCRIPTION - Isdnrep reads the isdnlog log files, generates reports, does statistics, -@@ -95,12 +95,12 @@ - - .TP - .B \-v verbose --Display warnings on startup. -+Display warnings on start-up. - - .TP - .B \-c ignore default options - Do not append the "REPOPTIONS" setting from @I4LCONFDIR@/@CONFFILE@ --to the commandline. -+to the command line. - - .TP - .B \-p [n][m]'number'[,[m]'number'...] phonenumber -@@ -171,13 +171,13 @@ - .RE - .sp - This will display all calls on Tuesdays, Wednesdays, or Thursdays --that are no holidays with a start time between 09:00 and 12:00 or -+that are not holidays with a start time between 09:00 and 12:00 or - 15:00 and 17:00. - - .TP - .B \-u unknown caller - At the end of the report, all numbers not aliased in callerid.conf or --~/.isdn are displayed. This option is not available when HTML output -+~/.isdn are displayed. This option is unavailable when HTML output - is requested. - - .TP -@@ -389,7 +389,7 @@ - and can be used with - .B -Fshort. - --Without showing the transfered bytes, this string also fits into 80 chars: -+Without showing the transferred bytes, this string also fits into 80 chars: - .sp - .RS - " %X %D %16.16H %T %-25.25F %U" -@@ -509,18 +509,18 @@ - .RE - .fi - --The package NAS (Network Audio System) may be needed. -+The NAS (Network Audio System) package may be needed. - - Now, when the browser is started, it will recognize WAV files and start --the corresponding program to handle these. The WAV format has been chosen --as this can also be played from a Windows pc. -+the corresponding program to handle them. The WAV format has been chosen -+as it can also be played from a Windows PC. - - - .cu - faxes received by mgetty - - When %G is used in the isdnrep output format, any faxes received by mgetty --will be accessible via a HTML link, in the same manner as the ansering -+will be accessible via a HTML link, in the same manner as the answering - machine messages. - - For the faxes the following entry in the [ISDNLOG] section in isdn.conf -@@ -594,7 +594,7 @@ - already installed if you want to use this feature :-) - - The advantage of the JPEG format is that it can also be displayed by --a browser running on a Windows pc. -+a browser running on a Windows PC. - - .cu - summary -@@ -674,7 +674,7 @@ - there was no connection, as the called party didn't pick up the phone - .TP - (5) --"the number you have dialled is not connected. Hang up and dial again. ..." -+"the number you have dialed is not connected. Hang up and dial again. ..." - .TP - (6) - total time for incoming calls ---- isdn4k-utils/doc/isdnctrl.man.in.manpages 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/doc/isdnctrl.man.in 2013-11-23 13:31:43.582106889 +0100 -@@ -48,10 +48,10 @@ - Create a slave interface. - .RS - Creates a slave interface for RAW-device channel-bundling. --These devices behave like network-interfaces, execpt they -+These devices behave like network-interfaces, except they - are invisible to user. Only - .SM ISDN --parameters can be controlled, but no IP-parameters. IP-parameters -+parameters can be controlled, not IP-parameters. IP-parameters - are inherited from the corresponding master-device. - .TP - Argument: -@@ -81,7 +81,7 @@ - .I arg - should point to a zero terminated string of max. 10 characters - naming an existing interface which will be deleted. If the interface --is a master interface, all it's slave-interfaces will be deleted also. -+is a master interface, all its slave-interfaces will be deleted also. - .TP - Return: - On success, the call returns 0. On failure, an error code is returned. -@@ -98,7 +98,7 @@ - .TP - Argument: - .I arg --shoud point to a -+should point to a - .I struct isdn_net_ioctl_cfg - (defined in linux/isdn.h) - .TP -@@ -117,7 +117,7 @@ - .TP - Argument: - .I arg --shoud point to a -+should point to a - .I struct isdn_net_ioctl_cfg - (defined in linux/isdn.h) which will be filled by the current setup. - .TP -@@ -135,7 +135,7 @@ - .TP - Argument: - .I arg --shoud point to a -+should point to a - .I struct isdn_net_ioctl_phone - which contains necessary information. - .TP -@@ -153,7 +153,7 @@ - .TP - Argument: - .I arg --shoud point to a -+should point to a - .I struct isdn_net_ioctl_phone - which contains necessary information. - .TP -@@ -172,7 +172,7 @@ - .TP - Argument: - .I arg --shoud point to a a union of -+should point to a union of - .I struct isdn_net_ioctl_phone - and a buffer, large enough to hold a concatenated list of - strings containing the phone numbers. -@@ -457,7 +457,7 @@ - filled correctly. The arg component inside isdn_ioctl_struct is - handed down to the driver's ioctl function. Its meaning is not - defined here and depends on the lowlevel driver. See documentation --for the various lewlevel drivers for information about driver- -+for the various lowlevel drivers for information about driver- - specific ioctl. - .TP - Return: diff --git a/isdn-nofirmware.patch b/isdn-nofirmware.patch deleted file mode 100644 index 0d35f8c..0000000 --- a/isdn-nofirmware.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- isdn4k-utils/icn/Makefile.in.nofw 2013-11-23 18:55:13.780774825 +0100 -+++ isdn4k-utils/icn/Makefile.in 2013-11-23 18:55:13.800774324 +0100 -@@ -49,9 +49,6 @@ - - install-data: - mkdir -p $(DESTDIR)$(DATADIR) -- $(INSTALL_DATA) firmware/loadpg.bin $(DESTDIR)$(DATADIR)/loadpg.bin -- $(INSTALL_DATA) firmware/pc_eu_ca.bin $(DESTDIR)$(DATADIR)/pc_eu_ca.bin -- $(INSTALL_DATA) firmware/pc_1t_ca.bin $(DESTDIR)$(DATADIR)/pc_1t_ca.bin - - install-man: $(PROGRAM).man - mkdir -p $(DESTDIR)$(MAN8DIR) ---- isdn4k-utils/hisax/Makefile.in.nofw 2013-11-23 18:58:57.654318661 +0100 -+++ isdn4k-utils/hisax/Makefile.in 2013-11-23 18:59:17.007847228 +0100 -@@ -44,8 +44,6 @@ - install: $(PROGRAMS) $(MANPAGES) - mkdir -p $(DESTDIR)$(SBINDIR) - $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(SBINDIR) -- mkdir -p $(DESTDIR)$(DATADIR) -- $(INSTALL_DATA) ISAR.BIN $(DESTDIR)$(DATADIR)/ISAR.BIN - mkdir -p $(DESTDIR)$(MAN8DIR) - $(INSTALL_MAN) $(MANPAGES) $(DESTDIR)$(MAN8DIR) - diff --git a/isdn.init b/isdn.init deleted file mode 100755 index 6ea2a69..0000000 --- a/isdn.init +++ /dev/null @@ -1,283 +0,0 @@ -#! /bin/bash -# -# chkconfig: 2345 9 91 -# description: start and stop ISDN services -# - -PATH=/bin:/sbin:/usr/bin:/usr/sbin - -# Check that we're a privileged user -[ `id -u` = 0 ] || exit 4 - -[ -x /sbin/isdnctrl ] || exit 5 - -# source function library -. /etc/init.d/functions - -test -f /etc/sysconfig/isdncard || exit 6 -. /etc/sysconfig/isdncard - -if [ -z "$MODULE" -o -z "$RESOURCES" ]; then - exit 6 -fi - -# disable debug as default -IBOD=no -RETVAL=0 -sync_devices=0 -raw_devices=0 -PCMCIA=no -COMPRESSION=7 - -# check PCMCIA -if [ "$RESOURCES" = "NONE" ] ; then - PCMCIA=yes -fi - -function isapnp() -{ - [ -f /proc/isapnp ] || return - [ -f /proc/bus/isapnp/devices ] || return - - found=0 - - eval $RESOURCES >/dev/null 2>&1 - if [ -z "$VENDOR_ID" -o -z "$DEVICE_ID" ] ; then - case "$type" in - 12) VENDOR_ID="ASU1690" # ASUS COM ISDNLink ISA PnP - DEVICE_ID="ASU1690" - ;; - 14) VENDOR_ID="TAG2610" # Teles 16.3c PnP - DEVICE_ID="TAG2610" - ;; - 7) VENDOR_ID="ELS0133" # Elsa Quickstep 1000 PnP - DEVICE_ID="ELS0133" - ;; - *) return - ;; - esac - fi - - # get isapnp infos - id_list="$(cat /proc/bus/isapnp/devices 2>/dev/null | while read dummy id dummy ; do echo $id ; done)" - for i in $id_list ; do - _vendor_id="$(echo $i | cut -b1-7)" - _device_id="$(echo $i | cut -b8-)" - if [ "$VENDOR_ID" = "$_vendor_id" -a "$DEVICE_ID" = "$_device_id" ] ; then - found=1 - break - fi - done - - [ "$found" = "1" ] || return - - card="card 0 $VENDOR_ID" - dev="dev 0 $DEVICE_ID" - [ -n "$io" ] && port0="port 0 $io" - [ -n "$io1" ] && port1="port 1 $io1" - [ -n "$io2" ] && port2="port 2 $io2" - [ -n "$irq" ] && irq="irq 0 $irq" - [ -n "$mem" ] && memory="memory 0 $mem" - - case "$1" in - activate) activate_isapnp ;; - deactivate) deactivate_isapnp ;; - *) return - esac -} - -function activate_isapnp() -{ - [ ! -f /var/lock/subsys/isapnp_isdn ] || return - - str='' - for i in "$card" "$dev" "$port0" "$port1" "$port2" "$memory" "$irq" ; do - [ -n "$i" ] || continue - str="$str$i\n" - done - - [ -n "$str" ] || return - - echo -e "${str}activate" >/proc/isapnp - touch /var/lock/subsys/isapnp_isdn -} - -function deactivate_isapnp() -{ - echo -e "$card\n$dev\ndeactivate" >/proc/isapnp - rm -f /var/lock/subsys/isapnp_isdn -} - -function load_modules() -{ - isdn_path="/lib/modules/$(uname -r)/kernel/drivers/isdn" - if [ -f $isdn_path/isdn_lzscomp.o -o -f $isdn_path/isdn_lzscomp.ko ] ; then - modprobe isdn_lzscomp comp=$COMPRESSION debug=0 > /dev/null 2>&1 - fi - - [ "$PCMCIA" = "no" ] || return - - modprobe $MODULE $RESOURCES > /dev/null 2>&1 - isdnctrl list all >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - action $"Loading ISDN modules" /bin/true - touch /var/lock/subsys/isdn - else - action $"Loading ISDN modules" /bin/false - modprobe -r $MODULE > /dev/null 2>&1 - fi -} - -function remove_modules() -{ - modprobe -r isdn_lzscomp >/dev/null 2>&1 - - # Unload hisax modules - [ "$PCMCIA" = "no" ] || return - - if lsmod | grep "^$MODULE" >/dev/null 2>&1 ; then - action $"Unloading ISDN modules" modprobe -r $MODULE - rm -f /var/lock/subsys/isdn - fi -} - -function load_firmware() -{ - # loading firmware - if [ -n "$FIRMWARE" ] ; then - $FIRMWARE >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - action $"Loading Firmware" /bin/true - else - action $"Loading Firmware" /bin/false - fi - fi -} - -function start_isdnlog() -{ - # don't start isdnlog, if the ISDN card requires the firmware - [ -z "$FIRMWARE" ] || return - prog="isdnlog" - if [ "$MODULE" = "hisax" ] ; then - driverid="HiSax" - elif [ "$MODULE" = "hisax_fcpcipnp" ] ; then - driverid="fcpcipnp0" - else - return - fi - - if ! hisaxctrl $driverid 1 0x3ff >/dev/null 2>&1 ; then - return - fi - if [ -f /etc/isdn/isdnlog.option ] ; then - daemon /sbin/isdnlog /dev/isdnctrl0 -D -f /etc/isdn/isdnlog.option - else - daemon /sbin/isdnlog /dev/isdnctrl0 -x0x3fff -M -w2 -S -D -s -O+/var/log/isdnctrl - fi - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - action $"Starting $prog" /bin/true - touch /var/lock/subsys/isdnlog - else - action $"Starting $prog" /bin/false - fi -} - -function stop_isdnlog() -{ - prog="isdnlog" - echo -n $"Shutting down $prog" - killproc isdnlog - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && /bin/rm -f /var/lock/subsys/isdnlog -} - -function makedev() -{ - if [ -x /sbin/MAKEDEV ] ; then - if ! /bin/ls /dev/isdn* /dev/ippp* >/dev/null 2>&1 ; then - /sbin/MAKEDEV isdn ippp capi - fi - fi -} - -function start() -{ - # workaround for kernel/udev (ISDN part) - makedev - - # activate ISA PnP - isapnp activate - - # load modules - load_modules - - # load firmware and setup isdn device driver - load_firmware - - # start isdn logging - start_isdnlog -} - -function stop() -{ - stop_isdnlog - remove_modules - isapnp deactivate -} - -function restart() -{ - stop - start -} - -function status() -{ - ifcfg_prefix="/etc/sysconfig/network-scripts/ifcfg-" - interfaces="$(cat /proc/net/dev 2>/dev/null | egrep "(ippp*|isdn*)" | cut -f1 -d:)" - if [ -z "$interfaces" ]; then - echo $"$0: Link is down" - return - fi - for i in $interfaces ;do - if [ -f $ifcfg_prefix$i ]; then - . $ifcfg_prefix$i - echo $"$NAME is attached to $DEVICE" - fi - done -} - -function condrestart() -{ - if [ -f /var/lock/subsys/isdn ] ; then - restart - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - condrestart) - condrestart - ;; - status) - status - ;; - *) - echo $"Usage: $0 {start|stop|restart|status|condrestart}" - RETVAL=3 -esac - -exit $RETVAL diff --git a/isdn.service b/isdn.service deleted file mode 100644 index 3442737..0000000 --- a/isdn.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=ISDN Services -Requires=syslog.target network.target - -[Service] -Type=oneshot -ExecStart=/usr/libexec/isdn start -ExecStop=/usr/libexec/isdn stop -Environment=BOOTUP=serial -Environment=CONSOLETYPE=serial -StandardError=syslog -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/isdn4k-fix-Werror-format-security-ftbfs.patch b/isdn4k-fix-Werror-format-security-ftbfs.patch deleted file mode 100644 index ce88205..0000000 --- a/isdn4k-fix-Werror-format-security-ftbfs.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/isdnlog/asn1_address.c 2006-01-15 10:08:55.000000000 -0500 -+++ isdn4k-utils-CVS-2010-05-01-patched.new/isdnlog/isdnlog/asn1_address.c 2014-01-28 16:59:10.588350961 -0500 -@@ -160,7 +160,7 @@ - XSEQUENCE_1(ParsePartyNumber, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, partyNumber); - XSEQUENCE_OPT_1(ParsePartySubaddress, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, partySubaddress); - -- str += sprintf(str, partyNumber); -+ str += sprintf(str, "%s", partyNumber); - if (strlen(partySubaddress)) - str += sprintf(str, ".%s", partySubaddress); - -@@ -191,13 +191,13 @@ - - switch (publicTypeOfNumber) { - case 0: break; // unknown -- case 1: str += sprintf(str, countryprefix); break; -- case 2: str += sprintf(str, areaprefix); break; -+ case 1: str += sprintf(str, "%s", countryprefix); break; -+ case 2: str += sprintf(str, "%s", areaprefix); break; - case 3: str += sprintf(str, "(network)"); break; - case 4: str += sprintf(str, "(MSN)"); break; - case 6: str += sprintf(str, "(abbrev)"); break; - } -- str += sprintf(str, numberDigits); -+ str += sprintf(str, "%s", numberDigits); - - return p - beg; - } -@@ -219,7 +219,7 @@ - case 4: str += sprintf(str, "(local)"); break; - case 6: str += sprintf(str, "(abbrev)"); break; - } -- str += sprintf(str, numberDigits); -+ str += sprintf(str, "%s", numberDigits); - - return p - beg; - } ---- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/isdnrep/isdnbill.c 2009-10-20 05:07:28.000000000 -0400 -+++ isdn4k-utils-CVS-2010-05-01-patched.new/isdnlog/isdnrep/isdnbill.c 2014-01-28 17:16:00.533957441 -0500 -@@ -271,8 +271,7 @@ - memset(s, c, len); - s[len] = 0; - -- printf(s); -- printf("\n"); -+ printf("%s\n", s); - } /* strich */ - - diff --git a/isdn4k-utils-3.27_20151118-help-text.patch b/isdn4k-utils-3.27_20151118-help-text.patch deleted file mode 100644 index 144a804..0000000 --- a/isdn4k-utils-3.27_20151118-help-text.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c.me isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c ---- isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c.me 2018-10-08 10:53:25.317135507 +0200 -+++ isdn4k-utils-3.27_20151118/vbox/src/vboxctrl.c 2018-10-08 10:54:15.545306401 +0200 -@@ -195,8 +195,8 @@ static void usage(void) - fprintf(stderr, "\n"); - fprintf(stderr, "Usage: %s OPTION [ OPTION ] [ ... ]\n", vbasename); - fprintf(stderr, "\n"); -- fprintf(stderr, "-c, --create Removes a control file (default).\n"); -- fprintf(stderr, "-r, --remove Creates a control file.\n"); -+ fprintf(stderr, "-c, --create Creates a control file.\n"); -+ fprintf(stderr, "-r, --remove Removes a control file (default).\n"); - fprintf(stderr, "-n, --answernow Control file \"vboxctrl-answernow\".\n"); - fprintf(stderr, "-a, --answerall Control file \"vboxctrl-answerall\".\n"); - fprintf(stderr, "-p, --stop Control file \"vboxctrl-stop\".\n"); diff --git a/isdn4k-utils-3.27_20151118-perl-wld-modul.patch b/isdn4k-utils-3.27_20151118-perl-wld-modul.patch deleted file mode 100644 index a76828e..0000000 --- a/isdn4k-utils-3.27_20151118-perl-wld-modul.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest.than isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest ---- isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest.than 2017-08-08 11:49:59.607377458 +0200 -+++ isdn4k-utils-3.27_20151118/isdnlog/tools/dest/makedest 2017-08-08 11:52:10.989430703 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/perl -+#! /usr/bin/perl -w -I . - - # make dest.gdbm - # necessary parts: ../../country-de.dat -diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate.than isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate ---- isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate.than 2017-08-08 11:52:26.278855030 +0200 -+++ isdn4k-utils-3.27_20151118/isdnlog/tools/dest/pp_rate 2017-08-08 11:52:38.020412941 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/perl -+#! /usr/bin/perl -w- I . - - # This version of pp_rate originates from rates4linux: - # $Id: pp_rate,v 1.11 2004/10/23 17:40:21 tobiasb Exp $ diff --git a/isdn4k-utils-CVS-2005-03-09-xmon.patch b/isdn4k-utils-CVS-2005-03-09-xmon.patch deleted file mode 100644 index f176578..0000000 --- a/isdn4k-utils-CVS-2005-03-09-xmon.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- isdn4k-utils-CVS-2005-03-09/xmonisdn/Imakefile.tn 2005-11-16 11:43:34.000000000 +0100 -+++ isdn4k-utils-CVS-2005-03-09/xmonisdn/Imakefile 2005-11-16 11:43:47.000000000 +0100 -@@ -25,4 +25,4 @@ - -e s,\@CONFIG_XMONISDN_DOWNCMD\@,${CONFIG_XMONISDN_DOWNCMD},g \ - < $< > $@ - --install.all: install install.man install.bitmap -+install.all: install install.man diff --git a/isdn4k-utils-CVS-2009-10-20-lib64.patch b/isdn4k-utils-CVS-2009-10-20-lib64.patch deleted file mode 100644 index 2666886..0000000 --- a/isdn4k-utils-CVS-2009-10-20-lib64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template ---- isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me 2009-10-20 14:08:23.000000000 +0200 -+++ isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template 2009-10-20 14:09:17.000000000 +0200 -@@ -8,7 +8,7 @@ - # as published by the Free Software Foundation; either version - # 2 of the License, or (at your option) any later version. - --PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) -+PLUGINDIR=${DESTDIR}/$(LIBDIR)/pppd/$(PPPVERSION) - - include $(TOPDIR)/Rules.make - diff --git a/isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch b/isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch deleted file mode 100644 index 9d9f8d0..0000000 --- a/isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in.me isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in ---- isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in.me 2010-09-20 14:55:42.000000000 +0200 -+++ isdn4k-utils-CVS-2010-05-01-patched/vbox/Makefile.in 2010-09-20 14:56:22.000000000 +0200 -@@ -81,7 +81,7 @@ exec_prefix = @exec_prefix@ - mandir = @CONFIG_MANDIR@ - bindir = @CONFIG_BINDIR@ - sbindir = /usr/sbin --sysconfdir = /etc/vbox -+sysconfdir = /etc/isdn - - LOGFILEDIR = @VBOX_LOGDIR@ - PIDFILEDIR = @VBOX_PIDDIR@ diff --git a/isdn4k-utils-autoconf-2.6.4-quoting.patch b/isdn4k-utils-autoconf-2.6.4-quoting.patch deleted file mode 100644 index a98c138..0000000 --- a/isdn4k-utils-autoconf-2.6.4-quoting.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- isdn4k-utils/isdnlog/configure.in.quote 2013-11-23 13:24:33.093608335 +0100 -+++ isdn4k-utils/isdnlog/configure.in 2013-11-23 13:24:33.101608142 +0100 -@@ -140,8 +140,8 @@ - AC_MSG_RESULT(Using 'cdb' as database) - else - AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM, 1, [Use libgdbm]), -- AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM, 1, [Use libdbm]), -- AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB, 1, [use libdb])))) -+ [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM, 1, [Use libdbm]), -+ [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB, 1, [use libdb]))])]) - fi - AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[rdb extension]) - diff --git a/isdn4k-utils-autoconf25x.patch b/isdn4k-utils-autoconf25x.patch deleted file mode 100644 index 23a9450..0000000 --- a/isdn4k-utils-autoconf25x.patch +++ /dev/null @@ -1,287 +0,0 @@ ---- isdn4k-utils/imon/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/imon/configure.in 2013-11-23 12:58:32.616668380 +0100 -@@ -38,14 +38,14 @@ - AC_ARG_WITH(sbin, - [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], - CONFIG_SBINDIR="${withval}" -- AC_DEFINE(CONFIG_SBINDIR,"${withval}"), -+ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[kernel directory]), - ) - - dnl Optional man directory - AC_ARG_WITH(man, -- [ --with-man=DIR Set manpage dir. [/usr/man]], -+ [ --with-man=DIR Set manpage dir. [/usr/share/man]], - CONFIG_MANDIR="${withval}" -- AC_DEFINE(CONFIG_MANDIR,"${withval}"), -+ AC_DEFINE(CONFIG_MANDIR,"${withval}",[man directory]), - ) - - AC_SUBST(INSTALL) ---- isdn4k-utils/isdnctrl/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnctrl/configure.in 2013-11-23 12:58:32.616668380 +0100 -@@ -30,21 +30,21 @@ - AC_ARG_WITH(sbin, - [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], - CONFIG_SBINDIR="${withval}" -- AC_DEFINE(CONFIG_SBINDIR,"${withval}"), -+ AC_DEFINE(CONFIG_SBINDIR,"${withval}",[sbin dir]), - ) - - dnl Optional man directory - AC_ARG_WITH(man, - [ --with-man=DIR Set manpage dir. [/usr/man]], - CONFIG_MANDIR="${withval}" -- AC_DEFINE(CONFIG_MANDIR,"${withval}"), -+ AC_DEFINE(CONFIG_MANDIR,"${withval}",[man dir]), - ) - - dnl Optional config-file-option - AC_ARG_ENABLE(cfile, - [ --enable-cfile Enable configfile option [no]], - CONFIG_ISDNCTRL_CONF=y -- AC_DEFINE(CONFIG_ISDNCTRL_CONF,y), -+ AC_DEFINE(CONFIG_ISDNCTRL_CONF,y,[enable config file]), - ) - - AC_SUBST(INSTALL) ---- isdn4k-utils/isdnlog/aclocal.m4.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/aclocal.m4 2013-11-23 12:58:32.615668404 +0100 -@@ -45,13 +45,13 @@ - if test "$pqdir" != "no" ; then - AC_MSG_RESULT("yes") - POSTGRES=1 -- AC_DEFINE_UNQUOTED(POSTGRES,1) -+ AC_DEFINE_UNQUOTED(POSTGRES,1,[postgres support]) - else - AC_MSG_RESULT("no POSTGRES DISABLED") - pqdir="" - fi - POSTGRESDIR="$pqdir" -- AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir") -+ AC_DEFINE_UNQUOTED(POSTGRESDIR,"$pqdir",[postgres dir]) - AC_SUBST(POSTGRES) - AC_SUBST(POSTGRESDIR) - ]) -@@ -108,13 +108,13 @@ - if test "$mydir" != "no" ; then - AC_MSG_RESULT("yes") - MYSQLDB=1 -- AC_DEFINE_UNQUOTED(MYSQLDB,1) -+ AC_DEFINE_UNQUOTED(MYSQLDB,1,[MySQL support]) - else - AC_MSG_RESULT("no MYSQL DISABLED") - mydir="" - fi - MYSQLDIR="$mydir" -- AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir") -+ AC_DEFINE_UNQUOTED(MYSQLDIR,"$mydir",[MySQL dir]) - AC_SUBST(MYSQLDB) - AC_SUBST(MYSQLDIR) - ]) -@@ -134,7 +134,7 @@ - if test "$oradir" != "no" ; then - AC_MSG_RESULT("yes") - ORACLE=1 -- AC_DEFINE_UNQUOTED(ORACLE,1) -+ AC_DEFINE_UNQUOTED(ORACLE,1,[oracle support, unsupported]) - else - AC_MSG_RESULT("no ORACLE DISABLED") - fi ---- isdn4k-utils/isdnlog/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/configure.in 2013-11-23 12:58:32.615668404 +0100 -@@ -81,45 +81,46 @@ - dnl To make it possible to set variables in policy.h - dnl they have to be defined with AC_DEFINE... - dnl --AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR") --AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE") --AC_DEFINE_UNQUOTED(DATADIR,"$datadir") --AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT) --AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE") --AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE") --AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE") --AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD") --AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD") --AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD") -+AC_DEFINE_UNQUOTED(OLDCONFDIR,"$OLDCONFDIR", [old config dir]) -+AC_DEFINE_UNQUOTED(OLDCONFFILE,"$OLDCONFFILE", [old config file]) -+AC_DEFINE_UNQUOTED(DATADIR,"$datadir", [data dir]) -+AC_DEFINE_UNQUOTED(SERV_PORT,$SERV_PORT, [server port]) -+AC_DEFINE_UNQUOTED(USERFILE,"$USERFILE", [user file]) -+AC_DEFINE_UNQUOTED(LOGFILE,"$LOGFILE", [log file]) -+AC_DEFINE_UNQUOTED(CHARGEFILE,"$CHARGEFILE", [charge file]) -+AC_DEFINE_UNQUOTED(RELOADCMD,"$RELOADCMD", [reload command]) -+AC_DEFINE_UNQUOTED(STOPCMD,"$STOPCMD", [stop command]) -+AC_DEFINE_UNQUOTED(REBOOTCMD,"$REBOOTCMD", [reboot command]) -+ - if test "$CONFIG_ISDN_LOG_DE" = "y" ; then - NATION="de" - NATION_MACRO="ISDN_DE" -- AC_DEFINE(ISDN_DE) -+ AC_DEFINE(ISDN_DE, 1, [German ISDN]) - fi - if test "$CONFIG_ISDN_LOG_AT" = "y" ; then - NATION="at" - NATION_MACRO="ISDN_AT" -- AC_DEFINE(ISDN_AT) -+ AC_DEFINE(ISDN_AT, 1, [Austrian ISDN]) - fi - if test "$CONFIG_ISDN_LOG_CH" = "y" ; then - NATION="ch" - NATION_MACRO="ISDN_CH" -- AC_DEFINE(ISDN_CH) -+ AC_DEFINE(ISDN_CH, 1, [Swiss ISDN]) - fi - if test "$CONFIG_ISDN_LOG_NL" = "y" ; then - NATION="nl" - NATION_MACRO="ISDN_NL" -- AC_DEFINE(ISDN_NL) -+ AC_DEFINE(ISDN_NL, 1, [Dutch ISDN]) - fi - if test "$CONFIG_ISDN_LOG_LU" = "y" ; then - NATION="lu" - NATION_MACRO="ISDN_LU" -- AC_DEFINE(ISDN_LU) -+ AC_DEFINE(ISDN_LU, 1, [Luxembourg ISDN]) - fi - if test "$CONFIG_ISDN_LOG_XX" = "y" ; then - NATION=$CONFIG_ISDN_LOG_CC - NATION_MACRO="ISDN_XX" -- AC_DEFINE(ISDN_XX) -+ AC_DEFINE(ISDN_XX, 1, [Other country]) - fi - - dnl Checks for programs. -@@ -132,17 +133,17 @@ - - dnl Checks for libraries. - if test -e tools/cdb/i4l_cdb.c ; then -- AC_DEFINE(USE_CDB) -+ AC_DEFINE(USE_CDB, 1, [Use CDB]) - CDBEXTRALIBS="tools/cdb/i4l_cdb.a" - DBEXT=".cdb" - RDBEXT=".cdb" - AC_MSG_RESULT(Using 'cdb' as database) - else --AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM), -- [AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM), -- [AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB))])]) -+AC_CHECK_LIB(gdbm, gdbm_open, DBMLIB=-lgdbm; AC_DEFINE(HAVE_LIBGDBM, 1, [Use libgdbm]), -+ AC_CHECK_LIB(dbm, dbm_open, DBMLIB=-ldbm; AC_DEFINE(HAVE_LIBDBM, 1, [Use libdbm]), -+ AC_CHECK_LIB(db, dbm_open, DBMLIB=-ldb; AC_DEFINE(HAVE_LIBDB, 1, [use libdb])))) - fi --AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT") -+AC_DEFINE_UNQUOTED(RDBEXT,"$RDBEXT",[rdb extension]) - - dnl log database support - AC_CHECK_POSTGRES -@@ -160,7 +161,7 @@ - dnl Manual config - AC_ARG_WITH(isdnlib, - [ --with-isdnlib=DIR Set isdn library [../lib]], -- LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval")) -+ LIBISDNDIR=$withval; AC_DEFINE_UNQUOTED(LIBISDNDIR,"$withval",[libisdn dir])) - AC_ARG_WITH(area-lib, - [ --with-area-lib=STRING Set area library type [area]], - ALIB=$withval) -@@ -169,16 +170,16 @@ - CHARGECOUNTRY=$withval) - AC_ARG_WITH(oldconfdir, - [ --with-oldconfdir=DIR Set old config directory [/etc/isdnlog]], -- OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval")) -+ OLDCONFDIR=$withval; AC_DEFINE_UNQUOTED(OLDCONFDIR,"$withval", [old config dir])) - AC_ARG_WITH(oldconf, - [ --with-oldconf=NAME Set old config file name [isdnlog.conf]], -- OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval")) -+ OLDCONFFILE=$withval; AC_DEFINE_UNQUOTED(OLDCONFFILE,"$withval", [old config file])) - AC_ARG_WITH(datadir, - [ --with-datadir=DIR Set data directory [/usr/lib/isdn]], -- datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval")) -+ datadir=$withval; AC_DEFINE_UNQUOTED(DATADIR,"$withval", [data dir])) - AC_ARG_WITH(sport, - [ --with-sport=INT Set server port [20011]], -- SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval)) -+ SERV_PORT=$withval; AC_DEFINE_UNQUOTED(SERV_PORT,$withval, [server port])) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST -@@ -198,28 +199,28 @@ - - if test "$ALIB" = "area" ; then - LIBAREA=1 -- AC_DEFINE(LIBAREA) -+ AC_DEFINE(LIBAREA, 1, [libarea]) - fi - case "$CHARGECOUNTRY" in - DE) - NATION="de" - NATION_MACRO="ISDN_DE" -- AC_DEFINE(ISDN_DE) -+ AC_DEFINE(ISDN_DE, 1, [German ISDN]) - ;; - AT) - NATION="at" - NATION_MACRO="ISDN_AT" -- AC_DEFINE(ISDN_AT) -+ AC_DEFINE(ISDN_AT, 1, [Austrian ISDN]) - ;; - CH) - NATION="ch" - NATION_MACRO="ISDN_CH" -- AC_DEFINE(ISDN_CH) -+ AC_DEFINE(ISDN_CH, 1, [Swiss ISDN]) - ;; - NL) - NATION="nl" - NATION_MACRO="ISDN_NL" -- AC_DEFINE(ISDN_NL) -+ AC_DEFINE(ISDN_NL, 1, [Dutch ISDN]) - ;; - esac - ---- isdn4k-utils/vbox3/configure.in.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/vbox3/configure.in 2013-11-23 12:58:32.615668404 +0100 -@@ -17,11 +17,9 @@ - ## programs ############################################################### - - AC_PROG_CC --AC_PROG_CC_WORKS --AC_PROG_CC_GNU - - AC_PROG_RANLIB --AM_PROG_INSTALL -+AC_PROG_INSTALL - - ## libraries ############################################################## - ---- isdn4k-utils/vbox3/vboxgetty/Makefile.am.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/vbox3/vboxgetty/Makefile.am 2013-11-23 12:58:32.615668404 +0100 -@@ -12,7 +12,7 @@ - - ## vboxgetty ############################################################## - --DEFS += -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"' -+DEFS = -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"' - - INCLUDES = $(all_includes) $(tcl_include) - ---- isdn4k-utils/vbox/aclocal.m4.ac25x 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/vbox/aclocal.m4 2013-11-23 12:58:32.615668404 +0100 -@@ -103,15 +103,7 @@ - - HAVE_TCL_INCL="y" - LINK_TCL_INCL="${gnd_tcl_inc_dir}" -- fi -- else -- AC_MSG_CHECKING("for tcl header in /usr/include/tcl8.3/tcl.h") -- if (test -e "/usr/include/tcl8.3/tcl.h") -- then -- AC_MSG_RESULT("yes") -- HAVE_TCL_INCL="y" -- LINK_TCL_INCL="-I/usr/include/tcl8.3" -- else -+ else - AC_MSG_RESULT("no") - fi - fi diff --git a/isdn4k-utils-capiinit.patch b/isdn4k-utils-capiinit.patch deleted file mode 100644 index 2b130fc..0000000 --- a/isdn4k-utils-capiinit.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- isdn4k-utils/capiinit/capiinit.c.capi 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capiinit/capiinit.c 2013-11-23 13:24:33.099608191 +0100 -@@ -1248,6 +1248,7 @@ - if (check_procfs() < 0) return -1; - if (check_for_kernelcapi() < 0) return -1; - if (check_for_capi() < 0) return -1; -+ sleep(5); /* wait until the device node is created successfully by udev */ - if (check_for_devcapi() < 0) return -1; - if (check_for_capifs() < 0) return 0; /* only warning */ - if (check_for_capifs_mounted() < 0) return -1; -@@ -1492,8 +1493,8 @@ - unload_module("capiutil"); - if ((mp = mounted("capifs")) != 0 && strcmp(mp, "/dev/capi") == 0) - system("umount /dev/capi"); -- if (filesystem_available("capifs")) -- unload_filesystem("capifs"); -+ /*if (filesystem_available("capifs")) -+ unload_filesystem("capifs"); */ - } - if (cardname && cname[0] == 0) { - fprintf(stderr,"ERROR: card \"%s\" not found\n", cardname); ---- isdn4k-utils/capiinit/capi.conf.capi 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capiinit/capi.conf 2013-11-23 13:24:33.098608215 +0100 -@@ -1,10 +1,10 @@ - # card file proto io irq mem cardnr options - #b1isa b1.t4 DSS1 0x150 7 - - P2P --b1pci b1.t4 DSS1 - - - - --c4 c4.bin DSS1 - - - - --c4 - DSS1 - - - - --c4 - DSS1 - - - - P2P --c4 - DSS1 - - - - P2P -+#b1pci b1.t4 DSS1 - - - - -+#c4 c4.bin DSS1 - - - - -+#c4 - DSS1 - - - - -+#c4 - DSS1 - - - - P2P -+#c4 - DSS1 - - - - P2P - #c2 c2.bin DSS1 - - - - - #c2 - DSS1 - - - - - #t1isa t1.t4 DSS1 0x340 9 - 0 diff --git a/isdn4k-utils-man.patch b/isdn4k-utils-man.patch deleted file mode 100644 index eeb23c1..0000000 --- a/isdn4k-utils-man.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- isdn4k-utils/xmonisdn/Makefile.in.man 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/xmonisdn/Makefile.in 2013-11-23 12:57:21.280407677 +0100 -@@ -51,7 +51,7 @@ - CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(I4LU_DEFINES)" - rm -rf X11 - --xmonisdn.man: xmonisdn.man.in Makefile -+xmonisdn.man: xmonisdn.man.in - MANDATE=`grep CHECKIN $< | awk '{print $$4}'`; \ - XUP=`echo ${CONFIG_XMONISDN_UPCMD}|sed 's/&/\\\&/g'`; \ - XDOWN=`echo ${CONFIG_XMONISDN_DOWNCMD}|sed 's/&/\\\&/g'`; \ -@@ -62,7 +62,7 @@ - -e "s,\@CONFIG_XMONISDN_DOWNCMD\@,$${XDOWN},g" \ - < $< > $@ - --config: -+config: xmonisdn.man - @cp Makefile.in GNUmakefile - @xmkmf - diff --git a/isdn4k-utils-mkzonedb.patch b/isdn4k-utils-mkzonedb.patch deleted file mode 100644 index aa603c8..0000000 --- a/isdn4k-utils-mkzonedb.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.crash isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c ---- isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c.crash 2014-07-31 11:31:57.000000000 +0200 -+++ isdn4k-utils-CVS-2010-05-01-patched/isdnlog/tools/zone/mkzonedb.c 2014-07-31 11:35:12.000000000 +0200 -@@ -362,6 +362,7 @@ int main (int argc, char *argv[]) - if (verbose) - stdoutisatty = isatty(fileno(stdout)); - -+ if (!rf || !df) usage(argv); - read_rzfile(rf); - make_table(); - write_db(df); diff --git a/isdn4k-utils-redhat.patch b/isdn4k-utils-redhat.patch deleted file mode 100644 index 0d89a24..0000000 --- a/isdn4k-utils-redhat.patch +++ /dev/null @@ -1,772 +0,0 @@ ---- isdn4k-utils/.config.rpm.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/.config.rpm 2013-11-23 12:47:59.064117681 +0100 -@@ -5,16 +5,16 @@ - # - # Code maturity level options - # --CONFIG_EXPERIMENTAL=y -+# CONFIG_EXPERIMENTAL is not set - - # - # General configuration - # - CONFIG_BUILDX11=y --CONFIG_KERNELDIR='/usr/src/linux' -+CONFIG_KERNELDIR='/usr/src/linux-2.4' - CONFIG_BINDIR='/usr/bin' --CONFIG_SBINDIR='/sbin' --CONFIG_MANDIR='/usr/man' -+CONFIG_SBINDIR='/usr/sbin' -+CONFIG_MANDIR='/usr/share/man' - CONFIG_RUNDIR='/var/run' - CONFIG_LOCKDIR='/var/lock' - CONFIG_LOCKFILE='LCK..' -@@ -23,11 +23,9 @@ - CONFIG_CALLERIDFILE='callerid.conf' - CONFIG_USERCONFFILE='~/.isdn' - CONFIG_COUNTRYCODE='49' --CONFIG_AREACODE='' -+CONFIG_AREACODE='9999' - CONFIG_COUNTRY_PREFIX='+' - CONFIG_AREA_PREFIX='0' --CONFIG_DATADIR='/usr/lib/isdn' --CONFIG_LIB_AREACODE=y - - # - # Runtime configuration tools -@@ -36,18 +34,20 @@ - CONFIG_ISDNCTRL_CONF=y - CONFIG_ISDNCTRL_TIMRU=y - CONFIG_IPROFD=y -+#CONFIG_DIVERTCTRL=y - - # - # Card configuration tools - # --# CONFIG_TELESCTRL is not set -+CONFIG_TELESCTRL=y - CONFIG_HISAXCTRL=y - CONFIG_ICNCTRL=y - # CONFIG_ICNCTRL_DEBUG is not set - CONFIG_PCBITCTL=y - CONFIG_AVMCAPICTRL=y -+#CONFIG_EICONCTRL=y - CONFIG_LOOPCTRL=y --CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop' -+CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop' - # CONFIG_LOOPCTRL_DEBUG is not set - - # -@@ -64,14 +64,20 @@ - CONFIG_ISDNLOG_USERFILE='isdnlog.users' - CONFIG_ISDNLOG_CHARGEFILE='charge.dat' - CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log' --CONFIG_ISDNLOG_RELOADCMD='reload' --CONFIG_ISDNLOG_STOPCMD='stop' -+CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart' -+CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop' - CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot' - CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog' - CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf' - # CONFIG_ISDNLOG_POSTGRES is not set - # CONFIG_ISDNLOG_MYSQLDB is not set -+# CONFIG_ISDNLOG_ORACLE is not set - CONFIG_ISDN_LOG_DE=y -+CONFIG_ISDN_LOG_CC_DE=y -+CONFIG_ISDN_LOG_DEST_DE=y -+# CONFIG_ISDN_LOG_DEST_AT is not set -+# CONFIG_ISDN_LOG_DEST_NL is not set -+# CONFIG_ISDN_LOG_DEST_CH is not set - CONFIG_IPPPSTATS=y - CONFIG_XISDNLOAD=y - CONFIG_XMONISDN=y -@@ -79,8 +85,8 @@ - # - # Options for xmonisdn - # --CONFIG_XMONISDN_UPCMD='/sbin/netup' --CONFIG_XMONISDN_DOWNCMD='/sbin/netdown' -+CONFIG_XMONISDN_UPCMD='/sbin/ifup' -+CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown' - - # - # Applications -@@ -94,23 +100,22 @@ - VBOX_LOGDIR='/var/log/vbox' - VBOX_PIDDIR='/var/run' - VBOX_LOCKDIR='/var/lock' --VBOX_DOCDIR='/usr/doc/vbox' --VBOX_TCL='tcl8.0' -+VBOX_DOCDIR='/usr/share/doc/vbox' -+VBOX_TCL='tcl8.5' -+# VBOX_SUSPEND_ID is not set - CONFIG_IPPPD=y - - # - # Options for ipppd - # --CONFIG_IPPPD_MSCHAP=y -+# CONFIG_IPPPD_MSCHAP is not set -+CONFIG_IPPP_FILTER=y - # CONFIG_IPPPD_RADIUS is not set - # CONFIG_RADIUS_WTMP_LOGGING is not set - RADIUS_CLIENT_CONFIG_FILE='' - CONFIG_CAPIFAX=y - CONFIG_RCAPID=y - --# --# Documentation --# --CONFIG_GENMAN=y --CONFIG_FAQ=y --CONFIG_FAQDIR='/usr/doc/faq/isdn4linux' -+# CAPI plugins -+CONFIG_PPPDCAPIPLUGIN=y -+ ---- isdn4k-utils/ipppd/ccp.c.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/ipppd/ccp.c 2013-11-23 12:47:59.064117681 +0100 -@@ -41,7 +41,7 @@ - - #include "compressions.h" - --#if 0 -+#if HAVE_LZSCOMP_H - #include <linux/isdn_lzscomp.h> - #else - #include "../ipppcomp/isdn_lzscomp.h" ---- isdn4k-utils/ipppd/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/ipppd/Makefile.in 2013-11-23 12:49:30.400890185 +0100 -@@ -15,10 +15,10 @@ - MANDIR := @CONFIG_MANDIR@ - CC := @CC@ - INSTALL := @INSTALL@ --INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d --INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0 --INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0 --INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0 -+INSTALL_DIR := $(INSTALL) -m 0755 -d -+INSTALL_SBIN := $(INSTALL) -m 0700 -+INSTALL_BIN := $(INSTALL) -m 0755 -+INSTALL_DATA := $(INSTALL) -m 0644 - RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@ - - ifeq (@CONFIG_IPPPD_MSCHAP@,y) -@@ -73,7 +73,7 @@ - - DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@ - COMPILE_FLAGS = @CFLAGS@ --CFLAGS = -O2 -fomit-frame-pointer -Wall -DREQ_SYSOPTIONS=0 -+CFLAGS = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0 - VER = 2.2.0 - - # it's a hack ---- isdn4k-utils/loop/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/loop/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -5,16 +5,16 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/loopctrl - DEFS = - LDFLAGS = -L../lib @LIBS@ - PROGRAM = loopctrl - MODULES = loopctrl.o - MANPAGE = loopctrl.8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - ifeq (../.config,$(wildcard ../.config)) ---- isdn4k-utils/imontty/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/imontty/Makefile 2013-11-23 12:47:59.062117731 +0100 -@@ -15,14 +15,14 @@ - # Manual config standalone - # - CONFIG_SBINDRIR := /sbin -- MAN8DIR := /usr/man/man8 -+ MAN8DIR := /usr/share/man/man8 - endif - - INSTALL=install --INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_MAN=$(INSTALL) -m 0644 - MANPAGE=imontty.8 - --CCFLAGS=-O2 -+CCFLAGS=$(RPM_OPT_FLAGS) -I$(CONFIG_KERNELDIR)/include - #CCFLAGS=-I$(ISDN_INCLUDE) -g - - # nothing to change behind this line ---- isdn4k-utils/iprofd/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/iprofd/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -5,8 +5,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include - LDFLAGS = -L../lib @LIBS@ - PROGRAM = iprofd - MODULES = iprofd.o -@@ -15,8 +15,8 @@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - CC = @CC@ ---- isdn4k-utils/avmb1/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/avmb1/Makefile.in 2013-11-23 12:47:59.061117756 +0100 -@@ -5,7 +5,7 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 -+CFLAGS = $(RPM_OPT_FLAGS) - LDFLAGS = -L../lib @LIBS@ - INCLUDES = -I. - PROGRAMS = avmcapictrl -@@ -15,8 +15,8 @@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - CC = @CC@ ---- isdn4k-utils/imon/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/imon/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -7,8 +7,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include - LDFLAGS = -L../lib @LIBS@ - PROGRAM = imon - MODULES = imon.o -@@ -18,8 +18,8 @@ - SBINDIR = @CONFIG_SBINDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - CC = @CC@ ---- isdn4k-utils/act2000/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/act2000/Makefile.in 2013-11-23 12:47:59.061117756 +0100 -@@ -5,8 +5,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/act2000 - DEFS = - LDFLAGS = -L../lib @LIBS@ - PROGRAM = actctrl -@@ -18,9 +18,9 @@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_DATA = $(INSTALL) -m 0644 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - CC = @CC@ ---- isdn4k-utils/isdnctrl/Makefile.in.redhat 2013-11-23 12:47:59.062117731 +0100 -+++ isdn4k-utils/isdnctrl/Makefile.in 2013-11-23 12:50:53.592861497 +0100 -@@ -5,8 +5,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include - LDFLAGS = @LIBS@ - PROGRAM = isdnctrl - MODULES = isdnctrl.o -@@ -15,8 +15,8 @@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - CC = @CC@ -DVERSION=\"@I4LVERSION@\" - prefix = @prefix@ - exec_prefix = @exec_prefix@ ---- isdn4k-utils/xisdnload/Imakefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/xisdnload/Imakefile 2013-11-23 12:47:59.064117681 +0100 -@@ -21,7 +21,7 @@ - OBJS = xisdnload.o - OSMAJORVERSION = OSMajorVersion - OSMINORVERSION = OSMinorVersion -- DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER -+ DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER - - AllTarget(xisdnload) - NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter) ---- isdn4k-utils/icn/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/icn/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -5,8 +5,8 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/icn - DEFS = - LDFLAGS = -L../lib @LIBS@ - PROGRAM = icnctrl -@@ -17,9 +17,9 @@ - DATADIR = @CONFIG_DATADIR@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_DATA = $(INSTALL) -m 0644 -+INSTALL_MAN = $(INSTALL) -m 0644 - CC = @CC@ - COPTS = - ---- isdn4k-utils/areacode/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/areacode/Makefile.in 2013-11-23 12:47:59.061117756 +0100 -@@ -12,7 +12,7 @@ - # only ones that _really_ exist on _every_ system. - # - BUILDOPTS := $(DATAOPTS) -- INSTALLOPTS := $(DATAOPTS) INSTALL="install -o 0 -g 0 -m 644" -+ INSTALLOPTS := $(DATAOPTS) INSTALL="install -m 644" - endif - - all: .depend ---- isdn4k-utils/rcapid/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/rcapid/Makefile.am 2013-11-23 12:47:59.064117681 +0100 -@@ -8,7 +8,7 @@ - stamp-h.in comperr - - INCLUDES = -I../capi20 $(all_includes) --CFLAGS = -Wall -O2 -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - ---- isdn4k-utils/isdnlog/samples/callerid.conf.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/samples/callerid.conf 2013-11-23 12:47:59.063117706 +0100 -@@ -2,38 +2,31 @@ - # - # More information: See the isdnlog documentation - -+#INTERFACE = ippp0 # Isdn network interface. This information is required -+ # with the "-hx" / hangup="value" option. -+ -+ - [MSN] - NUMBER = 4711 - ALIAS = Phone - SI = 1 - ZONE = 1 --START = { -- [FLAG] -- FLAGS = I|O|R|C|B|A|E|H -- PROGRAM = /bin/myprog \$1 \$2 \$3 Phone --} -+#START = { -+# [FLAG] -+# FLAGS = I|O|R|C|B|A|E|H -+# PROGRAM = /bin/myprog \$1 \$2 \$3 Phone -+#} - - [MSN] - NUMBER = 4711 - ALIAS = HDLC - SI = 7 - ZONE = 1 --START = { -- [FLAG] -- FLAGS = I|O|R|C|B|A|E| -- PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter --} -- --[MSN] --NUMBER = 4712 --ALIAS = Modem --SI = 1 --ZONE = 1 --START = { -- [FLAG] -- FLAGS = I|O|R|C|B|A|E|H -- PROGRAM = /bin/myprog \$1 \$2 \$3 Modem --} -+#START = { -+# [FLAG] -+# FLAGS = I|O|R|C|B|A|E| -+# PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter -+#} - - [NUMBER] - NUMBER = 01910 ---- isdn4k-utils/isdnlog/tools/cdb/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/cdb/Makefile.in 2013-11-23 12:51:38.509766289 +0100 -@@ -20,7 +20,7 @@ - BINDIR:=$(DESTDIR)@prefix@/bin - INCDIR:=$(DESTDIR)@prefix@/include - --CFLAGS:=-Wall -O2 -+CFLAGS:=-Wall $(RPM_OPT_FLAGS) - - all: depend $(FILES) - -@@ -45,7 +45,7 @@ - install-dirs: - install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) $(INCDIR) - --install: -+install: install-dirs - true - # install -m0755 $(BINS) $(BINDIR) - # install -m0644 $(MAN1) $(MAN1DIR) ---- isdn4k-utils/isdnlog/tools/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/Makefile 2013-11-23 12:47:59.065117655 +0100 -@@ -1,4 +1,4 @@ --CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib -+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib - #CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog - - all: rate-at ---- isdn4k-utils/isdnlog/tools/dest/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/dest/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -6,7 +6,7 @@ - -include ../../../.config - BZIP2 = @BZIP2@ - SHELL = /bin/sh --CFLAGS = -Wall -g -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - INCLUDES = - LDFLAGS = @DBMLIB@ - export DBEXT = @DBEXT@ -@@ -20,9 +20,9 @@ - SBINDIR = @CONFIG_SBINDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 -+INSTALL_DATA = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - DATADIR = @datadir@ ---- isdn4k-utils/isdnlog/tools/zone/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/tools/zone/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -5,7 +5,7 @@ - # - BZIP2 = @BZIP2@ - SHELL = /bin/sh --CFLAGS = -Wall -g -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - INCLUDES = - LDFLAGS = @DBMLIB@ - CDBEXTRALIBS = @CDBEXTRALIBS@ -@@ -20,8 +20,8 @@ - SBINDIR = @CONFIG_SBINDIR@ - MAN8DIR = $(MANDIR)/man8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - #CC = @CC@ -V2.7.2.3 ---- isdn4k-utils/isdnlog/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/isdnlog/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -1659,10 +1659,10 @@ - # autoconf isdnlog specific stuff - # - INSTALL := @INSTALL@ --INSTALL_DIR := $(INSTALL) -m 0755 -o 0 -g 0 -d --INSTALL_SBIN := $(INSTALL) -m 0700 -o 0 -g 0 --INSTALL_BIN := $(INSTALL) -m 0755 -o 0 -g 0 --INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0 -+INSTALL_DIR := $(INSTALL) -m 0755 -d -+INSTALL_SBIN := $(INSTALL) -m 0700 -+INSTALL_BIN := $(INSTALL) -m 0755 -+INSTALL_DATA := $(INSTALL) -m 0644 - - BZIP2 := @BZIP2@ - BUNZIP2 := $(BZIP2) -f -d -@@ -1717,9 +1717,9 @@ - SUBDIRS += $(LIBISDNDIR) - endif - --# export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce -+# export CFLAGS = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce - --export CFLAGS = -Wall -pipe -+export CFLAGS = -Wall $(RPM_OPT_FLAGS) - ifndef _CC - export _CC = gcc - endif ---- isdn4k-utils/capiinfo/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capiinfo/Makefile.am 2013-11-23 12:47:59.061117756 +0100 -@@ -8,7 +8,7 @@ - stamp-h.in comperr - - INCLUDES = -I../capi20 $(all_includes) --CFLAGS = -Wall -O2 -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - ---- isdn4k-utils/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/Makefile 2013-11-23 12:47:59.065117655 +0100 -@@ -16,8 +16,8 @@ - # Following line is important for lib and isdnlog (sl). - export ROOTDIR=$(shell pwd) - --ifeq (.config,$(wildcard .config)) --include .config -+ifeq (.config.h,$(wildcard .config.h)) -+include .config.h - do-it-all: subtargets - else - CONFIGURATION = config -@@ -129,14 +129,8 @@ - - install: - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done -- @: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \ -- then \ -- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \ -- else \ -- sh scripts/makedev.sh $(DESTDIR) ; \ -- fi - --uninstall: rootperm -+uninstall: - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done - - # ---- isdn4k-utils/divertctrl/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/divertctrl/Makefile.in 2013-11-23 12:47:59.061117756 +0100 -@@ -5,16 +5,16 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 --INCLUDES = -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -+INCLUDES = -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/divert - DEFS = - LDFLAGS = -L../lib @LIBS@ - PROGRAM = divertctrl - MODULES = divertctrl.o - MANPAGE = divertctrl.8 - INSTALL = @INSTALL@ --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - ifeq (../.config,$(wildcard ../.config)) ---- isdn4k-utils/capifax/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capifax/Makefile.am 2013-11-23 12:47:59.061117756 +0100 -@@ -8,7 +8,7 @@ - stamp-h.in - - INCLUDES = -I../capi20 $(all_includes) --CFLAGS = -Wall -O2 -+CFLAGS = -Wall $(RPM_OPT_FLAGS) - LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - ---- isdn4k-utils/capiinit/Makefile.am.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/capiinit/Makefile.am 2013-11-23 12:47:59.061117756 +0100 -@@ -8,7 +8,7 @@ - stamp-h.in comperr core - - INCLUDES = $(all_includes) --CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g -+CFLAGS = -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS) - LDFLAGS = $(all_libraries) - LDADD = - ---- isdn4k-utils/hisax/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/hisax/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -6,7 +6,7 @@ - # - # - SHELL = /bin/sh --CFLAGS = -Wall -O2 -I. -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -I. -I@CONFIG_KERNELDIR@/include - LDFLAGS = -L../lib @LIBS@ - PROGRAMS = - MODULES = hisaxctrl.o -@@ -16,9 +16,9 @@ - DATADIR = @CONFIG_DATADIR@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_DATA = $(INSTALL) -m 0644 -+INSTALL_MAN = $(INSTALL) -m 0644 - prefix = @prefix@ - exec_prefix = @exec_prefix@ - ifeq ("@CONFIG_HISAXCTRL@","y") ---- isdn4k-utils/doc/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/doc/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -9,7 +9,7 @@ - SED = @SED@ - MANDIR = @CONFIG_MANDIR@ - MANPAGES = ttyI.4 isdninfo.4 isdn_audio.4 isdnctrl.4 isdn_cause.7 --INSTALL_MAN = @INSTALL@ -o 0 -g 0 -m 0644 -+INSTALL_MAN = @INSTALL@ -m 0644 - prefix = @prefix@ - - %.1: %.man ---- isdn4k-utils/eicon/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/eicon/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -7,8 +7,8 @@ - # - - SHELL = /bin/sh --CFLAGS = -Wall -O2 -DUNIX -DLINUX --INCLUDES = -I. -Iinclude -+CFLAGS = -Wall -DUNIX -DLINUX $(RPM_OPT_FLAGS) -+INCLUDES = -I. -Iinclude -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/eicon - LDFLAGS = -L../lib @LIBS@ - PROGRAMS = - PROGRAM = eiconctrl -@@ -23,9 +23,9 @@ - DATA_DIR = @CONFIG_DATADIR@ - MANDIR = @CONFIG_MANDIR@ - MAN8DIR = $(MANDIR)/man8 --INSTALL_PROGRAM = $(INSTALL) -o 0 -g 0 -m 0750 --INSTALL_DATA = $(INSTALL) -o 0 -g 0 -m 0644 --INSTALL_MAN = $(INSTALL) -o 0 -g 0 -m 0644 -+INSTALL_PROGRAM = $(INSTALL) -m 0750 -+INSTALL_DATA = $(INSTALL) -m 0644 -+INSTALL_MAN = $(INSTALL) -m 0644 - CC = @CC@ - COPTS = -DDATADIR=\"$(shell echo $(DESTDIR)$(DATA_DIR))\" - ---- isdn4k-utils/vbox/examples/vboxgetty.conf.example.redhat 2013-11-23 12:47:59.064117681 +0100 -+++ isdn4k-utils/vbox/examples/vboxgetty.conf.example 2013-11-23 12:53:01.601740005 +0100 -@@ -20,12 +20,12 @@ - - # Settings for port ttyI6 - --port /dev/ttyI6 -- modeminit ATZ&B512&E000000 -- user vboxdaemonuser -- group users -- spooldir /var/spool/vbox/ttyI6 -- vboxconfig /home/vboxdaemonuser/.vbox.conf -+#port /dev/ttyI6 -+# modeminit ATZ&B512&E000000 -+# user vboxdaemonuser -+# group users -+# spooldir /var/spool/vbox/ttyI6 -+# vboxconfig /home/vboxdaemonuser/.vbox.conf - - # Settings for port ttyI7 - ---- isdn4k-utils/vbox/examples/vboxd.conf.example.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/vbox/examples/vboxd.conf.example 2013-11-23 12:52:33.205432705 +0100 -@@ -5,7 +5,7 @@ - # login (server startup) time. If access is 'yes' the host can login - # and count messages without special access. - --L:localhost:Y -+#L:localhost:Y - L:*:N - - # Full access list -@@ -15,7 +15,7 @@ - - # One user in this file can be configured by the `debconf' system, the next one. - # Remove this comment if you don't want any configuration to happen. --A:localhost:RW:username:*invalid*password*:/var/spool/vbox/ttyI6:incoming -+# A:localhost:RW:username:*invalid*password*:/var/spool/vbox/ttyI6:incoming - # A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming - - A:*:!:!:!:!:! ---- isdn4k-utils/ipppstats/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/ipppstats/Makefile.in 2013-11-23 12:47:59.062117731 +0100 -@@ -6,14 +6,14 @@ - MANDIR = @CONFIG_MANDIR@ - CC = @CC@ - INSTALL = @INSTALL@ --INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0 --INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0 --INSTALL_DIR = $(INSTALL) -m 755 -o 0 -g 0 -d -+INSTALL_SBIN = $(INSTALL) -m 755 -+INSTALL_DATA = $(INSTALL) -m 644 -+INSTALL_DIR = $(INSTALL) -m 755 -d - - PPPSTATSRCS = ipppstats.c - PPPSTATOBJS = ipppstats.o - --CFLAGS = -fomit-frame-pointer -O2 -+CFLAGS = $(RPM_OPT_FLAGS) -I@CONFIG_KERNELDIR@/include - - all: ipppstats - ---- isdn4k-utils/lib/Makefile.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/lib/Makefile 2013-11-23 12:47:59.065117655 +0100 -@@ -28,7 +28,7 @@ - # USER CONFIGURATION AREA - ###################################################################### - --CFLAGS = -g -Wall -pipe #-O6 -+CFLAGS = $(RPM_OPT_FLAGS) - DEFS = - ifndef _CC - export _CC = gcc ---- isdn4k-utils/lib/Makefile.in.redhat 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/lib/Makefile.in 2013-11-23 12:47:59.063117706 +0100 -@@ -11,7 +11,7 @@ - # Install as root with numeric Id's, since these are the - # only ones that _really_ exist on _every_ system. - # -- INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644 -+ INSTALLOPTS += INSTALL= install -m 644 - endif - - all: .depend diff --git a/isdn4k-utils-sh-linux.patch b/isdn4k-utils-sh-linux.patch deleted file mode 100644 index 225574b..0000000 --- a/isdn4k-utils-sh-linux.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- isdn4k-utils/ipppd/main.c.sh-support 2013-11-23 13:19:37.218825637 +0100 -+++ isdn4k-utils/ipppd/main.c 2013-11-23 13:21:21.585279930 +0100 -@@ -1298,7 +1298,7 @@ - case 'r': - f = va_arg(args, char *); - a = va_arg(args, va_list); --#ifdef __alpha__ /* always do this? */ -+#if defined(__alpha__) || defined(__sh__) || defined ( __arm__) /* always do this? */ - n = fmtmsg(buf, buflen + 1, f, a); - #else - n = vfmtmsg(buf, buflen + 1, f, a); diff --git a/isdn4k-utils-statfs.patch b/isdn4k-utils-statfs.patch deleted file mode 100644 index 7338a23..0000000 --- a/isdn4k-utils-statfs.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- isdn4k-utils-CVS-2005-03-09/vbox/src/vboxgetty.c.old 2000-11-30 16:35:20.000000000 +0100 -+++ isdn4k-utils-CVS-2005-03-09/vbox/src/vboxgetty.c 2005-04-20 16:30:31.000000000 +0200 -@@ -434,7 +434,7 @@ - static int check_spool_space(unsigned long need) - { - struct statfs stat; -- unsigned long have; -+ unsigned long long have; - - log(L_DEBUG, "Checking free space on \"%s\"...\n", setup.spool); - -@@ -449,7 +449,7 @@ - { - have = (stat.f_bfree * stat.f_bsize); - -- log_line(L_JUNK, "%ld bytes available; %ld bytes needed... ", have, need); -+ log_line(L_JUNK, "%lld bytes available; %ld bytes needed... ", have, need); - - if (have >= need) - { - diff --git a/isdn4k-utils-strict-aliasing.patch b/isdn4k-utils-strict-aliasing.patch deleted file mode 100644 index c66390f..0000000 --- a/isdn4k-utils-strict-aliasing.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up isdn4k-utils-3.27_20151118/ipppd/Makefile.in.than isdn4k-utils-3.27_20151118/ipppd/Makefile.in ---- isdn4k-utils-3.27_20151118/ipppd/Makefile.in.than 2015-11-18 22:33:13.351145388 +0100 -+++ isdn4k-utils-3.27_20151118/ipppd/Makefile.in 2015-11-18 22:33:24.649039181 +0100 -@@ -73,7 +73,7 @@ endif - - DEBUG_FLAGS = @CONFIG_IPPPD_DEBUGFLAGS@ - COMPILE_FLAGS = @CFLAGS@ --CFLAGS = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0 -+CFLAGS = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0 -fno-strict-aliasing - VER = 2.2.0 - - # it's a hack -diff -up isdn4k-utils-3.27_20151118/rcapid/Makefile.am.than isdn4k-utils-3.27_20151118/rcapid/Makefile.am ---- isdn4k-utils-3.27_20151118/rcapid/Makefile.am.than 2015-11-18 22:34:20.527513865 +0100 -+++ isdn4k-utils-3.27_20151118/rcapid/Makefile.am 2015-11-18 22:34:36.784361034 +0100 -@@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = configure aclo - stamp-h.in comperr - - INCLUDES = -I../capi20 $(all_includes) --CFLAGS = -Wall $(RPM_OPT_FLAGS) -+CFLAGS = -Wall $(RPM_OPT_FLAGS) -fno-strict-aliasing - LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) - LDADD = -lcapi20 - -diff -up isdn4k-utils-3.27_20151118/rcapid/Makefile.in.than isdn4k-utils-3.27_20151118/rcapid/Makefile.in -diff -up isdn4k-utils-3.27_20151118/vbox/Makefile.in.than isdn4k-utils-3.27_20151118/vbox/Makefile.in diff --git a/isdn4k-utils-true.patch b/isdn4k-utils-true.patch deleted file mode 100644 index b37c9f1..0000000 --- a/isdn4k-utils-true.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- isdn4k-utils/imon/imon.c.true 2013-11-23 12:23:42.000000000 +0100 -+++ isdn4k-utils/imon/imon.c 2013-11-23 13:12:03.435893932 +0100 -@@ -73,6 +73,10 @@ - - #include <linux/isdn.h> - -+#ifndef TRUE -+#define TRUE 1 -+#endif -+ - #define KEY_Q 81 - #define KEY_q 113 - diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec deleted file mode 100644 index 7cb7b99..0000000 --- a/isdn4k-utils.spec +++ /dev/null @@ -1,1021 +0,0 @@ -%global app_defaults_dir %{_datadir}/X11/app-defaults -%global gitdate 20151118 - -Summary: Utilities for configuring an ISDN subsystem -Name: isdn4k-utils -Version: 3.27 -Release: 18%{?dist} -License: GPLv2+ and GPL+ and MIT and BSD and zlib -Url: http://www.isdn4linux.de/ - -# license issue, remove the isdn_lzscomp.c and firmwares -# and isdnlog/tools/telrate (non-free) -# git clone git://git.misdn.eu/isdn4k-utils.git -# rm -f isdn4k-utils/icn/firmware/* -# rm -f isdn4k-utils/act2000/firmware/* -# rm -f isdn4k-utils/eicon/firmware/* -# rm -rf isdn4k-utils/.git -# tar cvJf isdn4k-utils-%{version}_%{gitdate}.tar.xz isdn4k-utils -Source0: isdn4k-utils-%{version}_%{gitdate}.tar.xz -Source2: isdn.init -Source7: capi20.conf -Source8: capi.service -Source9: capiinit.8 - -Source10: 40-isdn.rules -Source11: isdn.service - -Patch0: isdn4k-utils-redhat.patch -Patch1: isdn4k-utils-CVS-2009-10-20-lib64.patch -Patch3: isdn4k-utils-man.patch -Patch4: isdn4k-utils-autoconf25x.patch -Patch5: isdn4k-utils-true.patch - -Patch11: isdn4k-utils-statfs.patch -Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch -Patch13: isdn4k-utils-capiinit.patch -Patch18: isdn4k-utils-sh-linux.patch -Patch19: isdn4k-utils-autoconf-2.6.4-quoting.patch -Patch22: isdn4k-utils-CVS-2010-05-01-patched-vboxgetty-config.patch -Patch23: isdn-manpages.patch -Patch24: isdn-nofirmware.patch -Patch27: isdn4k-utils-strict-aliasing.patch -Patch28: isdn4k-fix-Werror-format-security-ftbfs.patch -Patch29: vbox-tcl-8.6.patch -Patch30: isdn4k-utils-mkzonedb.patch -Patch31: isdn4k-utils-3.27_20151118-perl-wld-modul.patch -Patch32: isdn4k-utils-3.27_20151118-help-text.patch - -Requires: udev >= 039-10.14.EL4 -Requires: hwdata >= 0.146.18.EL-1 -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -Requires: %{name}-data = %{version}-%{release} - -BuildRequires: gcc -BuildRequires: openjade -BuildRequires: linuxdoc-tools -BuildRequires: ncurses-devel -BuildRequires: tcl-devel -BuildRequires: libpcap-devel -BuildRequires: libICE-devel -BuildRequires: libSM-devel -BuildRequires: libX11-devel -BuildRequires: libXaw-devel -BuildRequires: libXmu-devel -BuildRequires: libXpm-devel -BuildRequires: libXt-devel -BuildRequires: libXext-devel -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: imake -BuildRequires: libtool -BuildRequires: ppp-devel -BuildRequires: systemd -BuildRequires: perl-podlators - -ExcludeArch: s390 s390x - -%description -The isdn4k-utils package contains a collection of utilities needed for -configuring an ISDN subsystem. - -%package data -Summary: data files -BuildArch: noarch - -%description data -The isdn4k-utils-data package contains data needed for configuring an ISDN subsystem. - -%package devel -Summary: Header files for capi development -Requires: %{name} = %{version}-%{release} - -%description devel -The isdn4k-utils-devel package contains the header files required to develop -capi applications. - -%package static -Summary: Static library for capi development -Requires: %{name} = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} - -%description static -The isdn4k-utils-devel package contains the capi static library required to -develop capi applications. - -%package vboxgetty -Summary: ISDN voice box (getty) -Requires: %{name}, tcl - -%description vboxgetty -The vboxgetty package contains vboxgetty and vboxputty, needed for an -ISDN voice box. - -%package -n xisdnload -Summary: An ISDN connection load average display for the X Window System -Requires: %{name} - -%description -n xisdnload -The xisdnload utility displays a periodically updated histogram of the -load average over your ISDN connection. - -%package doc -Summary: Documentation for isdn4k-utils -Requires: %{name} - -%description doc -The isdn4k-utils-doc package contains the documentation for isdn4k-utils. - -%prep -%setup -q -n %{name}-%{version}_%{gitdate} -%patch0 -p1 -b .redhat -%patch1 -p1 -b .lib64 - -%patch3 -p1 -b .man -%patch4 -p1 -b .ac25x -%patch5 -p1 -b .true - -%patch11 -p1 -b .statfs -%patch12 -p1 -b .xmon -%patch13 -p1 -b .capi -%patch18 -p1 -b .sh-support -%patch19 -p1 -b .quote -%patch22 -p1 -b .vboxgetty-config -%patch23 -p1 -b .manpages -%patch24 -p1 -b .nofw -%patch27 -p1 -b .strict-aliasing -%patch28 -p1 -b .Werror-format-security -%patch29 -p1 -b .tcl8.6 -%patch30 -p1 -b .mkzonedb-crash -%patch31 -p1 -b .perl-wld-modul -%patch32 -p1 -b .help-text - -# autoreconf for new autofoo -for i in */configure; do - cd `dirname $i` - autoreconf --force --install - cd .. -done - -# fix utf8 issue -for f in vbox/doc/de/vbox.txt.in imontty/imontty.8.in FAQ/tutorial/EN-i4l.sgml \ - isdnlog/README isdnlog/tools/rate-files.man \ - Mini-FAQ/isdn-faq.txt vbox/doc/de/vbox.sgml.in ; do - iconv -f iso-8859-1 -t utf-8 < $f > ${f}_ - mv ${f}_ $f -done - -%build -export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" - -mv .config.rpm .config -echo CONFIG_GENMAN=y >>.config -echo CONFIG_FAQ=y >>.config -echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >>.config -echo "CONFIG_DATADIR='%{_datadir}/isdn'" >>.config -echo "CONFIG_LIBDIR='%{_libdir}'" >>.config -echo "CONFIG_FIRMWAREDIR='%{_datadir}/isdn'" >>.config -echo "CONFIG_CARD_SBINDIR='%{_sbindir}'" >>.config -sed -e "s,',,g" .config > .config.h - -make subconfig -make - -%install -mkdir -p %{buildroot}/dev \ - %{buildroot}/etc/{rc.d/init.d,ppp,isdn} \ - %{buildroot}/var/{log/vbox,spool/vbox,lock/isdn} \ - %{buildroot}%{_sbindir} \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man1 \ - %{buildroot}%{_mandir}/man4 \ - %{buildroot}%{_mandir}/man8 - -make install DESTDIR=%{buildroot} \ - DATADIR=%{_datadir}/isdn \ - XAPPLOADDIR=%{app_defaults_dir} \ - MANPATH=%{_mandir} \ - MANSUFFIX=1 - -touch %{buildroot}/etc/ppp/ioptions - -if [ -f %{buildroot}/etc/isdn/isdn.conf.new ] ; then - mv -f %{buildroot}/etc/isdn/isdn.conf.new %{buildroot}/etc/isdn/isdn.conf -fi - -# copy config files for isdnlog -mkdir -p %{buildroot}%{_datadir}/isdn -cp -f isdnlog/*.dat %{buildroot}%{_datadir}/isdn/ -chmod 644 %{buildroot}%{_datadir}/isdn/*.dat - -# delete files to avoid conflicts and don't package *.la files -rm -rf %{buildroot}/etc/isdn/stop \ - %{buildroot}/etc/drdsl/adsl.conf \ - %{buildroot}%{_bindir}/cdb* \ - %{buildroot}%{_includedir}/freecdb.h \ - %{buildroot}%{_includedir}/freecdbmake.h \ - %{buildroot}%{_libdir}/*.la \ - %{buildroot}%{_libdir}/capi/*.la \ - %{buildroot}%{_libdir}/capi/*.so \ - %{buildroot}%{_mandir}/man1/cdb* \ - %{buildroot}%{_mandir}/man3 \ - %{buildroot}%{_mandir}/man5/vboxtcl.5* \ - %{buildroot}%{_docdir}/isdn4k-utils \ - %{buildroot}%{_docdir}/vbox \ - %{buildroot}/usr/X11R6 \ - %{buildroot}/usr/lib*/X11 - -# install isdn startup script -mkdir -p %{buildroot}%{_libexecdir} -install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/isdn -install -m0755 -d %{buildroot}%{_unitdir} -install -m0644 %{SOURCE11} %{buildroot}%{_unitdir}/isdn.service -install -m0644 %{SOURCE8} %{buildroot}%{_unitdir}/capi.service - -mv %{buildroot}%{_mandir}/man8/.isdnctrl_conf.8 \ - %{buildroot}%{_mandir}/man8/isdnctrl_conf.8 - -# move doc file to avoid conflict -mv isdnlog/README isdnlog/README.isdnlog - -# install man page for capiinit -install -m644 %{SOURCE9} %{buildroot}%{_mandir}/man8/ - -# install config file for capi -mkdir -p $RPM_BUILD_ROOT/etc -install -m 644 capiinit/capi.conf $RPM_BUILD_ROOT/etc -install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc - -# add comment -echo "# config files" >> %{buildroot}/etc/ppp/ioptions - -# install 40-isdn.rules, it's dropped from udev in F14 and later -%if 0%{?fedora} < 21 || 0%{?rhel} > 6 - mkdir -p %{buildroot}%{_udevdir} - install -m 644 %{SOURCE10} %{buildroot}%{_udevdir}/ -%endif - -mv %{buildroot}/pppd %{buildroot}%{_libdir} - -# fix file permission -chmod 755 %{buildroot}%{_bindir}/* %{buildroot}%{_sbindir}/* -chmod 644 %{buildroot}%{_mandir}/man*/* - -%post -/sbin/ldconfig -%systemd_post isdn.service - -%preun -%systemd_preun isdn.service - -%postun -/sbin/ldconfig -%systemd_postun_with_restart isdn.service - -%files -%dir /etc/isdn -%dir /var/spool/vbox -%dir /var/log/vbox -%dir %{_datadir}/isdn -%dir %{_libdir}/capi -%verify(not md5 size mtime) %config(noreplace) /etc/isdn/* -%verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions -%config(noreplace) /etc/ppp/peers/* -%config(noreplace) /etc/capi.conf -%config(noreplace) /etc/capi20.conf -%if 0%{?fedora} < 21 || 0%{?rhel} > 6 -%{_udevdir}/40-isdn.rules -%endif -%{_libdir}/*.so.* -%{_libdir}/capi/*.so.* -%{_sbindir}/avmcapictrl -%{_sbindir}/hisaxctrl -%{_sbindir}/icnctrl -%{_sbindir}/isdnctrl -%{_libexecdir}/isdn -%{_unitdir}/isdn.service -%{_unitdir}/capi.service -%{_bindir}/* -%{_sbindir}/capiinit -%{_sbindir}/imon -%{_sbindir}/imontty -%{_sbindir}/ipppd -%{_sbindir}/ipppstats -%{_sbindir}/iprofd -%{_sbindir}/isdnlog -%{_sbindir}/loopctrl -%{_sbindir}/mkzonedb -%{_sbindir}/rcapid -%{_sbindir}/vboxd -%{_sbindir}/vboxmail -%dir %{_datadir}/isdn -%{_libdir}/pppd -%doc gpl-2.0.txt README isdnlog/README.* -%doc isdnlog/tools/zone/de/01033/zred.dtag.bz2 -%{_mandir}/man1/* -%{_mandir}/man4/* -%{_mandir}/man5/* -%{_mandir}/man7/* -%{_mandir}/man8/* -%exclude %{_mandir}/man1/xmonisdn.1* -%exclude %{_mandir}/man1/xisdnload.1* -%exclude %{_mandir}/man5/vboxgetty.conf.5* -%exclude %{_mandir}/man8/vboxgetty.8* -%exclude %{_mandir}/man8/vboxputty.8* -%exclude %{_bindir}/xisdnload -%exclude %{_bindir}/xmonisdn - -%files vboxgetty -%doc vbox/examples/vboxgetty*.example -%{_mandir}/man5/vboxgetty.conf.5* -%{_mandir}/man8/vboxgetty.8* -%{_mandir}/man8/vboxputty.8* -%{_sbindir}/vboxgetty -%{_sbindir}/vboxputty - -%files devel -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc - -%files static -%{_libdir}/*.a - -%files -n xisdnload -%doc xmonisdn/README -%{app_defaults_dir}/* -%{_mandir}/man1/xisdnload.1* -%{_mandir}/man1/xmonisdn.1* -%{_bindir}/xisdnload -%{_bindir}/xmonisdn - -%files data -%{_datadir}/isdn/*.dat -%{_datadir}/isdn/dest.cdb -%ghost %{_datadir}/isdn/zone-de-dtag.cdb - -%files doc -%doc isdnlog/FAQ -%doc vbox/examples/vbox.conf.example -%doc vbox/examples/vboxd.conf.example -%doc vbox/examples/vboxrc.example -%doc vbox/examples/standard.tcl.example -%doc vbox/examples/timeout.msg.example -%doc vbox/examples/beep.msg* -%doc vbox/examples/timeout* -%doc FAQ/tutorial/* FAQ/i4lfaq* Mini-FAQ/isdn-faq.txt -%lang(de) %doc vbox/doc/de/vbox.sgml vbox/doc/de/vbox.txt - - -%changelog -* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 3.27-16 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Sun Oct 14 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.27-15 -- Package cleanups, drop long retired sys-v scripts migration - -* Mon Oct 08 2018 Than Ngo <than(a)redhat.com> - 3.27-14 -- fixed 1635832, help text descriptions - -* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Jun 23 2018 Than Ngo <than(a)redhat.com> - 3.27-12 -- fixed 1592360, drop requirements on initscripts - -* Wed Mar 07 2018 Adam Williamson <awilliam(a)redhat.com> - 3.27-11 -- Rebuild to fix GCC 8 mis-compilation - See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") - -* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Bjrn Esser <besser82(a)fedoraproject.org> - 3.27-9 -- Rebuilt for switch to libxcrypt - -* Tue Aug 08 2017 Than Ngo <than(a)redhat.com> - 3.27-8 -- fixes, wld.pm cannot be located - -* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jul 04 2016 Than Ngo <than(a)redhat.com> - 3.27-4 -- fix file permission - -* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Nov 19 2015 Dennis Gilmore <dennis(a)ausil.us> - 3.27-2 -- mark %%{_datadir}/isdn as a directory in the file list for isdn4k-utils -- fixes duplication of files making isdn4k-utils-data uninstallable - -* Wed Nov 18 2015 Than Ngo <than(a)redhat.com> - 3.27-1 -- update to 3.27 -- change to msidn.org git tree, thanks to Thomas Sailer - -* Fri Jul 10 2015 Than Ngo <than(a)redhat.com> - 3.2-101 -- bz#1239582, fix build failure with new gcc5 -- fix warnings in changelog - -* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-100 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-99 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Jul 30 2014 Than Ngo <than(a)redhat.com> - 3.2-98 -- fixed #1045909, multilib issue -- fixed #913721, udev rules are installed into wrong directory -- fixed #1073894, service files are installed with unnecessary executable perms -- fixed #1052058, mkzonedb killed by SIGSEGV - -* Wed Jun 18 2014 Than Ngo <than(a)redhat.com> - 3.2-97 -- fix bz#1106807, FTBFS - -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-96 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Jaroslav karvada <jskarvad(a)redhat.com> - 3.2-95 -- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 - -* Tue Jan 28 2014 Kyle McMartin <kyle(a)fedoraproject.org> - 3.2-94 -- isdn4k-fix-ipppd.patch: fix build on aarch64 (and future arches) -- isdn4k-fix-Werror-format-security-ftbfs.patch: fix FTBFS with - -Werror=format-security by explicitly using string types. (rhbz#1037140) - -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-93 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Apr 25 2013 Than Ngo <than(a)redhat.com> - 3.2-92 -- build with -fno-strict-aliasing - -* Wed Apr 03 2013 Than Ngo <than(a)redhat.com> - 3.2-91 -- add rhel condition - -* Fri Mar 01 2013 Than Ngo <than(a)redhat.com> - 3.2-90 -- add BR perl-podlators for pod2man - -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-89 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jan 4 2013 Tom Callaway <spot(a)fedoraproject.org> - 3.2-88 -- apply fixes to remove additional non-free items - -* Thu Nov 15 2012 Than Ngo <than(a)redhat.com> - 3.2-87 -- bz#875538, fix symbol lookup error -- bz#850173, Scriptlets replaced with new systemd macros - -* Mon Oct 08 2012 Than Ngo <than(a)redhat.com> - 3.2-86 -- drop support for < f14 - -* Mon Aug 20 2012 Than Ngo <than(a)redhat.com> - 3.2-85 -- add missing %% symbol for triggerun - -* Fri Jul 20 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> - 3.2-84 -- revert ARM arch exclusion -- add simple patch to fix building on ARM -- cleanup spec - -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-82 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jan 25 2012 Harald Hoyer <harald(a)redhat.com> 3.2-81 -- install everything in /usr - https://fedoraproject.org/wiki/Features/UsrMove - -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-80 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Aug 15 2011 Kalev Lember <kalevlember(a)gmail.com> - 3.2-79 -- Rebuilt for rpm bug #728707 - -* Thu Jul 21 2011 Than Ngo <than(a)redhat.com> - 3.2-78 -- install correct service scripts - -* Thu Jul 21 2011 Than Ngo <than(a)redhat.com> - 3.2-77 -- bz#717397, systemd unit file for isdn service -- drop triggerpostun - -* Tue Jul 12 2011 Toshio Kuratomi <toshio(a)fedoraproject.org> - 3.2-76 -- Apply systemd unit file for capi service - -* Wed Mar 16 2011 Than Ngo <than(a)redhat.com> - 3.2-75 -- apply patch to fix man pages, thanks to John Bradshaw - bz#673794, bz#665079, bz#663637, bz#675715, bz#669053, bz#675676, bz#669081, - bz#675604, bz#675679, bz#664335, bz#674204, bz#669091 - -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-74 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Sep 29 2010 jkeating - 3.2-73 -- Rebuilt for gcc bug 634757 - -* Mon Sep 20 2010 Than Ngo <than(a)redhat.com> - 3.2-72 -- bz#545469, put vboxgetty config file in correct directory -- fix wrong exit status in startup scrripts - -* Fri May 14 2010 Than Ngo <than(a)redhat.com> - 3.2-71 -- fix bz#566909, thanks to Louis Lagendijk - - own LIBDIR/capi - - fix loading of plugins - - remove chkconfig capi off - -* Tue May 04 2010 Than Ngo <than(a)redhat.com> - 3.2-70 -- enable capi.new -- add 40-isdn.rules, it's dropped from udev in F14 and later -- fix multilib issue -- add subpackage doc - -* Mon May 03 2010 Than Ngo <than(a)redhat.com> - 3.2-69 -- fix quotation issue with autoconf-2.64 -- fix bz#556056, split off -static subpackage -- fix bz#539020, FTBFS - -* Fri Jan 15 2010 Than Ngo <than(a)redhat.com> - 3.2-68 -- fix license -- cleanup - -* Wed Oct 28 2009 Than Ngo <than(a)redhat.com> - 3.2-67 -- drop useless BR libXp-devel - -* Mon Oct 19 2009 Than Ngo <than(a)redhat.com> - 3.2-66 -- add missing man pages -- add upstream fixes - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-65 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Feb 27 2009 Than Ngo <than(a)redhat.com> 3.2-64 -- fix build problem - -* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2-63 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Jan 19 2009 Than Ngo <than(a)redhat.com> - 3.2-62 -- fix #398121, capiplugin.so uses non-existent libcapi20.so -- fix CAPI overflow -- fix #471712, add sh architecture support - -* Mon Oct 27 2008 Than Ngo <than(a)redhat.com> 3.2-61 -- bz450370, fix multilib issue - -* Thu Oct 02 2008 Than Ngo <than(a)redhat.com> 3.2-60 -- rebuild - -* Tue Aug 05 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 3.2-59 -- fix license tag - -* Mon Mar 03 2008 Than Ngo <than(a)redhat.com> 3.2-58 -- fix build issue with new gcc - -* Fri Feb 15 2008 Than Ngo <than(a)redhat.com> 3.2-57 -- rebuild against gcc 4.3 - -* Mon Jan 07 2008 Than Ngo <than(a)redhat.com> 3.2-56 -- rebuilt - -* Thu Sep 27 2007 Than Ngo <than(a)redhat.com> - 3.2-55 -- fix build issue with glibc - -* Thu Feb 08 2007 Than Ngo <than(a)redhat.com> 3.2-54.fc7 -- rebuild - -* Wed Nov 29 2006 Karsten Hopp <karsten(a)redhat.com> 3.2-53.fc7 -- rebuild with new libpcap - -* Mon Nov 13 2006 Than Ngo <than(a)redhat.com> - 3.2-52.fc7 -- fix #213233, require main package with %%{version}-%%{release} - -* Mon Oct 30 2006 Than Ngo <than(a)redhat.com> 3.2-51 -- move .so in -devel #203627 - -* Wed Jul 19 2006 Than Ngo <than(a)redhat.com> 3.2-50 -- add pppd 2.4.4 -- use isdn-header files from upstream - -* Fri Jul 14 2006 Jesse Keating <jkeating(a)redhat.com> - 3.2-49 -- rebuild -- add missing br automake libtool - -* Wed May 31 2006 Than Ngo <than(a)redhat.com> 3.2-47 -- add requires on libpcap-devel - -* Mon May 15 2006 Than Ngo <than(a)redhat.com> 3.2-46 -- fix #191754, buildrequire on libXext-devel - -* Tue Apr 25 2006 Adam Jackson <ajackson(a)redhat.com> 3.2-45 -- Rebuild for updated imake build rules - -* Tue Apr 25 2006 Than Ngo <than(a)redhat.com> 3.2-44 -- add capi service - -* Wed Apr 19 2006 Than Ngo <than(a)redhat.com> 3.2-43 -- update to CVS-2006-02-13 -- add support capi #169902 - -* Thu Mar 30 2006 Than Ngo <than(a)redhat.com> 3.2-42 -- support pppd 2.4.3 #187218 - -* Fri Mar 10 2006 Than Ngo <than(a)redhat.com> 3.2-41 -- add missing symlink for capi plugins #165198 - -* Wed Mar 01 2006 Karsten Hopp <karsten(a)redhat.de> 3.2-40 -- Buildrequires: libXp-devel - -* Fri Feb 17 2006 Than Ngo <than(a)redhat.com> 3.2-39 -- fix rpm file conflict #181854 - -* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 3.2-38.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 3.2-38.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Sun Dec 18 2005 Than Ngo <than(a)redhat.com> 3.2-38 -- add correct app-defaults directory - -* Fri Dec 16 2005 Jesse Keating <jkeating(a)redhat.com> -- rebuilt for new gcj - -* Wed Nov 16 2005 Than Ngo <than(a)redhat.com> 3.2-36 -- fix for modular X - -* Mon Nov 14 2005 Than Ngo <than(a)redhat.com> 3.2-35 -- fix for modular X - -* Sat Nov 12 2005 Florian La Roche <laroche(a)redhat.com> -- rebuild - -* Tue Sep 13 2005 Than Ngo <than(a)redhat.com> 3.2-33 -- cleanup %%post - -* Wed Jul 27 2005 Than Ngo <than(a)redhat.com> 3.2-32 -- rebuilt - -* Tue Jul 19 2005 Than Ngo <than(a)redhat.com> 3.2-31 -- buildrequires on libpcap - -* Mon Jul 18 2005 Than Ngo <than(a)redhat.com> 3.2-30 -- rebuild to fix broken dependencies - -* Mon Jun 20 2005 Than Ngo <than(a)redhat.com> 3.2-29 -- workaround for loading isdn module at system startup #160831 - -* Fri May 27 2005 Bill Nottingham <notting(a)redhat.com> 3.2-28 -- remove setuid bit from vboxbeep - -* Wed Apr 20 2005 Martin Stransky <stransky(a)redhat.com> 3.2-27 -- fix for large filesystems (#155441) - -* Wed Mar 09 2005 Than Ngo <than(a)redhat.com> 3.2-26 -- update cvs snapshot -- fix gcc4 build problem - -* Sat Mar 05 2005 Than Ngo <than(a)redhat.com> 3.2-25 -- rebuilt - -* Wed Feb 16 2005 Than Ngo <than(a)redhat.com> 3.2-24 -- update cvs snapshot -- use RPM_OPT_FLAGS - -* Wed Feb 02 2005 Than Ngo <than(a)redhat.com> 3.2-23 -- fix typo in isdn startup script - -* Tue Jan 25 2005 Than Ngo <than(a)redhat.com> 3.2-22 -- fix the bug in isdn startup script, #146057 - -* Wed Dec 01 2004 Than Ngo <than(a)redhat.com> 3.2-21 -- fix some minor build problems #140941 - -* Sat Nov 20 2004 Miloslav Trmac <mitr(a)redhat.com> 3.2-20 -- Convert imontty.8 to UTF-8 - -* Thu Nov 18 2004 Than Ngo <than(a)redhat.com> 3.2-19 -- update cvs snapshot -- workaround, add capi devices - -* Tue Oct 05 2004 Than Ngo <than(a)redhat.com> 3.2-18.p1.1 -- add workaround for #134525 - -* Wed Sep 01 2004 Than Ngo <than(a)redhat.com> 3.2-17.p1.1 -- get rid of CVS files, #131430 - -* Thu May 13 2004 Than Ngo <than(a)redhat.com> 3.2-16.p1.1 -- fix build problem with gcc-3.4 -- fix typo bug in isdnlog, bug #120568 -- fix capiplugin for working with pppd 2.4.2, bug #125723 - -* Thu May 13 2004 Than Ngo <than(a)redhat.com> 3.2-15.p1.1 -- add patch to enable PIE build of userisdnctl - -* Tue May 11 2004 Than Ngo <than(a)redhat.com> 3.2-14.p1.1 -- fixed usage message in isdndial, bug #122987 - -* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Wed Feb 25 2004 Than Ngo <than(a)redhat.com> 3.2-13.p1 -- rebuilt - -* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Wed Feb 11 2004 Than Ngo <than(a)redhat.com> 3.2-11.p1 -- add fix to get isdnlog working with Fritz!Card PCI V2.0, bug #115205 - -* Wed Jan 21 2004 Than Ngo <than(a)redhat.com> 3.2-10.p1 -- fix build problem with new libpcap - --* Wed Jan 14 2004 Than Ngo <than(a)redhat.com> 3.2-9.p1 -- fixed permission problem - -* Thu Dec 18 2003 Than Ngo <than(a)redhat.com> 3.2-8.p1 -- fixed conflict problem with redhat-config-network - -* Mon Dec 15 2003 Than Ngo <than(a)redhat.com> 3.2-7.p1 -- add patch to build against new glibc - -* Fri Dec 12 2003 Jens Petersen <petersen(a)redhat.com> - 3.2-6.p1 -- rebuild for tcl 8.4 - -* Thu Oct 23 2003 Than Ngo <than(a)redhat.com> 3.2-5.p1 -- fix ISDN script to work with new redhat-config-network - -* Wed Oct 22 2003 Than Ngo <than(a)redhat.com> 3.2-4.p1 -- allow using nickname -- cleanup isdn script - -* Fri Oct 10 2003 Than Ngo <than(a)redhat.com> 3.2-3.p1 -- fixed wrong version of xisdnload (bug #106616) - -* Tue Sep 30 2003 Than Ngo <than(a)redhat.com> 3.2-2.p1 -- cleanup specfile - -* Tue Sep 30 2003 Than Ngo <than(a)redhat.com> 3.2-1.p1 -- 3.2p1 -- support IPPP_FILTER (bug #104928) - -* Mon Aug 11 2003 Than Ngo <than(a)redhat.com> 3.1-77 -- rebuilt - -* Mon Aug 11 2003 Than Ngo <than(a)redhat.com> 3.1-76 -- add patch to build isdn4k-utils without kernel-source (bug #101751) -- cleanup (bug #79641) - -* Mon Aug 11 2003 Than Ngo <than(a)redhat.com> 3.1-75 -- rebuilt - -* Mon Aug 11 2003 Than Ngo <than(a)redhat.com> 3.1-74 -- add tcl-devel in buildrequires (bug #102034) - -* Mon Jun 30 2003 Than Ngo <than(a)redhat.com> 3.1-73 -- added missing example files (bug #81687) -- move vboxgetty man page in vboxgetty subpackage - -* Thu Jun 19 2003 Than Ngo <than(a)redhat.com> 3.1-71 -- get rid of ipppcomp - -* Tue Jun 10 2003 Than Ngo <than(a)redhat.com> 3.1-69 -- fix incorrect error messages (bug #96931) - -* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com> -- rebuilt - -* Wed May 28 2003 Than Ngo <than(a)redhat.com> 3.1-66.1 -- fix buildrequires problem - -* Fri May 23 2003 Than Ngo <than(a)redhat.com> 3.1-65 -- add usage fix - -* Thu May 22 2003 Jeremy Katz <katzj(a)redhat.com> 3.1-63 -- fix build with gcc 3.3 - -* Mon Feb 3 2003 Than Ngo <than(a)redhat.com> 3.1-62 -- remove excludearch x86_64 -- add fPIC patch for x86_64 - -* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com> -- rebuilt - -* Tue Dec 10 2002 Tim Powers <timp(a)redhat.com> 3.1-60 -- rebuild to fix broken tcltk deps - -* Fri Nov 8 2002 Than Ngo <than(a)redhat.com> 3.1-59 -- fix build problem -- for the present exclude x86_64, it needs kernel-source rpm for building - -* Mon Jul 01 2002 Than Ngo <than(a)redhat.com> 3.1-58 -- add userisdnctl, isdnup - -* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com> -- automated rebuild - -* Tue Jun 18 2002 Than Ngo <than(a)redhat.com> 3.1-56 -- don't forcibly strip binaries - -* Fri Jun 14 2002 Than Ngo <than(a)redhat.com> 3.1-55 -- fix a bug in pppdcapi plugin for working with pppd-2.4.1 (bug #64279) - -* Thu May 23 2002 Bernhard Rosenkraenzer <bero(a)redhat.com> 3.1-54 -- Update -- Fix build with gcc 3.1 -- Fix build with current auto* tools - -* Mon Apr 8 2002 Than Ngo <than(a)redhat.com> 3.1-53 -- fix bug in loading hisax modul for Card Elsa Quickstep 1000 (bug #62892) - -* Fri Feb 22 2002 Than Ngo <than(a)redhat.com> 3.1-52 -- fix bug in isdnlog (bug #60013) -- fix bug in imon - -* Thu Feb 21 2002 Than Ngo <than(a)redhat.com> 3.1-51 -- fix bad memory allocation (enrico.scholz(a)informatik.tu-chemnitz.de), bug #60179 - -* Tue Feb 19 2002 Bernhard Rosenkraenzer <bero(a)redhat.com> 3.1-50 -- new upstream, needed to switch isdnlog to EUR currency for contries that - have it -- fix installation of pppcapiplugin man page -- don't build against 2.4.5 kernel headers, they're not compatible with - 2.4.17. - -* Wed Jan 09 2002 Tim Powers <timp(a)redhat.com> -- automated rebuild - -* Wed Dec 05 2001 Than Ngo <than(a)redhat.com> 3.1-48 -- new upstream -- remove some unused patch files -- move pppcapiplugin to /usr/lib/pppd, The plugin option now looks in here -- devel sub package -- buildreqquires: linuxdoc-tools - -* Mon Oct 29 2001 Than Ngo <than(a)redhat.com> 3.1-47 -- fixed symlinks bugs (bug #55306) -- fix a bug in converting of old isdn configuration (bug #55083) -- some hacks for ASUS COM ISDNLink ISA PnP - -* Tue Aug 28 2001 Than Ngo <than(a)redhat.com> 3.1-46 -- some hacks for Teles 16.3 PnP -- fix order of isdn script - -* Tue Aug 21 2001 Than Ngo <than(a)redhat.com> 3.1-45 -- fix bug #52044 - -* Wed Aug 8 2001 Than Ngo <than(a)redhat.com> -- use hardlinks instead softlinks - -* Mon Jul 02 2001 Than Ngo <than(a)redhat.com> -- make isdnctrl executable by normal users (Bug #30803) -- fix a minor bug in triggerpostun -- fix rebuild problem in beehive if kernel-source is missed - -* Tue Jun 26 2001 Than Ngo <than(a)redhat.com> -- split package into isdn4k-utils, isdn4k-utils-vboxgetty, xisdnload -- convert old isdn configuration format into new format -- add startup script for loading module and starting isdnlog - -* Tue Jun 19 2001 Than Ngo <than(a)redhat.com> -- buildprereq: XFree86-devel ncurses-devel tcl (Bug #45048) - -* Tue Jun 19 2001 Than Ngo <than(a)redhat.com> -- fix to build against kernel-2.4.5 -- fix to build against XFree86-4.1.x -- exclude s390, s390x - -* Mon Feb 12 2001 Than Ngo <than(a)redhat.com> -- clean up specfile - -* Sat Feb 10 2001 Than Ngo <than(a)redhat.com> -- fixed for building against new glibc -- added missing files: divertctrl, eiconctrl, actctrl - -* Thu Feb 08 2001 Than Ngo <than(a)redhat.com> -- fixed file conflicts - -* Wed Feb 07 2001 Than Ngo <than(a)redhat.com> -- updated ipppd, isdnctrl for working with kernel-2.4 -- added missing BuildRequires - -* Tue Feb 06 2001 Than Ngo <than(a)redhat.com> -- rebuild against to fix version mismatch in isdnlog - -* Mon Nov 20 2000 Than Ngo <than(a)redhat.com> -- rebuilt to fix bad dir perms - -* Wed Nov 01 2000 Than Ngo <than(a)redhat.com> -- added ibod, a ISDN MPPP bandwidth on demand daemon - -* Thu Aug 3 2000 Than Ngo <than(a)redhat.de> -- add more documents -- and missing config files to isdnlog -- some fixes in vbox, isdnlog, vboxgetty -- mark ioptions as %%config(noreplace) -- add pppdcapiplugin -- add missing /sbin/ldconfig in %%post and %%postun -- fix to build on ia64 - -* Thu Jul 13 2000 Than Ngo <than(a)redhat.de> -- fix to build as nonroot - -* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com> -- automatic rebuild - -* Fri Jun 30 2000 Than Ngo <than(a)redhat.de> -- add documents in %%doc instead make install doc - -* Thu Jun 29 2000 Than Ngo <than(a)redhat.de> -- add some header files for isdn4k-utils - (don't need kernel-sources anymore) -- update to v3.1pre1 - -* Fri Jun 16 2000 Than Ngo <than(a)redhat.de> -- rebuilt for 7.0 -- FHS fixes -- fix dependencies problem with new tcltk -- fix to built with kernel-2.4 - -* Fri Apr 28 2000 Florian La Roche <Florian.LaRoche(a)redhat.com> -- add /usr/lib/isdn to filelist - -* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero(a)redhat.com> -- fix compilation with kernel 2.4.x -- rebuild with new ncurses and Tcl -- enable building of eurofile and divertctl stuff - -* Tue Mar 7 2000 Jeff Johnson <jbj(a)redhat.com> -- rebuild for sparc baud rates > 38400. - -* Tue Feb 29 2000 Ngo Than <than(a)redhat.de> -- move isdn.init in isdn4k-utils package to isdn-config package - -* Mon Feb 21 2000 Ngo Than <than(a)redhat.de> -- added small to fix problem for startup and shuttdown isdn - -* Wed Feb 16 2000 Ngo Than <than(a)redhat.com> -- added small patch for ipppd, it can handle default route - -* Fri Feb 11 2000 Florian La Roche <Florian.LaRoche(a)redhat.com> -- remove execute bit from /etc/ppp/ioptions -- do not create /dev/isdnctrl if it already exists - -* Fri Feb 11 2000 Florian La Roche <Florian.LaRoche(a)redhat.com> -- remove suid-root from /usr/bin/vboxbeep - -* Fri Feb 11 2000 Florian La Roche <Florian.LaRoche(a)redhat.com> -- use relative instead of absolute link in postinstall script -- use only one patch-file for the config file -- change from 0700 to 0755 perms -- change Makefiles instead of moving things around in the spec file -- include the manpages of the X11 progs only in the xisdnload rpm - -* Thu Feb 03 2000 Ngo Than <than(a)redhat.de> -- fix pap and chap problem in isdn.init - -* Tue Feb 01 2000 Ngo Than <than(a)redhat.de> -- added new isdn.init for rhisdn. - -* Mon Jan 17 2000 Karsten Hopp <karsten(a)redhat.de> -- uses now configured network and netmask - -* Thu Jan 06 2000 Karsten Hopp <karsten(a)redhat.de> -- Configures DNS if no nameserver entry in resolv.conf -- needed for dial-on-demand - -* Mon Jan 03 2000 Karsten Hopp <karsten(a)redhat.de> -- isdnconfig moved into separate spec-file - -* Tue Dec 21 1999 Karsten Hopp <karsten(a)redhat.de> -- updated isdn4k-utils -- several bugfixes isdnconfig - -* Thu Sep 30 1999 Karsten Hopp <karsten(a)redhat.de> -- added isdnconfig script and related files - -* Sat Sep 25 1999 Bill Nottingham <notting(a)redhat.com> -- bang on init script - -* Mon Sep 20 1999 Cristian Gafton <gafton(a)redhat.com> -- fix dangling symlink - -* Mon Sep 13 1999 Bill Nottingham <notting(a)redhat.com> -- strip binaries -- chkconfig --del in %%preun, not %%postun - -* Tue Sep 07 1999 Cristian Gafton <gafton(a)redhat.com> -- fix some of the german exclusive language in the init script - -* Sun Aug 29 1999 Cristian Gafton <gafton(a)redhat.com> -- imported into Red Hat Linux diff --git a/sources b/sources deleted file mode 100644 index 8715dc0..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -45e047c31ebbdfd2865532a80393223b capiinit.8 -8b4733559b1c4de3d7716af4dbbbb354 isdn4k-utils-3.27_20151118.tar.xz diff --git a/vbox-tcl-8.6.patch b/vbox-tcl-8.6.patch deleted file mode 100644 index ed0693a..0000000 --- a/vbox-tcl-8.6.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -up isdn4k-utils-3.27_20151118/ipppd/main.c.than isdn4k-utils-3.27_20151118/ipppd/main.c ---- isdn4k-utils-3.27_20151118/ipppd/main.c.than 2015-11-18 21:13:04.575352833 +0100 -+++ isdn4k-utils-3.27_20151118/ipppd/main.c 2015-11-18 21:39:36.637385767 +0100 -@@ -1297,12 +1297,13 @@ int vfmtmsg(char *buf,int buflen,char *f - break; - case 'r': - f = va_arg(args, char *); -- a = va_arg(args, va_list); -+ va_copy(a, args); - #if defined(__alpha__) || defined(__sh__) || defined ( __arm__) /* always do this? */ - n = fmtmsg(buf, buflen + 1, f, a); - #else - n = vfmtmsg(buf, buflen + 1, f, a); - #endif -+ va_end(a); - buf += n; - buflen -= n; - continue; -diff -up isdn4k-utils-3.27_20151118/isdnlog/isdnrep/isdnrep.c.than isdn4k-utils-3.27_20151118/isdnlog/isdnrep/isdnrep.c -diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c.than isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c ---- isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c.than 2015-11-18 21:10:11.454980332 +0100 -+++ isdn4k-utils-3.27_20151118/isdnlog/tools/rate.c 2015-11-18 21:10:53.089588917 +0100 -@@ -1134,11 +1134,11 @@ char *prefix2provider_variant(int pref - return s; - } - --inline int getNProvider( void ) { -+extern inline int getNProvider( void ) { - return nProvider; - } - --inline int isProviderBooked( int i) { -+extern inline int isProviderBooked( int i) { - return Provider[i].booked; - } - -diff -up isdn4k-utils-3.27_20151118/isdnlog/tools/rate.h.than isdn4k-utils-3.27_20151118/isdnlog/tools/rate.h -diff -up isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c.than isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c ---- isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c.than 2015-11-18 21:45:31.798046888 +0100 -+++ isdn4k-utils-3.27_20151118/vbox3/vboxgetty/tclscript.c 2015-11-18 21:45:44.743925189 +0100 -@@ -4,6 +4,8 @@ - ** Copyright 1996-1998 Michael 'Ghandi' Herold <michael(a)abadonna.mayn.de> - */ - -+#define USE_INTERP_ERRORLINE -+ - #ifdef HAVE_CONFIG_H - # include "../config.h" - #endif -diff -up isdn4k-utils-3.27_20151118/vbox/Makefile.in.than isdn4k-utils-3.27_20151118/vbox/Makefile.in ---- isdn4k-utils-3.27_20151118/vbox/Makefile.in.than 2015-11-18 21:51:41.090575154 +0100 -+++ isdn4k-utils-3.27_20151118/vbox/Makefile.in 2015-11-18 21:52:12.312281654 +0100 -@@ -53,7 +53,7 @@ INSTALL_DIRS = @INSTALL@ -d - #----------------------------------------------------------------------------# - - CC = @CC@ --VBOX_CFLAGS = @CFLAGS@ @LINK_NCURSES_INCL@ @LINK_TCL_INCL@ -Wall -fno-strict-aliasing -fpie -+VBOX_CFLAGS = -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE @CFLAGS@ @LINK_NCURSES_INCL@ @LINK_TCL_INCL@ -Wall -fno-strict-aliasing -fpie - LDFLAGS = @LDFLAGS@ -pie - - #----------------------------------------------------------------------------# -diff -up isdn4k-utils-3.27_20151118/vbox/src/script.c.than isdn4k-utils-3.27_20151118/vbox/src/script.c ---- isdn4k-utils-3.27_20151118/vbox/src/script.c.than 2015-11-18 21:40:49.833697651 +0100 -+++ isdn4k-utils-3.27_20151118/vbox/src/script.c 2015-11-18 21:45:17.911177444 +0100 -@@ -4,6 +4,9 @@ - ** Copyright (C) 1996, 1997 Michael 'Ghandi' Herold - */ - -+#define USE_INTERP_RESULT -+#define USE_INTERP_ERRORLINE -+ - #include "config.h" - - #if TIME_WITH_SYS_TIME

1 0

Architecture specific change in rpms/tinygo.git
by githook-noreply＠fedoraproject.org 25 Sep '19

25 Sep '19

The package rpms/tinygo.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/tinygo.git/commit/?id=6398141dc32ff…. Change: +ExcludeArch: armv7hl ppc64le s390x Thanks. Full change: ============ commit a13f77fe54e4afffde707a9ce20013dbbe6472a1 Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Wed Sep 25 02:47:00 2019 -0400 Add patch reference. diff --git a/tinygo.spec b/tinygo.spec index b46733d..0222e01 100644 --- a/tinygo.spec +++ b/tinygo.spec @@ -49,7 +49,7 @@ Patch0001: 0001-Use-Fedora-command-names.patch Patch0002: 0002-Skip-ARM-Linux-tests.patch # We can't include STM32 .svd files because of their weird license. Patch0003: 0003-Skip-STM32-tests.patch -# ... +# https://github.com/tinygo-org/tinygo/pull/590 Patch0004: 0004-Allow-overridding-Python-used-for-generators.patch # Not supported upstream yet. commit 6398141dc32ff30c20778786b9383c103a1545fa Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Wed Sep 25 02:25:23 2019 -0400 Enable x86 build. diff --git a/tinygo.spec b/tinygo.spec index 00064d6..b46733d 100644 --- a/tinygo.spec +++ b/tinygo.spec @@ -14,8 +14,9 @@ Version: 0.8.0 %global compiler_rt_version 8.0.0 %global nrfx_commit 3ab39a9d457bfe627473ed0e03a7f1161d9e4f27 -# To match regular Go's /usr/share/gocode -%global tinygoroot %{_prefix}/share/tinygo +# No longer matching regular Go's /usr/share/gocode because it also provides +# pre-compiled binaries, and symlinks to arch-specific clang headers. +%global tinygoroot %{_libdir}/tinygo %gometa @@ -52,7 +53,7 @@ Patch0003: 0003-Skip-STM32-tests.patch Patch0004: 0004-Allow-overridding-Python-used-for-generators.patch # Not supported upstream yet. -ExcludeArch: %{ix86} armv7hl ppc64le s390x +ExcludeArch: armv7hl ppc64le s390x BuildRequires: clang-devel = %{clang_version} BuildRequires: golang(github.com/blakesmith/ar) @@ -108,7 +109,7 @@ rm lib/nrfx/.gitignore chmod -x lib/nrfx/doc/generate_html_doc.sh mkdir lib/clang -ln -s /usr/lib64/clang/%{clang_version}/include lib/clang/include +ln -s %{_libdir}/clang/%{clang_version}/include lib/clang/include %build @@ -178,6 +179,7 @@ PATH=%{buildroot}%{_bindir}:$PATH make smoketest AVR=0 RISCV=0 %changelog * Tue Sep 24 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0.8.0-1 - Update to latest version +- Enable x86 build * Sun Aug 04 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0.7.1-1 - Update to latest version commit afb8a60cc7681148f8bfe3344d61b9b574b47cfb Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Tue Sep 24 20:19:48 2019 -0400 Ignore non-clean tarballs as well. diff --git a/.gitignore b/.gitignore index 250346d..c875580 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,11 @@ -/avr-6624554c02b237b23dc17d53e992bf54033fc228.tar.gz -/cmsis-9fe411cef1cef5de58e5957b89760759de44e393-clean.tar.xz -/cmsis_svd-b6f0a65ac37760f52d6ade23dd3205424d6c91fa-clean.tar.xz -/compiler-rt-8.0.0.src.tar.xz -/nrfx-3ab39a9d457bfe627473ed0e03a7f1161d9e4f27.tar.gz +/avr-*.tar.gz +/cmsis-*.tar.gz +/cmsis-*-clean.tar.xz +/cmsis_svd-*.tar.gz +/cmsis_svd-*-clean.tar.xz +/compiler-rt-*.src.tar.xz +/nrfx-*.tar.gz /tinygo-0.6.0.tar.gz /tinygo-0.7.0.tar.gz -/cmsis_svd-5910f3d115a53ead55c8158da24a8fa8bda1eb50-clean.tar.xz /tinygo-0.7.1.tar.gz /tinygo-0.8.0.tar.gz commit e27e385162570b300ebec5c1f452b09a5f9111bc Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Tue Sep 24 20:15:56 2019 -0400 Update to latest version. diff --git a/.gitignore b/.gitignore index 2567ac0..250346d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /tinygo-0.7.0.tar.gz /cmsis_svd-5910f3d115a53ead55c8158da24a8fa8bda1eb50-clean.tar.xz /tinygo-0.7.1.tar.gz +/tinygo-0.8.0.tar.gz diff --git a/0001-Use-Fedora-command-names.patch b/0001-Use-Fedora-command-names.patch new file mode 100644 index 0000000..bdb100c --- /dev/null +++ b/0001-Use-Fedora-command-names.patch @@ -0,0 +1,53 @@ +From 09d3a1157e66bde46f3919142f65e409de7b447b Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +Date: Fri, 7 Jun 2019 20:55:25 -0400 +Subject: [PATCH 1/4] Use Fedora command names. + +Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +--- + main_test.go | 2 +- + target.go | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/main_test.go b/main_test.go +index 9b406d2..6a47393 100644 +--- a/main_test.go ++++ b/main_test.go +@@ -70,7 +70,7 @@ func TestCompiler(t *testing.T) { + continue // TODO: improve CGo + } + t.Run(path, func(t *testing.T) { +- runTest(path, tmpdir, "arm--linux-gnueabihf", t) ++ runTest(path, tmpdir, "arm--linux-none", t) + }) + } + +diff --git a/target.go b/target.go +index ad701e8..29ac6a0 100644 +--- a/target.go ++++ b/target.go +@@ -181,7 +181,7 @@ func LoadTarget(target string) (*TargetSpec, error) { + } + target = llvmarch + "--" + llvmos + if goarch == "arm" { +- target += "-gnueabihf" ++ target += "-none" + } + return defaultTarget(goos, goarch, target) + } +@@ -246,9 +246,9 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) { + if goarch != runtime.GOARCH { + // Some educated guesses as to how to invoke helper programs. + if goarch == "arm" && goos == "linux" { +- spec.Linker = "arm-linux-gnueabihf-gcc" +- spec.GDB = "arm-linux-gnueabihf-gdb" +- spec.Emulator = []string{"qemu-arm", "-L", "/usr/arm-linux-gnueabihf"} ++ spec.Linker = "arm-linux-gnu-gcc" ++ spec.GDB = "arm-linux-gnu-gdb" ++ spec.Emulator = []string{"qemu-arm", "-L", "/usr/arm-linux-none"} + } + if goarch == "arm64" && goos == "linux" { + spec.Linker = "aarch64-linux-gnu-gcc" +-- +2.21.0 + diff --git a/0001-Use-system-path-for-TINYGOROOT-default.patch b/0001-Use-system-path-for-TINYGOROOT-default.patch deleted file mode 100644 index 0cf6bfe..0000000 --- a/0001-Use-system-path-for-TINYGOROOT-default.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 76d5a1c269245c410458702997c72d64e53afdb3 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> -Date: Fri, 7 Jun 2019 20:53:54 -0400 -Subject: [PATCH 1/4] Use system path for TINYGOROOT default. - -Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> ---- - target.go | 17 ++--------------- - 1 file changed, 2 insertions(+), 15 deletions(-) - -diff --git a/target.go b/target.go -index 679fa19..fc4589b 100644 ---- a/target.go -+++ b/target.go -@@ -267,21 +267,8 @@ func sourceDir() string { - return root - } - -- // Find root from executable path. -- path, err := os.Executable() -- if err != nil { -- // Very unlikely. Bail out if it happens. -- panic("could not get executable path: " + err.Error()) -- } -- root = filepath.Dir(filepath.Dir(path)) -- if isSourceDir(root) { -- return root -- } -- -- // Fallback: use the original directory from where it was built -- // https://stackoverflow.com/a/32163888/559350 -- _, path, _, _ = runtime.Caller(0) -- root = filepath.Dir(path) -+ // Use system directory -+ root = "/usr/share/tinygo" - if isSourceDir(root) { - return root - } --- -2.21.0 - diff --git a/0002-Skip-ARM-Linux-tests.patch b/0002-Skip-ARM-Linux-tests.patch new file mode 100644 index 0000000..1ced3a0 --- /dev/null +++ b/0002-Skip-ARM-Linux-tests.patch @@ -0,0 +1,39 @@ +From 351e01b09db90ca01a3a70817c7360c986ef7eb7 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +Date: Wed, 12 Jun 2019 04:28:55 -0400 +Subject: [PATCH 2/4] Skip ARM Linux tests. + +We don't have the C library to do this. + +Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +--- + main_test.go | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/main_test.go b/main_test.go +index 6a47393..86e7fd3 100644 +--- a/main_test.go ++++ b/main_test.go +@@ -66,6 +66,9 @@ func TestCompiler(t *testing.T) { + if runtime.GOOS == "linux" { + t.Log("running tests for linux/arm...") + for _, path := range matches { ++ if true { ++ continue ++ } + if path == filepath.Join("testdata", "cgo")+string(filepath.Separator) { + continue // TODO: improve CGo + } +@@ -76,6 +79,9 @@ func TestCompiler(t *testing.T) { + + t.Log("running tests for linux/arm64...") + for _, path := range matches { ++ if true { ++ continue ++ } + if path == filepath.Join("testdata", "cgo")+string(filepath.Separator) { + continue // TODO: improve CGo + } +-- +2.21.0 + diff --git a/0002-Use-Fedora-command-names.patch b/0002-Use-Fedora-command-names.patch deleted file mode 100644 index a55f18f..0000000 --- a/0002-Use-Fedora-command-names.patch +++ /dev/null @@ -1,53 +0,0 @@ -From ed1e9c66e17e2cf3bc2d21f04208f07a259ffc32 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> -Date: Fri, 7 Jun 2019 20:55:25 -0400 -Subject: [PATCH 2/4] Use Fedora command names. - -Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> ---- - main_test.go | 2 +- - target.go | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/main_test.go b/main_test.go -index fa85a82..f0d403c 100644 ---- a/main_test.go -+++ b/main_test.go -@@ -70,7 +70,7 @@ func TestCompiler(t *testing.T) { - continue // TODO: improve CGo - } - t.Run(path, func(t *testing.T) { -- runTest(path, tmpdir, "arm--linux-gnueabihf", t) -+ runTest(path, tmpdir, "arm--linux-none", t) - }) - } - -diff --git a/target.go b/target.go -index fc4589b..6c29ce8 100644 ---- a/target.go -+++ b/target.go -@@ -173,7 +173,7 @@ func LoadTarget(target string) (*TargetSpec, error) { - } - target = llvmarch + "--" + llvmos - if goarch == "arm" { -- target += "-gnueabihf" -+ target += "-none" - } - return defaultTarget(goos, goarch, target) - } -@@ -238,9 +238,9 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) { - if goarch != runtime.GOARCH { - // Some educated guesses as to how to invoke helper programs. - if goarch == "arm" && goos == "linux" { -- spec.Linker = "arm-linux-gnueabihf-gcc" -- spec.GDB = "arm-linux-gnueabihf-gdb" -- spec.Emulator = []string{"qemu-arm", "-L", "/usr/arm-linux-gnueabihf"} -+ spec.Linker = "arm-linux-gnu-gcc" -+ spec.GDB = "arm-linux-gnu-gdb" -+ spec.Emulator = []string{"qemu-arm", "-L", "/usr/arm-linux-none"} - } - if goarch == "arm64" && goos == "linux" { - spec.Linker = "aarch64-linux-gnu-gcc" --- -2.21.0 - diff --git a/0003-Skip-ARM-Linux-tests.patch b/0003-Skip-ARM-Linux-tests.patch deleted file mode 100644 index 5117ea3..0000000 --- a/0003-Skip-ARM-Linux-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8e26941216ff2213ab396ba2bdfe06a370a77553 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> -Date: Wed, 12 Jun 2019 04:28:55 -0400 -Subject: [PATCH 3/4] Skip ARM Linux tests. - -We don't have the C library to do this. - -Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> ---- - main_test.go | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/main_test.go b/main_test.go -index f0d403c..0f28752 100644 ---- a/main_test.go -+++ b/main_test.go -@@ -66,6 +66,9 @@ func TestCompiler(t *testing.T) { - if runtime.GOOS == "linux" { - t.Log("running tests for linux/arm...") - for _, path := range matches { -+ if true { -+ continue -+ } - if path == filepath.Join("testdata", "cgo")+string(filepath.Separator) { - continue // TODO: improve CGo - } -@@ -76,6 +79,9 @@ func TestCompiler(t *testing.T) { - - t.Log("running tests for linux/arm64...") - for _, path := range matches { -+ if true { -+ continue -+ } - if path == filepath.Join("testdata", "cgo")+string(filepath.Separator) { - continue // TODO: improve CGo - } --- -2.21.0 - diff --git a/0003-Skip-STM32-tests.patch b/0003-Skip-STM32-tests.patch new file mode 100644 index 0000000..7f6cf5e --- /dev/null +++ b/0003-Skip-STM32-tests.patch @@ -0,0 +1,49 @@ +From d195702b68f8fac69fbafcabb490081834d4bb39 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +Date: Thu, 13 Jun 2019 02:50:40 -0400 +Subject: [PATCH 3/4] Skip STM32 tests. + +We can't ship the STM32 .svd files due to their odd license. + +Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +--- + Makefile | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index e1d9061..90c9efc 100644 +--- a/Makefile ++++ b/Makefile +@@ -41,7 +41,7 @@ fmt-check: + @unformatted=$$(gofmt -l $(FMT_PATHS)); [ -z "$$unformatted" ] && exit 0; echo "Unformatted:"; for fn in $$unformatted; do echo " $$fn"; done; exit 1 + + +-gen-device: gen-device-avr gen-device-nrf gen-device-sam gen-device-sifive gen-device-stm32 ++gen-device: gen-device-avr gen-device-nrf gen-device-sam gen-device-sifive + + gen-device-avr: + ./tools/gen-device-avr.py lib/avr/packs/atmega src/device/avr/ +@@ -112,7 +112,6 @@ smoketest: + tinygo build -size short -o test.elf -target=microbit examples/echo + tinygo build -size short -o test.elf -target=nrf52840-mdk examples/blinky1 + tinygo build -size short -o test.elf -target=pca10031 examples/blinky1 +- tinygo build -size short -o test.elf -target=bluepill examples/blinky1 + tinygo build -size short -o test.elf -target=reelboard examples/blinky1 + tinygo build -size short -o test.elf -target=reelboard examples/blinky2 + tinygo build -size short -o test.elf -target=pca10056 examples/blinky1 +@@ -121,12 +120,9 @@ smoketest: + tinygo build -size short -o test.elf -target=feather-m0 examples/blinky1 + tinygo build -size short -o test.elf -target=trinket-m0 examples/blinky1 + tinygo build -size short -o test.elf -target=circuitplay-express examples/blinky1 +- tinygo build -size short -o test.elf -target=stm32f4disco examples/blinky1 +- tinygo build -size short -o test.elf -target=stm32f4disco examples/blinky2 + tinygo build -size short -o test.elf -target=circuitplay-express examples/i2s + tinygo build -size short -o test.elf -target=gameboy-advance examples/gba-display + tinygo build -size short -o test.elf -target=itsybitsy-m4 examples/blinky1 +- tinygo build -size short -o test.elf -target=nucleo-f103rb examples/blinky1 + ifneq ($(AVR), 0) + tinygo build -size short -o test.elf -target=arduino examples/blinky1 + tinygo build -size short -o test.elf -target=digispark examples/blinky1 +-- +2.21.0 + diff --git a/0004-Allow-overridding-Python-used-for-generators.patch b/0004-Allow-overridding-Python-used-for-generators.patch new file mode 100644 index 0000000..a8cd80f --- /dev/null +++ b/0004-Allow-overridding-Python-used-for-generators.patch @@ -0,0 +1,56 @@ +From 6156198f2378eee7912a5e5395bd799e13f8aae9 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +Date: Tue, 24 Sep 2019 04:50:25 -0400 +Subject: [PATCH 4/4] Allow overridding Python used for generators. + +Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +--- + Makefile | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index 90c9efc..65d407d 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,6 +3,7 @@ + all: tinygo + tinygo: build/tinygo + ++PYTHON ?= python + # Default build and source directories, as created by `make llvm-build`. + LLVM_BUILDDIR ?= llvm-build + CLANG_SRC ?= llvm-project/clang +@@ -44,24 +45,24 @@ fmt-check: + gen-device: gen-device-avr gen-device-nrf gen-device-sam gen-device-sifive + + gen-device-avr: +- ./tools/gen-device-avr.py lib/avr/packs/atmega src/device/avr/ +- ./tools/gen-device-avr.py lib/avr/packs/tiny src/device/avr/ ++ $(PYTHON) ./tools/gen-device-avr.py lib/avr/packs/atmega src/device/avr/ ++ $(PYTHON) ./tools/gen-device-avr.py lib/avr/packs/tiny src/device/avr/ + go fmt ./src/device/avr + + gen-device-nrf: +- ./tools/gen-device-svd.py lib/nrfx/mdk/ src/device/nrf/ --source=https://github.com/NordicSemiconductor/nrfx/tree/master/mdk ++ $(PYTHON) ./tools/gen-device-svd.py lib/nrfx/mdk/ src/device/nrf/ --source=https://github.com/NordicSemiconductor/nrfx/tree/master/mdk + go fmt ./src/device/nrf + + gen-device-sam: +- ./tools/gen-device-svd.py lib/cmsis-svd/data/Atmel/ src/device/sam/ --source=https://github.com/posborne/cmsis-svd/tree/master/data/Atmel ++ $(PYTHON) ./tools/gen-device-svd.py lib/cmsis-svd/data/Atmel/ src/device/sam/ --source=https://github.com/posborne/cmsis-svd/tree/master/data/Atmel + go fmt ./src/device/sam + + gen-device-sifive: +- ./tools/gen-device-svd.py lib/cmsis-svd/data/SiFive-Community/ src/device/sifive/ --source=https://github.com/AdaCore/svd2ada/tree/master/CMSIS-SVD/SiFive-Community ++ $(PYTHON) ./tools/gen-device-svd.py lib/cmsis-svd/data/SiFive-Community/ src/device/sifive/ --source=https://github.com/AdaCore/svd2ada/tree/master/CMSIS-SVD/SiFive-Community + go fmt ./src/device/sifive + + gen-device-stm32: +- ./tools/gen-device-svd.py lib/cmsis-svd/data/STMicro/ src/device/stm32/ --source=https://github.com/posborne/cmsis-svd/tree/master/data/STMicro ++ $(PYTHON) ./tools/gen-device-svd.py lib/cmsis-svd/data/STMicro/ src/device/stm32/ --source=https://github.com/posborne/cmsis-svd/tree/master/data/STMicro + go fmt ./src/device/stm32 + + +-- +2.21.0 + diff --git a/0004-Skip-STM32-tests.patch b/0004-Skip-STM32-tests.patch deleted file mode 100644 index 874e730..0000000 --- a/0004-Skip-STM32-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a49998a25be22a56f0f668b77b8994dc4d5987aa Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> -Date: Thu, 13 Jun 2019 02:50:40 -0400 -Subject: [PATCH 4/4] Skip STM32 tests. - -We can't ship the STM32 .svd files due to their odd license. - -Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> ---- - Makefile | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 239a2df..c8ece47 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,7 +41,7 @@ fmt-check: - @unformatted=$$(gofmt -l $(FMT_PATHS)); [ -z "$$unformatted" ] && exit 0; echo "Unformatted:"; for fn in $$unformatted; do echo " $$fn"; done; exit 1 - - --gen-device: gen-device-avr gen-device-nrf gen-device-sam gen-device-sifive gen-device-stm32 -+gen-device: gen-device-avr gen-device-nrf gen-device-sam gen-device-sifive - - gen-device-avr: - ./tools/gen-device-avr.py lib/avr/packs/atmega src/device/avr/ -@@ -112,7 +112,6 @@ smoketest: - tinygo build -size short -o test.elf -target=microbit examples/echo - tinygo build -size short -o test.elf -target=nrf52840-mdk examples/blinky1 - tinygo build -size short -o test.elf -target=pca10031 examples/blinky1 -- tinygo build -size short -o test.elf -target=bluepill examples/blinky1 - tinygo build -size short -o test.elf -target=reelboard examples/blinky1 - tinygo build -size short -o test.elf -target=reelboard examples/blinky2 - tinygo build -size short -o test.elf -target=pca10056 examples/blinky1 -@@ -121,8 +120,6 @@ smoketest: - tinygo build -size short -o test.elf -target=feather-m0 examples/blinky1 - tinygo build -size short -o test.elf -target=trinket-m0 examples/blinky1 - tinygo build -size short -o test.elf -target=circuitplay-express examples/blinky1 -- tinygo build -size short -o test.elf -target=stm32f4disco examples/blinky1 -- tinygo build -size short -o test.elf -target=stm32f4disco examples/blinky2 - tinygo build -size short -o test.elf -target=circuitplay-express examples/i2s - ifneq ($(AVR), 0) - tinygo build -size short -o test.elf -target=arduino examples/blinky1 --- -2.21.0 - diff --git a/sources b/sources index 32428a0..7aba3e1 100644 --- a/sources +++ b/sources @@ -1,6 +1 @@ -SHA512 (tinygo-0.7.1.tar.gz) = f97b0c3a6bd65bbc8c1ec41a8452fa88e0c6c4b8bbe3216ea25b8014d035a90847c5d1f219b9be9c5476a463e5a5da53128a8254498126ac1f6239959d95bace -SHA512 (avr-6624554c02b237b23dc17d53e992bf54033fc228.tar.gz) = 1aa157bd761db38f8680614fa1cf47d7009508f65291b7eaaa5aba1ae76d35103f68a42947b7269a170d2f1cf8fb09941a5d74070fe6d204b68dd15a9ad2ed29 -SHA512 (cmsis-9fe411cef1cef5de58e5957b89760759de44e393-clean.tar.xz) = f131fc241f61982c49f334eb502c2f13da61eb7bdaa641ee84a8de30c4d576b735b8aadeafd7d75351473a2df6a42de6a236ecc5dcc616ee6cfcc07af29446f9 -SHA512 (cmsis_svd-5910f3d115a53ead55c8158da24a8fa8bda1eb50-clean.tar.xz) = 7187cade0e78bbd6e65a8f38109aa95783e71cc3fad445fc51ac8fca796845b8ad4b9b84335ef3aa725b9abb0c3ed72c768c0f7da5ecc7b14a505a328b625b47 -SHA512 (compiler-rt-8.0.0.src.tar.xz) = fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913 -SHA512 (nrfx-3ab39a9d457bfe627473ed0e03a7f1161d9e4f27.tar.gz) = 95b5293c9b707aeb4d8ad13643619c053ba0fa9423053a12f9a65b0ed8febc2aab87cd832e6ac73e9673987b7cb73f85cce68cb85ce4ca5bd607afee1098f9e9 +SHA512 (tinygo-0.8.0.tar.gz) = 0f3750c3d216033342efc77fc419d9299202880bb9979f6db6c9e7f4c3f7b3792e5d407a0a9543b07c1ed8c08d16d062465e22cf392e5f71227d09afdf7275ea diff --git a/tinygo.spec b/tinygo.spec index 95ce5f3..00064d6 100644 --- a/tinygo.spec +++ b/tinygo.spec @@ -5,7 +5,7 @@ # https://github.com/tinygo-org/tinygo %global goipath github.com/tinygo-org/tinygo -Version: 0.7.1 +Version: 0.8.0 %global CMSIS_commit 9fe411cef1cef5de58e5957b89760759de44e393 %global avr_commit 6624554c02b237b23dc17d53e992bf54033fc228 @@ -43,12 +43,13 @@ Source4: cmsis_svd-%{cmsis_svd_commit}-clean.tar.xz Source5: https://releases.llvm.org/%{compiler_rt_version}/compiler-rt-%{compiler_rt_… Source6: https://github.com/NordicSemiconductor/nrfx/archive/%{nrfx_commit}/nrfx-%{n… # Fedora-specific. -Patch0001: 0001-Use-system-path-for-TINYGOROOT-default.patch -Patch0002: 0002-Use-Fedora-command-names.patch +Patch0001: 0001-Use-Fedora-command-names.patch # We don't have ARM glibc to build these. -Patch0003: 0003-Skip-ARM-Linux-tests.patch +Patch0002: 0002-Skip-ARM-Linux-tests.patch # We can't include STM32 .svd files because of their weird license. -Patch0004: 0004-Skip-STM32-tests.patch +Patch0003: 0003-Skip-STM32-tests.patch +# ... +Patch0004: 0004-Allow-overridding-Python-used-for-generators.patch # Not supported upstream yet. ExcludeArch: %{ix86} armv7hl ppc64le s390x @@ -111,9 +112,10 @@ ln -s /usr/lib64/clang/%{clang_version}/include lib/clang/include %build +export LDFLAGS="-X main.TINYGOROOT=%{tinygoroot} " %gobuildroot %gobuild -o _bin/tinygo %{goipath} -GO111MODULE=off %make_build gen-device +GO111MODULE=off %make_build gen-device PYTHON=%{__python3} for target in armv6m-none-eabi armv7m-none-eabi armv7em-none-eabi; do TINYGOROOT=$PWD \ _bin/tinygo \ @@ -174,6 +176,9 @@ PATH=%{buildroot}%{_bindir}:$PATH make smoketest AVR=0 RISCV=0 %changelog +* Tue Sep 24 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0.8.0-1 +- Update to latest version + * Sun Aug 04 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0.7.1-1 - Update to latest version

1 0

[Report] Packages Restricting Arches
by root 24 Sep '19

24 Sep '19

Package that edited their arches constraints (1) ============================================= - icaro was ExclusiveArch: %{ix86} %{arm} x86_64 noarch is ExclusiveArch: %{ix86} x86_64 noarch List of packages currently excluding arches (2563) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - 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 - bwa ExclusiveArch: x86_64 - 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} - 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-daemon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - discord-irc ExclusiveArch: %{nodejs_arches} noarch - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - docco ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dolphin-emu ExclusiveArch: x86_64 armv7l aarch64 - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dssi-vst ExclusiveArch: %{ix86} x86_64 - dyninst ExclusiveArch: %{ix86} x86_64 ppc64le aarch64 - 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 - enki ExclusiveArch: %{qt5_qtwebengine_arches} noarch - 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} - 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} - 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 - frysk ExclusiveArch: %{ix86} x86_64 ppc64 - fst ExclusiveArch: i686 - fwts ExclusiveArch: x86_64 %{arm} aarch64 s390x %{power64} - 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 - ghdl ExclusiveArch: %{GNAT_arches} - ghostwriter ExclusiveArch: %{qt5_qtwebengine_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 - 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} - gnatcoll-db 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-rpm-macros ExclusiveArch: %{golang_arches} %{gccgo_arches} - godep ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang ExclusiveArch: %{golang_arches} - gomtree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - 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} - grafana-pcp ExclusiveArch: %{nodejs_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}} - hip ExclusiveArch: x86_64 - hsakmt ExclusiveArch: x86_64 aarch64 - hyena ExclusiveArch: %{mono_arches} - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 - icaro ExclusiveArch: %{ix86} x86_64 noarch - 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 - 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: x86_64 s390x %{arm} aarch64 ppc64le - kicad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - kiwix-desktop ExclusiveArch: %{qt5_qtwebengine_arches} - 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} - lazarus ExclusiveArch: %{fpc_arches} - ldc ExclusiveArch: %{ldc_arches} - libbsr ExclusiveArch: %{power64} - libclc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - libcxl ExclusiveArch: %{power64} - 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 ppc64le - 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-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 - 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 - 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-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-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-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-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-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-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-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-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-aws-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws-sign2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-code-frame 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-plugins ExclusiveArch: %{nodejs_arches} noarch - nodejs-base32-encode ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-arraybuffer ExclusiveArch: %{nodejs_arches} 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-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-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-camelcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase-keys ExclusiveArch: %{nodejs_arches} 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-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-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-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-compressible ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} 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-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-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-angular ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-atom ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-codemirror ExclusiveArch: %{nodejs_arches} 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-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-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-data-uri-to-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} 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-define-properties ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-defined 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-dot-prop ExclusiveArch: %{nodejs_arches} noarch - nodejs-dotfile-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} 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-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-client ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-ex ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-symbol 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-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-promisify ExclusiveArch: %{nodejs_arches} 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-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-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 - 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-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-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-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-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-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-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-fstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-ignore ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-npm ExclusiveArch: %{nodejs_arches} 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-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-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-getobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-git-remote-origin-url 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-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-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-internal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-nodeunit 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-sed ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-simple-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-wrap ExclusiveArch: %{nodejs_arches} 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-handlebars ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-har-validator 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-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-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-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-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-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-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-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: %{nodejs_arches} noarch - nodejs-is-unc-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} 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-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-lex 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-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: %{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-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-libpq ExclusiveArch: %{nodejs_arches} - nodejs-libxmljs ExclusiveArch: %{nodejs_arches} - 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-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-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-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-merge-descriptors ExclusiveArch: %{nodejs_arches} 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-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-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-mongodb ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb-core ExclusiveArch: %{nodejs_arches} noarch - nodejs-monocle ExclusiveArch: %{nodejs_arches} 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-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-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-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-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-only-shallow 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-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-package 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-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-parseuri ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} 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-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-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-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-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-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-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-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-file 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-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-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-regex-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regex-not 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-require-cs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-require-directory 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-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-sax 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-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-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-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-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-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-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-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-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-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-streamsearch 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-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-svgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-symbol-observable 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-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-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-testdata-w3c-json-form ExclusiveArch: %{nodejs_arches} 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-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-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-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-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-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-vasync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vhost ExclusiveArch: %{nodejs_arches} 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-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-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-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 - 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} - obs-service-rust2rpm ExclusiveArch: %{rust_arches} noarch - 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-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 - pmdk-convert ExclusiveArch: x86_64 - pocl ExclusiveArch: %{arm} aarch64 %{ix86} 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 - pveclib ExclusiveArch: ppc %{power64} - 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: x86_64 %{ix86} - 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 - rocm-runtime ExclusiveArch: x86_64 aarch64 - rocminfo ExclusiveArch: x86_64 aarch64 - rpm-ostree ExclusiveArch: %{rust_arches} - rssguard ExclusiveArch: %{qt5_qtwebengine_arches} - rubygem-childprocess ExclusiveArch: %{ix86} x86_64 noarch - runc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x - rust ExclusiveArch: %{rust_arches} - rust-abomonation ExclusiveArch: %{rust_arches} - rust-actix ExclusiveArch: %{rust_arches} - rust-actix-codec ExclusiveArch: %{rust_arches} - rust-actix-connect ExclusiveArch: %{rust_arches} - rust-actix-files ExclusiveArch: %{rust_arches} - rust-actix-http ExclusiveArch: %{rust_arches} - rust-actix-router ExclusiveArch: %{rust_arches} - rust-actix-rt ExclusiveArch: %{rust_arches} - rust-actix-server ExclusiveArch: %{rust_arches} - rust-actix-server-config ExclusiveArch: %{rust_arches} - rust-actix-service ExclusiveArch: %{rust_arches} - rust-actix-threadpool ExclusiveArch: %{rust_arches} - rust-actix-utils ExclusiveArch: %{rust_arches} - rust-actix-web ExclusiveArch: %{rust_arches} - rust-actix-web-codegen ExclusiveArch: %{rust_arches} - rust-actix_derive ExclusiveArch: %{rust_arches} - rust-addr2line ExclusiveArch: %{rust_arches} - rust-adler32 ExclusiveArch: %{rust_arches} - rust-aes 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-alphanumeric-sort ExclusiveArch: %{rust_arches} - rust-ammonia ExclusiveArch: %{rust_arches} - rust-ansi_colours ExclusiveArch: %{rust_arches} - rust-ansi_term ExclusiveArch: %{rust_arches} - rust-ansi_term0.11 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-array-init 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-awc 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-bincode0.8 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-brotli-sys ExclusiveArch: %{rust_arches} - rust-brotli2 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-byte-unit 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-c2-chacha ExclusiveArch: %{rust_arches} - rust-c_vec ExclusiveArch: %{rust_arches} - rust-cairo-rs ExclusiveArch: %{rust_arches} - rust-cairo-sys-rs ExclusiveArch: %{rust_arches} - rust-caps ExclusiveArch: %{rust_arches} - rust-cargo ExclusiveArch: %{rust_arches} - rust-cargo-bloat ExclusiveArch: %{rust_arches} - rust-cargo_metadata ExclusiveArch: %{rust_arches} - rust-cassowary 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-comrak ExclusiveArch: %{rust_arches} - rust-config ExclusiveArch: %{rust_arches} - rust-console ExclusiveArch: %{rust_arches} - rust-content_inspector ExclusiveArch: %{rust_arches} - rust-copyless 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-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-dbus0.2 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-derive_more ExclusiveArch: %{rust_arches} - rust-deunicode 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-dirs-sys 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-duct ExclusiveArch: %{rust_arches} - rust-dutree ExclusiveArch: %{rust_arches} - rust-edit-distance ExclusiveArch: %{rust_arches} - rust-either ExclusiveArch: %{rust_arches} - rust-elasticlunr-rs 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-as-inner 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-envsubst 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-fail 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-fedora-coreos-pinger 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-fs_extra 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-fxhash 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-getrandom ExclusiveArch: %{rust_arches} - rust-gettext-rs 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-globwalk 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-gspell ExclusiveArch: %{rust_arches} - rust-gspell-sys ExclusiveArch: %{rust_arches} - rust-gstreamer ExclusiveArch: %{rust_arches} - rust-gstreamer-audio ExclusiveArch: %{rust_arches} - rust-gstreamer-audio-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-base ExclusiveArch: %{rust_arches} - rust-gstreamer-base-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-editing-services ExclusiveArch: %{rust_arches} - rust-gstreamer-editing-services-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-pbutils ExclusiveArch: %{rust_arches} - rust-gstreamer-pbutils-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-player ExclusiveArch: %{rust_arches} - rust-gstreamer-player-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-sys ExclusiveArch: %{rust_arches} - rust-gstreamer-video ExclusiveArch: %{rust_arches} - rust-gstreamer-video-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-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-http-body ExclusiveArch: %{rust_arches} - rust-httparse ExclusiveArch: %{rust_arches} - rust-humansize 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-idna0.1 ExclusiveArch: %{rust_arches} - rust-ignore ExclusiveArch: %{rust_arches} - rust-im-rc 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-jetscii ExclusiveArch: %{rust_arches} - rust-jobserver ExclusiveArch: %{rust_arches} - rust-jpeg-decoder ExclusiveArch: %{rust_arches} - rust-jwalk 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-libhandy ExclusiveArch: %{rust_arches} - rust-libhandy-sys ExclusiveArch: %{rust_arches} - rust-libloading ExclusiveArch: %{rust_arches} - rust-libm ExclusiveArch: %{rust_arches} - rust-libmount ExclusiveArch: %{rust_arches} - rust-liboverdrop ExclusiveArch: %{rust_arches} - rust-libssh2-sys ExclusiveArch: %{rust_arches} - rust-libsystemd 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-loggerv ExclusiveArch: %{rust_arches} - rust-loopdev ExclusiveArch: %{rust_arches} - rust-lru-cache 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-man 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-nix0.14 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-numtoa ExclusiveArch: %{rust_arches} - rust-object ExclusiveArch: %{rust_arches} - rust-objekt 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-ordered-float ExclusiveArch: %{rust_arches} - rust-os_pipe ExclusiveArch: %{rust_arches} - rust-osstrtools 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-pathdiff 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-percent-encoding1 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-ppv-lite86 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.4 ExclusiveArch: %{rust_arches} - rust-procedural-masquerade ExclusiveArch: %{rust_arches} - rust-prometheus ExclusiveArch: %{rust_arches} - rust-proptest ExclusiveArch: %{rust_arches} - rust-proptest-derive ExclusiveArch: %{rust_arches} - rust-protobuf 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.6 ExclusiveArch: %{rust_arches} - rust-rand ExclusiveArch: %{rust_arches} - rust-rand0.4 ExclusiveArch: %{rust_arches} - rust-rand0.5 ExclusiveArch: %{rust_arches} - rust-rand0.6 ExclusiveArch: %{rust_arches} - rust-rand_chacha ExclusiveArch: %{rust_arches} - rust-rand_chacha0.1 ExclusiveArch: %{rust_arches} - rust-rand_core ExclusiveArch: %{rust_arches} - rust-rand_core0.3 ExclusiveArch: %{rust_arches} - rust-rand_core0.4 ExclusiveArch: %{rust_arches} - rust-rand_hc ExclusiveArch: %{rust_arches} - rust-rand_hc0.1 ExclusiveArch: %{rust_arches} - rust-rand_isaac ExclusiveArch: %{rust_arches} - rust-rand_isaac0.1 ExclusiveArch: %{rust_arches} - rust-rand_jitter ExclusiveArch: %{rust_arches} - rust-rand_jitter0.1 ExclusiveArch: %{rust_arches} - rust-rand_os ExclusiveArch: %{rust_arches} - rust-rand_os0.1 ExclusiveArch: %{rust_arches} - rust-rand_pcg ExclusiveArch: %{rust_arches} - rust-rand_pcg0.1 ExclusiveArch: %{rust_arches} - rust-rand_xorshift ExclusiveArch: %{rust_arches} - rust-rand_xorshift0.1 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-region 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-resolv-conf ExclusiveArch: %{rust_arches} - rust-restson 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-roff 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-rust-stemmers 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-rustio 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-sass-rs ExclusiveArch: %{rust_arches} - rust-sass-sys 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-secret-service 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_urlencoded0.5 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-shared_child 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-sized-chunks 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-slotmap ExclusiveArch: %{rust_arches} - rust-slotmap0.2 ExclusiveArch: %{rust_arches} - rust-slug 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-strum ExclusiveArch: %{rust_arches} - rust-strum_macros ExclusiveArch: %{rust_arches} - rust-subtle ExclusiveArch: %{rust_arches} - rust-sudo_plugin ExclusiveArch: %{rust_arches} - rust-sudo_plugin-sys ExclusiveArch: %{rust_arches} - rust-sval ExclusiveArch: %{rust_arches} - rust-sval_derive ExclusiveArch: %{rust_arches} - rust-syn ExclusiveArch: %{rust_arches} - rust-syn0.15 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-tera 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-timebomb 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-buf 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-io-pool ExclusiveArch: %{rust_arches} - rust-tokio-mock-task ExclusiveArch: %{rust_arches} - rust-tokio-mockstream ExclusiveArch: %{rust_arches} - rust-tokio-openssl 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-trust-dns-native-tls ExclusiveArch: %{rust_arches} - rust-trust-dns-openssl ExclusiveArch: %{rust_arches} - rust-trust-dns-proto ExclusiveArch: %{rust_arches} - rust-trust-dns-resolver ExclusiveArch: %{rust_arches} - rust-try-lock ExclusiveArch: %{rust_arches} - rust-try_or ExclusiveArch: %{rust_arches} - rust-tuikit ExclusiveArch: %{rust_arches} - rust-tungstenite ExclusiveArch: %{rust_arches} - rust-twoway 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-unic-char-property ExclusiveArch: %{rust_arches} - rust-unic-char-range ExclusiveArch: %{rust_arches} - rust-unic-common ExclusiveArch: %{rust_arches} - rust-unic-segment ExclusiveArch: %{rust_arches} - rust-unic-ucd-category ExclusiveArch: %{rust_arches} - rust-unic-ucd-common ExclusiveArch: %{rust_arches} - rust-unic-ucd-segment ExclusiveArch: %{rust_arches} - rust-unic-ucd-version 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-xid0.1 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-url1 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-v_escape ExclusiveArch: %{rust_arches} - rust-v_escape_derive ExclusiveArch: %{rust_arches} - rust-v_htmlescape 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-ws 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-zincati 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 - soup-sharp ExclusiveArch: %{mono_arches} - 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 - springlobby ExclusiveArch: %{ix86} x86_64 - startdde ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - statsd ExclusiveArch: %{nodejs_arches} noarch - stratis-cli ExclusiveArch: %{rust_arches} - stratisd ExclusiveArch: %{rust_arches} - stripesnoop ExclusiveArch: %{ix86} x86_64 - supermin ExclusiveArch: x86_64 - svt-av1 ExclusiveArch: x86_64 - svt-vp9 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 - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - virt-p2v ExclusiveArch: x86_64 - 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 - vmemcache ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 - 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} - wine-dxvk ExclusiveArch: %{ix86} x86_64 - 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 - xe-guest-utilities 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-openchrome ExclusiveArch: %{ix86} x86_64 - 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} - zola ExclusiveArch: %{rust_arches}

1 0

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes September 2019