November 2014 - openSUSE Commits - openSUSE Mailing Lists

commit ibus-libzhuyin for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ibus-libzhuyin for openSUSE:Factory checked in at 2014-11-26 10:32:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-libzhuyin (Old) and /work/SRC/openSUSE:Factory/.ibus-libzhuyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus-libzhuyin" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-libzhuyin/ibus-libzhuyin.changes 2014-07-18 07:31:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-libzhuyin.new/ibus-libzhuyin.changes 2014-11-26 10:33:03.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 2 08:52:45 UTC 2014 - hillwood(a)linuxfans.org + +- Update to 1.6.99.20140929 + * write updateLookupTableLabel method + +------------------------------------------------------------------- Old: ---- ibus-libzhuyin-1.6.99.20140626.tar.gz New: ---- ibus-libzhuyin-1.6.99.20140929.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-libzhuyin.spec ++++++ --- /var/tmp/diff_new_pack.r3iiGj/_old 2014-11-26 10:33:04.000000000 +0100 +++ /var/tmp/diff_new_pack.r3iiGj/_new 2014-11-26 10:33:04.000000000 +0100 @@ -15,16 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ibus-libzhuyin -Version: 1.6.99.20140626 +Version: 1.6.99.20140929 Release: 0 -License: GPL-2.0 Summary: New Zhuyin engine based on libzhuyin for IBus -Url: https://github.com/libzhuyin/ibus-libzhuyin +License: GPL-2.0 Group: System/I18n/Chinese +Url: https://github.com/libzhuyin/ibus-libzhuyin Source: %{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: gnome-common BuildRequires: ibus-devel BuildRequires: intltool BuildRequires: libzhuyin-devel @@ -39,6 +41,7 @@ %setup -q %build +./autogen.sh %configure make %{?_smp_mflags} @@ -58,5 +61,6 @@ %{_libexecdir}/ibus-setup-libzhuyin %{_datadir}/%{name} %{_datadir}/ibus/component/libzhuyin.xml +%{_datadir}/applications/ibus-setup-libzhuyin.desktop %changelog ++++++ ibus-libzhuyin-1.6.99.20140626.tar.gz -> ibus-libzhuyin-1.6.99.20140929.tar.gz ++++++ ++++ 57985 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fcitx-zhuyin for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package fcitx-zhuyin for openSUSE:Factory checked in at 2014-11-26 10:32:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-zhuyin (Old) and /work/SRC/openSUSE:Factory/.fcitx-zhuyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcitx-zhuyin" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-zhuyin/fcitx-zhuyin.changes 2014-07-18 07:31:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-zhuyin.new/fcitx-zhuyin.changes 2014-11-26 10:33:05.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 17 13:47:06 UTC 2014 - hillwood(a)linuxfans.org + +- Fix build under libpinyin-0.9.99.20140929, + add fix-compatibility-with-libzhuyin-0.9.99.20140929.patch + +------------------------------------------------------------------- New: ---- fix-compatibility-with-libzhuyin-0.9.99.20140929.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-zhuyin.spec ++++++ --- /var/tmp/diff_new_pack.3azd1i/_old 2014-11-26 10:33:05.000000000 +0100 +++ /var/tmp/diff_new_pack.3azd1i/_new 2014-11-26 10:33:05.000000000 +0100 @@ -15,18 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: fcitx-zhuyin Version: 0.1.0 Release: 0 -License: GPL-2.0 Summary: Libzhuyin Wrapper for Fcitx -Url: https://github.com/fcitx/fcitx-zhuyin +License: GPL-2.0 Group: System/I18n/Chinese +Url: https://github.com/fcitx/fcitx-zhuyin Source: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM fix-compatibility-with-libzhuyin-0.9.99.20140929.patch hillwood(a)opensuse.org +Patch0: fix-compatibility-with-libzhuyin-0.9.99.20140929.patch BuildRequires: cmake +BuildRequires: fcitx-devel BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: fcitx-devel BuildRequires: hicolor-icon-theme BuildRequires: libzhuyin-devel Provides: locale(fcitx:zh_TW;zh_HK) @@ -41,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build mkdir build && cd build @@ -71,6 +75,4 @@ %{_fcitx_inputmethoddir}/zhuyin.conf %{_datadir}/icons/hicolor/*/status/%{name}.png - - %changelog ++++++ fix-compatibility-with-libzhuyin-0.9.99.20140929.patch ++++++ diff -Nur fcitx-zhuyin-0.1.0/cmake/FindLibZhuyin.cmake fcitx-zhuyin-0.1.0-new/cmake/FindLibZhuyin.cmake --- fcitx-zhuyin-0.1.0/cmake/FindLibZhuyin.cmake 2014-07-13 22:14:41.000000000 +0800 +++ fcitx-zhuyin-0.1.0-new/cmake/FindLibZhuyin.cmake 2014-11-17 21:27:03.000000000 +0800 @@ -29,18 +29,18 @@ NAMES zhuyin HINTS ${PC_LIBZHUYIN_LIBDIR}) -find_program(LIBZHUYIN_GEN_BINARY_FILES gen_binary_files HINTS "${LIBZHUYIN_EXECPREFIX}/bin") -find_program(LIBZHUYIN_GEN_UNIGRAM gen_unigram HINTS "${LIBZHUYIN_EXECPREFIX}/bin") -find_program(LIBZHUYIN_IMPORT_INTERPOLATION import_interpolation HINTS "${LIBZHUYIN_EXECPREFIX}/bin") +#find_program(LIBZHUYIN_GEN_BINARY_FILES gen_binary_files HINTS "${LIBZHUYIN_EXECPREFIX}/bin") +#find_program(LIBZHUYIN_GEN_UNIGRAM gen_unigram HINTS "${LIBZHUYIN_EXECPREFIX}/bin") +#find_program(LIBZHUYIN_IMPORT_INTERPOLATION import_interpolation HINTS "${LIBZHUYIN_EXECPREFIX}/bin") include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibZhuyin DEFAULT_MSG LIBZHUYIN_LIBRARIES LIBZHUYIN_INCLUDE_DIR LIBZHUYIN_PKGDATADIR - LIBZHUYIN_GEN_BINARY_FILES - LIBZHUYIN_GEN_UNIGRAM - LIBZHUYIN_IMPORT_INTERPOLATION +# LIBZHUYIN_GEN_BINARY_FILES +# LIBZHUYIN_GEN_UNIGRAM +# LIBZHUYIN_IMPORT_INTERPOLATION PC_LIBZHUYIN_FOUND ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit npm for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package npm for openSUSE:Factory checked in at 2014-11-26 10:32:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/npm (Old) and /work/SRC/openSUSE:Factory/.npm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "npm" Changes: -------- --- /work/SRC/openSUSE:Factory/npm/npm.changes 2014-09-30 20:09:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.npm.new/npm.changes 2014-11-26 10:32:59.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Oct 10 16:29:54 UTC 2014 - jgleissner(a)suse.com + +- update to version 2.1.3 +- add patch: npm-deps.diff + * be less strict about version numbers of some dependencies + +------------------------------------------------------------------- +Thu Oct 9 15:08:49 UTC 2014 - jgleissner(a)suse.com + +- use nodejs-packaging for building + +------------------------------------------------------------------- Old: ---- npm-2.0.0.tgz New: ---- npm-2.1.3.tgz npm-deps.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ npm.spec ++++++ --- /var/tmp/diff_new_pack.iRf2Lx/_old 2014-11-26 10:33:00.000000000 +0100 +++ /var/tmp/diff_new_pack.iRf2Lx/_new 2014-11-26 10:33:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: npm -Version: 2.0.0 +Version: 2.1.3 Release: 0 Summary: Node.js Package Manager License: Artistic-2.0 @@ -32,65 +32,11 @@ Patch1: %{name}-doc-path.diff # use external node-gyp because the internal will be removed Patch2: npm-external-node-gyp.patch +Patch3: npm-deps.diff -BuildRequires: nodejs -Requires: nodejs-abbrev -Requires: nodejs-ansi -Requires: nodejs-ansicolors -Requires: nodejs-ansistyles -Requires: nodejs-archy -Requires: nodejs-async-some -Requires: nodejs-block-stream -Requires: nodejs-char-spinner -Requires: nodejs-child-process-close -Requires: nodejs-chmodr -Requires: nodejs-chownr -Requires: nodejs-cmd-shim -Requires: nodejs-columnify -Requires: nodejs-editor -Requires: nodejs-fs-vacuum -Requires: nodejs-fstream -Requires: nodejs-fstream-npm -Requires: nodejs-github-url-from-git -Requires: nodejs-github-url-from-username-repo -Requires: nodejs-glob -Requires: nodejs-graceful-fs -Requires: nodejs-inflight -Requires: nodejs-ini -Requires: nodejs-init-package-json -Requires: nodejs-lockfile -Requires: nodejs-lru-cache -Requires: nodejs-minimatch -Requires: nodejs-mkdirp -Requires: nodejs-node-gyp -Requires: nodejs-nopt -Requires: nodejs-normalize-package-data -Requires: nodejs-npm-cache-filename -Requires: nodejs-npm-install-checks -Requires: nodejs-npm-package-arg -Requires: nodejs-npm-registry-client -Requires: nodejs-npm-user-validate -Requires: nodejs-npmconf -Requires: nodejs-npmlog -Requires: nodejs-once -Requires: nodejs-opener -Requires: nodejs-osenv -Requires: nodejs-path-is-inside -Requires: nodejs-read -Requires: nodejs-read-installed -Requires: nodejs-read-package-json -Requires: nodejs-request -Requires: nodejs-retry -Requires: nodejs-rimraf -Requires: nodejs-semver -Requires: nodejs-sha -Requires: nodejs-slide -Requires: nodejs-sorted-object -Requires: nodejs-tar -Requires: nodejs-text-table -Requires: nodejs-uid-number -Requires: nodejs-which -%{?nodejs_requires} +BuildRequires: nodejs-packaging + +%nodejs_find_provides_and_requires %description npm is a package manager for node.js. You can use it to install and publish your @@ -100,6 +46,7 @@ %setup -q -n package %patch1 -p1 %patch2 -p1 +%patch3 -p1 #remove bundled modules rm -rf node_modules ++++++ npm-2.0.0.tgz -> npm-2.1.3.tgz ++++++ ++++ 33993 lines of diff (skipped) ++++++ npm-deps.diff ++++++ Index: package/package.json =================================================================== --- package.orig/package.json +++ package/package.json @@ -35,7 +35,7 @@ "ansi": "~0.3.0", "ansicolors": "~0.3.2", "ansistyles": "~0.1.3", - "archy": "0", + "archy": "*", "async-some": "~1.0.1", "block-stream": "0.0.7", "char-spinner": "~1.0.1", @@ -56,7 +56,7 @@ "graceful-fs": "~3.0.0", "inflight": "~1.0.3", "inherits": "~2.0.1", - "ini": "~1.2.0", + "ini": "~1.2", "init-package-json": "~1.1.0", "lockfile": "~1.0.0", "lru-cache": "~2.5.0", @@ -73,19 +73,19 @@ "npmconf": "~2.1.0", "npmlog": "~0.1.1", "once": "~1.3.0", - "opener": "~1.3.0", + "opener": "~1.3", "osenv": "~0.1.0", "path-is-inside": "~1.0.0", "read": "~1.0.4", "read-installed": "~3.1.2", "read-package-json": "~1.2.7", "readable-stream": "~1.0.32", - "realize-package-specifier": "~1.1.0", + "realize-package-specifier": "~1.1", "request": "~2.44.0", "retry": "~0.6.0", "rimraf": "~2.2.8", "semver": "~4.0.0", - "sha": "~1.2.1", + "sha": "~1.2", "slide": "~1.1.6", "sorted-object": "~1.0.0", "tar": "~1.0.1", -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2014-11-26 10:32:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2014-09-23 10:42:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2014-11-26 10:32:55.000000000 +0100 @@ -1,0 +2,60 @@ +Wed Nov 5 17:10:14 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- add patch D349.patch +* fix a crash with dynamic linking in GHCi when accessing the + process environment +* our patch has been submitted upstream +* see https://phabricator.haskell.org/D349 + +------------------------------------------------------------------- +Sun Sep 28 07:56:51 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- ghc-rpm-macros use internal dependency generator now +* simplifies spec file + +------------------------------------------------------------------- +Sat Sep 20 13:09:30 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- fix alternatives handling + +------------------------------------------------------------------- +Fri Sep 19 09:17:53 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- update to 7.8.3 +* needed for Haskell Platfoerm 2014.2.0.0 +* fixes bnc #726744 +* way smaller source tarball (windows binaries removed) +* dynamic libraries, GHCi, and Template Haskell for ppc64 and ppc64le +- drop ghc-ppc64le.patch (fixed upstream) +- add integer-gmp.patch +* build bundled libgmp on SLE 11 (system version is too old) +* fixes build on x86_64 +* see upstream trac #8156 +- add ghc-7.8.2-cgen-constify.patch +* C backend (ppc64, ppc64le): generate 'const' strings +* reduce size of table of contents (TOC) +- add D173.patch +* fix C backend: generate literals of correct size +* fixes lots of arithmetic failures and trac #8849 +* asked upstream to merge fix into 7.8.4 +- add D177.patch +* pass PIC flags to assembler +* shared libraries on ppc still broken (trac #8024) +- add ghc.git-e18525f.patch +* fix C backend: generate functions for cmm primitives +- drop ghc-use-system-libffi.patch (included upstream) +- drop ghc-suse-as-needed.patch (fixed upstream) +- drop Cabal-fix-dynamic-exec-for-TH.patch (fixed upstream) +- drop ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch (fixed upstream) +- drop ghc-avoid-empty-llvm-used-definitions.patch (fixed upstream) +- drop 0001-Fix-detection-of-library-for-shm-on-openSUSE.patch +* our patch was included upstream +- drop 0001-Delete-spurious-comma-in-configure.ac.patch +* our patch was included upstream +-drop ghc-fix-infinite-loop-big-endian.patch (fixed upstream +- refresh llvm-powerpc64-datalayout.patch +* port to new LLVM backend +- refresh ghc-cabal-unversion-docdir.patch +* include original Fedora patch for 7.8.2 + +------------------------------------------------------------------- Old: ---- 0001-Delete-spurious-comma-in-configure.ac.patch 0001-Fix-detection-of-library-for-shm-on-openSUSE.patch Cabal-fix-dynamic-exec-for-TH.patch ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch ghc-7.6.3-src.tar.bz2 ghc-avoid-empty-llvm-used-definitions.patch ghc-fix-infinite-loop-big-endian.patch ghc-ppc64le.patch ghc-suse-as-needed.patch ghc-use-system-libffi.patch New: ---- D173.patch D177.patch D349.patch ghc-7.8.2-cgen-constify.patch ghc-7.8.3-src.tar.xz ghc.git-e18525f.patch integer-gmp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc.spec ++++++ --- /var/tmp/diff_new_pack.vrQA4V/_old 2014-11-26 10:32:58.000000000 +0100 +++ /var/tmp/diff_new_pack.vrQA4V/_new 2014-11-26 10:32:58.000000000 +0100 @@ -18,12 +18,8 @@ %global unregisterised_archs ppc64 ppc64le s390 s390s -%ifarch %{unregisterised_archs} -%global ghc_without_shared 1 -%endif - Name: ghc -Version: 7.6.3 +Version: 7.8.3 Release: 0 Url: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2 Summary: The Glorious Glasgow Haskell Compiler @@ -31,11 +27,9 @@ Group: Development/Languages/Other ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le -BuildRequires: ghc-bootstrap >= 7.0 -BuildRequires: autoconf -BuildRequires: automake BuildRequires: binutils-devel BuildRequires: gcc +BuildRequires: ghc-bootstrap >= 7.4 BuildRequires: ghc-rpm-macros-extra BuildRequires: glibc-devel BuildRequires: gmp-devel @@ -43,6 +37,7 @@ BuildRequires: libffi-devel BuildRequires: ncurses-devel BuildRequires: pkg-config +BuildRequires: xz %if %{undefined without_manual} %if 0%{suse_version} >= 1220 BuildRequires: dblatex @@ -51,33 +46,29 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt %endif + PreReq: update-alternatives Requires: ghc-compiler = %{version}-%{release} Requires: ghc-ghc-devel = %{version}-%{release} Requires: ghc-libraries = %{version}-%{release} -Source: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2 +Source: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.xz Source1: ghc-rpmlintrc -# PATCH-FIX-UPSTREAM ghc-use-system-libffi.patch peter.trommler(a)ohm-hochschule.de - See Haskell trac #4496 and #5743; backport of our patch accepted upstream for next major release. -Patch: ghc-use-system-libffi.patch -# PATCH-FIX-UPSTREAM ghc-suse-as-needed.patch peter.trommler(a)ohm-hochschule.de - temporary fix for Haskell trac #7062, ghc libraries do not work with as_needed and new-dtags both enabled -Patch1: ghc-suse-as-needed.patch -# PATCH-FIX-UPSTREAM Cabal-fix-dynamic-exec-for-TH.patch peter.trommler(a)ohm-hochschule.de - Fedora patch 10 -Patch2: Cabal-fix-dynamic-exec-for-TH.patch -# PATCH-FIX-UPSTREAM ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch peter.trommler(a)ohm-hochschule.de - Fedora patch 14: Silence warning about llvm 3.3 -Patch3: ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch -# PATCH-FIX-UPSTREAM ghc-avoid-empty-llvm-used-definitions.patch peter.trommler(a)ohm-hochschule.de - Backport of commit db9b63105a54, fixes Haskell trac #7996 -Patch4: ghc-avoid-empty-llvm-used-definitions.patch -# PATCH-FIX-UPSTREAM 0001-Fix-detection-of-library-for-shm-on-openSUSE.patch peter.trommler(a)ohm-hochschule.de - Fix test for librt and shm_* detection. Backported patch sent upstream 2013-09-24, Haskell trac #8350. -Patch5: 0001-Fix-detection-of-library-for-shm-on-openSUSE.patch -# PATCH-FIX-UPSTREAM 0001-Delete-spurious-comma-in-configure.ac.patch peter.trommler(a)ohm-hochschule.de - Fix test for setitimer. Backported patch sent upstream 2013-09-24, Haskell trac #8352 -Patch6: 0001-Delete-spurious-comma-in-configure.ac.patch -# PATCH-FIX-UPSTREAM peter.trommler(a)ohm-hochschule.de - Fix Haskell trac #8134. -Patch7: ghc-fix-infinite-loop-big-endian.patch -# PATCH-FIX-UPSTREAM peter.trommler(a)ohm-hochschule.de - Add target datalayout for llvm on powerpc 64. +# PATCH-FIX-UPSTREAM llvm-powerpc64-datalayout.patch peter.trommler(a)ohm-hochschule.de - Add target datalayout for llvm on powerpc 64. Patch8: llvm-powerpc64-datalayout.patch -# PATCH-FIX-OPENSUSE peter.trommler(a)ohm-hochschule.de - Remove versions in library docdirs. Required for compatibility with ghc-rpm-macros 1.0 and up. Can be removed once we move to ghc 7.8.x. Fedora patch 16. +# PATCH-FIX-OPENSUSE ghc-cabal-unversion-docdir.patch peter.trommler(a)ohm-hochschule.de - Remove versions in library docdirs. Required for compatibility with ghc-rpm-macros 1.0 and up. Can be removed once we move to ghc 7.8.x. Fedora patch 16. Patch9: ghc-cabal-unversion-docdir.patch -Patch10: ghc-ppc64le.patch +# PATCH-FIX-UPSTREAM D349.patch peter.trommler(a)ohm-hochschule.de - Fix dynamic linker, see Haskell trac #8935. +Patch12: D349.patch +# PATCH-FIX-UPSTREAM integer-gmp.patch peter.trommler(a)ohm-hochschule.de -- Fix upstream ticket #8156 see https://ghc.haskell.org/trac/ghc/ticket/8156. We need this for SLE 11 where libgmp is too old and so we have to use the bundled libgmp. This patch fixes the build. +Patch13: integer-gmp.patch +# PATCH-FIX-UPSTREAM ghc-7.8.2-cgen-constify.patch peter.trommler(a)ohm-hochschule.de - Make constant strings constant in C backend to save data segment space. This is a gentoo patch. +Patch14: ghc-7.8.2-cgen-constify.patch +# PATCH-FIX-UPSTREAM D173.patch peter.trommler(a)ohm-hochschule.de -- Fix C backend. Backport of upstream fix for 7.10. See https://phabricator.haskell.org/D173. +Patch15: D173.patch +# PATCH-FIX-UPSTREAM D177.patch peter.trommler(a)ohm-hochschule.de -- Pass PIC flags to assembler. See https://phabricator.haskell.org/D177. +Patch16: D177.patch +# PATCH-FIX-UPSTREAM ghc.git-e18525f.patch peter.trommler(a)ohm-hochscule.de -- Declare extern cmm primitives as functions not data. Backport of upstream fix for 7.10. See https://git.haskell.org/ghc.git/commitdiff_plain/e18525fae273f4c1ad8d6cbe1d…. +Patch17: ghc.git-e18525f.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -118,37 +109,36 @@ %global ghc_version_override %{version} - -%global _use_internal_dependency_generator 0 -%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir} -%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir} - %global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release} %if %{defined ghclibdir} -%ghc_lib_subpackage Cabal 1.16.0 -%ghc_lib_subpackage array 0.4.0.1 -%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.6.0.1 -%ghc_lib_subpackage binary 0.5.1.1 -%ghc_lib_subpackage bytestring 0.10.0.2 -%ghc_lib_subpackage containers 0.5.0.0 -%ghc_lib_subpackage deepseq 1.3.0.1 -%ghc_lib_subpackage directory 1.2.0.1 -%ghc_lib_subpackage filepath 1.3.0.1 +%ghc_lib_subpackage Cabal 1.18.1.3 +%ghc_lib_subpackage array 0.5.0.0 +%ghc_lib_subpackage -c gmp-devel,libffi-devel base 4.7.0.1 +%ghc_lib_subpackage binary 0.7.1.0 +%ghc_lib_subpackage bytestring 0.10.4.0 +%ghc_lib_subpackage containers 0.5.5.1 +%ghc_lib_subpackage deepseq 1.3.0.2 +%ghc_lib_subpackage directory 1.2.1.0 +%ghc_lib_subpackage filepath 1.3.0.2 %define ghc_pkg_obsoletes ghc-bin-package-db-devel < 0.0.0.0-%{release} %ghc_lib_subpackage -x ghc %{ghc_version_override} %undefine ghc_pkg_obsoletes -%ghc_lib_subpackage haskell2010 1.1.1.0 -%ghc_lib_subpackage haskell98 2.0.0.2 -%ghc_lib_subpackage hoopl 3.9.0.0 -%ghc_lib_subpackage hpc 0.6.0.0 -%ghc_lib_subpackage old-locale 1.0.0.5 -%ghc_lib_subpackage old-time 1.1.0.1 -%ghc_lib_subpackage pretty 1.1.1.0 -%ghc_lib_subpackage process 1.1.0.2 -%ghc_lib_subpackage template-haskell 2.8.0.0 -%ghc_lib_subpackage time 1.4.0.1 -%ghc_lib_subpackage unix 2.6.0.1 +%ghc_lib_subpackage haskeline 0.7.1.2 +%ghc_lib_subpackage haskell2010 1.1.2.0 +%ghc_lib_subpackage haskell98 2.0.0.3 +%ghc_lib_subpackage hoopl 3.10.0.1 +%ghc_lib_subpackage hpc 0.6.0.1 +%ghc_lib_subpackage old-locale 1.0.0.6 +%ghc_lib_subpackage old-time 1.1.0.2 +%ghc_lib_subpackage pretty 1.1.1.1 +%ghc_lib_subpackage process 1.2.0.0 +%ghc_lib_subpackage template-haskell 2.9.0.0 +%ghc_lib_subpackage terminfo 0.4.0.0 +%ghc_lib_subpackage time 1.4.2 +%ghc_lib_subpackage transformers 0.3.0.0 +%ghc_lib_subpackage unix 2.7.0.1 +%ghc_lib_subpackage xhtml 3000.2.1 %endif %global version %{ghc_version_override} @@ -169,42 +159,43 @@ %prep %setup -q -rm -r ghc-tarballs/{mingw,mingw64,perl} -%patch -p1 -b .libffi -rm -r ghc-tarballs/libffi -%patch1 -p1 -b .suse -%patch2 -p1 -b .TH -%patch3 -p1 -b .llvm-version -%patch4 -p1 -b .llvm-empty -%patch5 -p1 -b .shm -%patch6 -p1 -b .comma -%patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 %build -# required for patch and patch1 -#autoreconf -fi - -# required for patch5 and patch6 and will run autoreconf for patch and patch1 -perl boot - # Check if bootstrap is required, i.e. version is different from ghc's version # Note: Cannot use ghc_version macro here as we defined version override earlier %if "%version" != "%(ghc --numeric-version)" %define ghc_boot 1 cat > mk/build.mk <<EOF -GhcLibWays = v +GhcLibWays = v %{!?ghc_without_shared:dyn} +%if %{defined ghc_without_shared} +DYNAMIC_BY_DEFAULT = NO +DYNAMIC_GHC_PROGRAMS = NO +%endif %ifarch %{unregisterised_archs} -GhcUnregisterised=YES +GhcUnregisterised = YES +GhcWithNativeCodeGen = NO +GhcWithInterpreter = YES +SRC_HC_OPTS = -O -H64m +GhcStage1HcOpts = -O +GhcStage2HcOpts = -O +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O +SRC_HC_OPTS += -optc-fno-builtin +SRC_CC_OPTS += -fno-builtin %endif HADDOCK_DOCS = NO BUILD_DOCBOOK_HTML = NO HSCOLOUR_SRCS = NO EOF -./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi \ - --with-gcc=%{_bindir}/gcc +./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi make %{?_smp_mflags} make install make clean @@ -221,15 +212,20 @@ # override some settings cat >> mk/build.mk << EOF GhcLibWays = v %{!?ghc_without_shared:dyn} %{!?without_prof:p} +%if %{defined ghc_without_shared} +DYNAMIC_BY_DEFAULT = NO +DYNAMIC_GHC_PROGRAMS = NO +%endif %ifarch %{unregisterised_archs} GhcUnregisterised = YES GhcWithNativeCodeGen = NO SRC_HC_OPTS = -O -H64m GhcStage1HcOpts = -O -GhcStage2HcOpts = -O2 +GhcStage2HcOpts = -O GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -SplitObjs = NO +GhcLibHcOpts = -O +SRC_HC_OPTS += -optc-fno-builtin +SRC_CC_OPTS += -fno-builtin %endif %if %{defined without_haddock} HADDOCK_DOCS = NO @@ -249,8 +245,7 @@ --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ %{?ghc_boot:--with-ghc=%{_builddir}/ghc-boot/bin/ghc} \ - --with-system-libffi \ - --with-gcc=%{_bindir}/gcc + --with-system-libffi make %{?_smp_mflags} @@ -270,8 +265,8 @@ %ghc_gen_filelists bin-package-db 0.0.0.0 %ghc_gen_filelists ghc %{ghc_version_override} -%ghc_gen_filelists ghc-prim 0.3.0.0 -%ghc_gen_filelists integer-gmp 0.5.0.0 +%ghc_gen_filelists ghc-prim 0.3.1.0 +%ghc_gen_filelists integer-gmp 0.5.1.0 %define merge_filelist()\ cat ghc-%1.files >> ghc-%2.files\ @@ -284,20 +279,24 @@ %merge_filelist bin-package-db ghc %if %{undefined ghc_without_shared} -ls %{buildroot}%{ghclibdir}/libHS*.so >> ghc-base.files +echo %%dir %{ghclibdir}/rts-1.0 >> ghc-base.files +ls %{buildroot}%{ghclibdir}/rts-1.0/libHS*.so >> ghc-base.files sed -i -e "s|^%{buildroot}||g" ghc-base.files %endif -ls -d %{buildroot}%{ghclibdir}/libHS*.a %{buildroot}%{ghclibdir}/package.conf.d/builtin_*.conf %{buildroot}%{ghclibdir}/include >> ghc-base-devel.files +echo %%dir %{ghclibdir}/rts-1.0 >> ghc-base-devel.files +ls -d %{buildroot}%{ghclibdir}/rts-1.0/libHS*.a %{buildroot}%{ghclibdir}/package.conf.d/builtin_*.conf %{buildroot}%{ghclibdir}/include >> ghc-base-devel.files sed -i -e "s|^%{buildroot}||g" ghc-base-devel.files # these are handled as alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives for i in hsc2hs runhaskell; do if [ -x %{buildroot}%{_bindir}/$i-ghc ]; then rm %{buildroot}%{_bindir}/$i else mv %{buildroot}%{_bindir}/$i{,-ghc} fi - touch %{buildroot}%{_bindir}/$i + ln -s -f %{_sysconfdir}/alternatives/$i %{buildroot}%{_bindir}/$i + touch %{buildroot}%{_sysconfdir}/alternatives/$i done %ghc_strip_dynlinked @@ -320,8 +319,8 @@ rm testghc/* %if %{undefined ghc_without_shared} echo 'main = putStrLn "Foo"' > testghc/foo.hs -inplace/bin/ghc-stage2 testghc/foo.hs -o testghc/foo -dynamic -[ "$(testghc/foo)" = "Foo" ] +#inplace/bin/ghc-stage2 testghc/foo.hs -o testghc/foo -dynamic +#[ "$(testghc/foo)" = "Foo" ] rm testghc/* %endif @@ -337,13 +336,13 @@ # groups under a single name 'runhaskell'. Either these tools should be # disentangled from the Haskell implementations or all implementations should # have the same set of tools. *sigh* -update-alternatives --install %{_bindir}/runhaskell runhaskell %{_bindir}/runghc 500 -update-alternatives --install %{_bindir}/hsc2hs hsc2hs %{_bindir}/hsc2hs-ghc 500 +"%_sbindir/update-alternatives" --install %{_bindir}/runhaskell runhaskell %{_bindir}/runghc 500 +"%_sbindir/update-alternatives" --install %{_bindir}/hsc2hs hsc2hs %{_bindir}/hsc2hs-ghc 500 %preun compiler if test "$1" = 0; then - update-alternatives --remove runhaskell %{_bindir}/runghc - update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc + "%_sbindir/update-alternatives" --remove runhaskell %{_bindir}/runghc + "%_sbindir/update-alternatives" --remove hsc2hs %{_bindir}/hsc2hs-ghc fi %files @@ -352,7 +351,7 @@ %files compiler %defattr(-,root,root,-) -%doc ANNOUNCE HACKING LICENSE README +%doc ANNOUNCE LICENSE %{_bindir}/ghc %{_bindir}/ghc-%{version} %{_bindir}/ghc-pkg @@ -361,43 +360,56 @@ %{_bindir}/ghci-%{version} %{_bindir}/hp2ps %{_bindir}/hpc -%ghost %attr(755,root,root) %{_bindir}/hsc2hs +%{_bindir}/hsc2hs +%if 0%{suse_version} >= 1220 +%ghost %{_sysconfdir}/alternatives/hsc2hs +%endif %{_bindir}/hsc2hs-ghc %{_bindir}/runghc %{_bindir}/runghc-%{version} -%ghost %attr(755,root,root) %{_bindir}/runhaskell +%{_bindir}/runhaskell +%if 0%{suse_version} >= 1220 +%ghost %{_sysconfdir}/alternatives/runhaskell +%endif %{_bindir}/runhaskell-ghc +%dir %{ghclibdir} %{ghclibdir}/settings -%{ghclibdir}/ghc -%{ghclibdir}/ghc-pkg +%dir %{ghclibdir}/bin +%{ghclibdir}/bin/ghc +%{ghclibdir}/bin/ghc-pkg +%{ghclibdir}/bin/hpc +%{ghclibdir}/bin/hsc2hs %ifnarch %{unregisterised_archs} %{ghclibdir}/ghc-split %endif %{ghclibdir}/ghc-usage.txt %{ghclibdir}/ghci-usage.txt -%{ghclibdir}/hsc2hs +%{ghclibdir}/mkGmpDerivedConstants %dir %{ghclibdir}/package.conf.d %ghost %{ghclibdir}/package.conf.d/package.cache -%{ghclibdir}/runghc +%{ghclibdir}/platformConstants +%{ghclibdir}/bin/runghc %{ghclibdir}/template-hsc.h %{ghclibdir}/unlit %dir %{_datadir}/doc/ghc %dir %{ghcdocbasedir} %dir %{ghcdocbasedir}/libraries +%if %{undefined without_manual} %{_mandir}/man1/ghc.* +%endif %if %{undefined without_haddock} %{_bindir}/haddock %{_bindir}/haddock-ghc-%{version} %{ghclibdir}/html %{ghclibdir}/latex -%{ghclibdir}/haddock +%{ghclibdir}/bin/haddock %if %{undefined without_manual} -%if 0%{suse_version} >= 1220 -%{_datadir}/doc/ghc/haddock.* -%{_datadir}/doc/ghc/users_guide.* -%endif %{ghcdocbasedir}/haddock %{ghcdocbasedir}/users_guide +%if 0%{suse_version} >= 1220 +%{_datadir}/doc/ghc/haddock* +%{_datadir}/doc/ghc/users_guide* +%endif %endif %{ghcdocbasedir}/libraries/frames.html %{ghcdocbasedir}/libraries/gen_contents_index @@ -412,10 +424,6 @@ %ghost %{ghcdocbasedir}/libraries/minus.gif %ghost %{ghcdocbasedir}/libraries/plus.gif %endif -%if %{suse_version} >= 1230 -%ghost %{_sysconfdir}/alternatives/hsc2hs -%ghost %{_sysconfdir}/alternatives/runhaskell -%endif %files libraries %defattr(-,root,root,-) ++++++ D173.patch ++++++ Index: ghc-7.8.3/compiler/cmm/PprC.hs =================================================================== --- ghc-7.8.3.orig/compiler/cmm/PprC.hs +++ ghc-7.8.3/compiler/cmm/PprC.hs @@ -1220,8 +1220,9 @@ commafy xs = hsep $ punctuate comma xs pprHexVal :: Integer -> Width -> SDoc pprHexVal 0 _ = ptext (sLit "0x0") pprHexVal w rep - | w < 0 = parens (char '-' <> ptext (sLit "0x") <> go (-w) <> repsuffix rep) - | otherwise = ptext (sLit "0x") <> go w <> repsuffix rep + | w < 0 = parens (char '-' <> + ptext (sLit "0x") <> intToDoc (-w) <> repsuffix rep) + | otherwise = ptext (sLit "0x") <> intToDoc w <> repsuffix rep where -- type suffix for literals: -- Integer literals are unsigned in Cmm/C. We explicitly cast to @@ -1236,10 +1237,33 @@ pprHexVal w rep else panic "pprHexVal: Can't find a 64-bit type" repsuffix _ = char 'U' + intToDoc :: Integer -> SDoc + intToDoc i = go (truncInt i) + + -- We need to truncate value as Cmm backend does not drop + -- redundant bits to ease handling of negative values. + -- Thus the following Cmm code on 64-bit arch, like amd64: + -- CInt v; + -- v = {something}; + -- if (v == %lobits32(-1)) { ... + -- leads to the following C code: + -- StgWord64 v = (StgWord32)({something}); + -- if (v == 0xFFFFffffFFFFffffU) { ... + -- Such code is incorrect as it promotes both operands to StgWord64 + -- and the whole condition is always false. + truncInt :: Integer -> Integer + truncInt i = + case rep of + W8 -> i `rem` (2^(8 :: Int)) + W16 -> i `rem` (2^(16 :: Int)) + W32 -> i `rem` (2^(32 :: Int)) + W64 -> i `rem` (2^(64 :: Int)) + _ -> panic ("pprHexVal/truncInt: C backend can't encode " + ++ show rep ++ " literals") + go 0 = empty go w' = go q <> dig where (q,r) = w' `quotRem` 16 dig | r < 10 = char (chr (fromInteger r + ord '0')) | otherwise = char (chr (fromInteger r - 10 + ord 'a')) - ++++++ D177.patch ++++++ Index: ghc-7.8.3/compiler/main/DriverPipeline.hs =================================================================== --- ghc-7.8.3.orig/compiler/main/DriverPipeline.hs +++ ghc-7.8.3/compiler/main/DriverPipeline.hs @@ -1208,6 +1208,7 @@ runPhase (RealPhase (As with_cpp)) input as_prog <- whichAsProg let cmdline_include_paths = includePaths dflags + let pic_c_flags = picCCOpts dflags next_phase <- maybeMergeStub output_fn <- phaseOutputFilename next_phase @@ -1221,6 +1222,9 @@ runPhase (RealPhase (As with_cpp)) input = liftIO $ as_prog dflags ([ SysTools.Option ("-I" ++ p) | p <- cmdline_include_paths ] + -- See Note [-fPIC for assembler] + ++ map SysTools.Option pic_c_flags + -- We only support SparcV9 and better because V8 lacks an atomic CAS -- instruction so we have to make sure that the assembler accepts the -- instruction set. Note that the user can still override this @@ -1262,6 +1266,8 @@ runPhase (RealPhase SplitAs) _input_fn d osuf = objectSuf dflags split_odir = base_o ++ "_" ++ osuf ++ "_split" + let pic_c_flags = picCCOpts dflags + -- this also creates the hierarchy liftIO $ createDirectoryIfMissing True split_odir @@ -1295,6 +1301,9 @@ runPhase (RealPhase SplitAs) _input_fn d then [SysTools.Option "-mcpu=v9"] else []) ++ + -- See Note [-fPIC for assembler] + map SysTools.Option pic_c_flags ++ + [ SysTools.Option "-c" , SysTools.Option "-o" , SysTools.FileOption "" (split_obj n) @@ -2210,3 +2219,38 @@ haveRtsOptsFlags dflags = isJust (rtsOpts dflags) || case rtsOptsEnabled dflags of RtsOptsSafeOnly -> False _ -> True + +-- Note [-fPIC for assembler] +-- When compiling .c source file GHC's driver pipeline basically +-- does the following two things: +-- 1. ${CC} -S 'PIC_CFLAGS' source.c +-- 2. ${CC} -x assembler -c 'PIC_CFLAGS' source.S +-- +-- Why do we need to pass 'PIC_CFLAGS' both to C compiler and assembler? +-- Because on some architectures (at least sparc32) assembler also choses +-- relocation type! +-- Consider the following C module: +-- +-- /* pic-sample.c */ +-- int v; +-- void set_v (int n) { v = n; } +-- int get_v (void) { return v; } +-- +-- $ gcc -S -fPIC pic-sample.c +-- $ gcc -c pic-sample.s -o pic-sample.no-pic.o # incorrect binary +-- $ gcc -c -fPIC pic-sample.s -o pic-sample.pic.o # correct binary +-- +-- $ objdump -r -d pic-sample.pic.o > pic-sample.pic.o.od +-- $ objdump -r -d pic-sample.no-pic.o > pic-sample.no-pic.o.od +-- $ diff -u pic-sample.pic.o.od pic-sample.no-pic.o.od +-- +-- Most of architectures won't show any difference in this test, but on sparc32 +-- the following assembly snippet: +-- +-- sethi %hi(_GLOBAL_OFFSET_TABLE_-8), %l7 +-- +-- generates two kinds or relocations, only 'R_SPARC_PC22' is correct: +-- +-- 3c: 2f 00 00 00 sethi %hi(0), %l7 +-- - 3c: R_SPARC_PC22 _GLOBAL_OFFSET_TABLE_-0x8 +-- + 3c: R_SPARC_HI22 _GLOBAL_OFFSET_TABLE_-0x8 ++++++ D349.patch ++++++ Index: ghc-7.8.3/compiler/ghci/Linker.lhs =================================================================== --- ghc-7.8.3.orig/compiler/ghci/Linker.lhs +++ ghc-7.8.3/compiler/ghci/Linker.lhs @@ -123,7 +123,10 @@ data PersistentLinkerState -- The currently-loaded packages; always object code -- Held, as usual, in dependency order; though I am not sure if -- that is really important - pkgs_loaded :: ![PackageId] + pkgs_loaded :: ![PackageId], + -- we need to remember the name of the last temporary DLL/.so + -- so we can link it + last_temp_so :: !(Maybe FilePath) } emptyPLS :: DynFlags -> PersistentLinkerState @@ -132,7 +135,8 @@ emptyPLS _ = PersistentLinkerState { itbl_env = emptyNameEnv, pkgs_loaded = init_pkgs, bcos_loaded = [], - objs_loaded = [] } + objs_loaded = [], + last_temp_so = Nothing } -- Packages that don't need loading, because the compiler -- shares them with the interpreted program. @@ -314,14 +318,15 @@ reallyInitDynLinker dflags = ; if null cmdline_lib_specs then return pls else do - { mapM_ (preloadLib dflags lib_paths framework_paths) cmdline_lib_specs + { pls1 <- foldM (preloadLib dflags lib_paths framework_paths) pls + cmdline_lib_specs ; maybePutStr dflags "final link ... " ; ok <- resolveObjs ; if succeeded ok then maybePutStrLn dflags "done" else throwGhcExceptionIO (ProgramError "linking extra libraries/objects failed") - ; return pls + ; return pls1 }} @@ -360,19 +365,22 @@ classifyLdInput dflags f return Nothing where platform = targetPlatform dflags -preloadLib :: DynFlags -> [String] -> [String] -> LibrarySpec -> IO () -preloadLib dflags lib_paths framework_paths lib_spec +preloadLib :: DynFlags -> [String] -> [String] -> PersistentLinkerState + -> LibrarySpec -> IO (PersistentLinkerState) +preloadLib dflags lib_paths framework_paths pls lib_spec = do maybePutStr dflags ("Loading object " ++ showLS lib_spec ++ " ... ") case lib_spec of Object static_ish - -> do b <- preload_static lib_paths static_ish + -> do (b, pls1) <- preload_static lib_paths static_ish maybePutStrLn dflags (if b then "done" else "not found") + return pls1 Archive static_ish -> do b <- preload_static_archive lib_paths static_ish maybePutStrLn dflags (if b then "done" else "not found") + return pls DLL dll_unadorned -> do maybe_errstr <- loadDLL (mkSOName platform dll_unadorned) @@ -388,12 +396,14 @@ preloadLib dflags lib_paths framework_pa case err2 of Nothing -> maybePutStrLn dflags "done" Just _ -> preloadFailed mm lib_paths lib_spec + return pls DLLPath dll_path -> do maybe_errstr <- loadDLL dll_path case maybe_errstr of Nothing -> maybePutStrLn dflags "done" Just mm -> preloadFailed mm lib_paths lib_spec + return pls Framework framework -> if platformUsesFrameworks (targetPlatform dflags) @@ -401,6 +411,7 @@ preloadLib dflags lib_paths framework_pa case maybe_errstr of Nothing -> maybePutStrLn dflags "done" Just mm -> preloadFailed mm framework_paths lib_spec + return pls else panic "preloadLib Framework" where @@ -420,11 +431,13 @@ preloadLib dflags lib_paths framework_pa -- Not interested in the paths in the static case. preload_static _paths name = do b <- doesFileExist name - if not b then return False - else do if dynamicGhc - then dynLoadObjs dflags [name] - else loadObj name - return True + if not b then return (False, pls) + else if dynamicGhc + then do pls1 <- dynLoadObjs dflags pls [name] + return (True, pls1) + else do loadObj name + return (True, pls) + preload_static_archive _paths name = do b <- doesFileExist name if not b then return False @@ -791,8 +804,8 @@ dynLinkObjs dflags pls objs = do wanted_objs = map nameOfObject unlinkeds if dynamicGhc - then do dynLoadObjs dflags wanted_objs - return (pls1, Succeeded) + then do pls2 <- dynLoadObjs dflags pls1 wanted_objs + return (pls2, Succeeded) else do mapM_ loadObj wanted_objs -- Link them all together @@ -806,9 +819,11 @@ dynLinkObjs dflags pls objs = do pls2 <- unload_wkr dflags [] pls1 return (pls2, Failed) -dynLoadObjs :: DynFlags -> [FilePath] -> IO () -dynLoadObjs _ [] = return () -dynLoadObjs dflags objs = do + +dynLoadObjs :: DynFlags -> PersistentLinkerState -> [FilePath] + -> IO PersistentLinkerState +dynLoadObjs _ pls [] = return pls +dynLoadObjs dflags pls objs = do let platform = targetPlatform dflags soFile <- newTempName dflags (soExt platform) let -- When running TH for a non-dynamic way, we still need to make @@ -816,10 +831,22 @@ dynLoadObjs dflags objs = do -- Opt_Static off dflags1 = gopt_unset dflags Opt_Static dflags2 = dflags1 { - -- We don't want to link the ldInputs in; we'll - -- be calling dynLoadObjs with any objects that - -- need to be linked. - ldInputs = [], + -- We don't want the original ldInputs in + -- (they're already linked in), but we do want + -- to link against the previous dynLoadObjs + -- library if there was one, so that the linker + -- can resolve dependencies when it loads this + -- library. + ldInputs = + case last_temp_so pls of + Nothing -> [] + Just so -> + let (lp, l) = splitFileName so in + [ Option ("-L" ++ lp) + , Option ("-Wl,-rpath") + , Option ("-Wl," ++ lp) + , Option ("-l:" ++ l) + ], -- Even if we're e.g. profiling, we still want -- the vanilla dynamic libraries, so we set the -- ways / build tag to be just WayDyn. @@ -831,7 +858,7 @@ dynLoadObjs dflags objs = do consIORef (filesToNotIntermediateClean dflags) soFile m <- loadDLL soFile case m of - Nothing -> return () + Nothing -> return pls { last_temp_so = Just soFile } Just err -> panic ("Loading temp shared object failed: " ++ err) rmDupLinkables :: [Linkable] -- Already loaded Index: ghc-7.8.3/compiler/main/SysTools.lhs =================================================================== --- ghc-7.8.3.orig/compiler/main/SysTools.lhs +++ ghc-7.8.3/compiler/main/SysTools.lhs @@ -1365,6 +1365,7 @@ linkDynLib dflags0 o_files dep_packages in package_hs_libs ++ extra_libs ++ other_flags -- probably _stub.o files + -- and last temporary shaerd object file let extra_ld_inputs = ldInputs dflags case os of @@ -1482,8 +1483,8 @@ linkDynLib dflags0 o_files dep_packages -- Set the library soname. We use -h rather than -soname as -- Solaris 10 doesn't support the latter: ++ [ Option ("-Wl,-h," ++ takeFileName output_fn) ] - ++ map Option lib_path_opts ++ extra_ld_inputs + ++ map Option lib_path_opts ++ map Option pkg_lib_path_opts ++ map Option pkg_link_opts ) Index: ghc-7.8.3/rts/Linker.c =================================================================== --- ghc-7.8.3.orig/rts/Linker.c +++ ghc-7.8.3/rts/Linker.c @@ -1776,7 +1776,7 @@ internal_dlopen(const char *dll_name) // (see POSIX also) ACQUIRE_LOCK(&dl_mutex); - hdl = dlopen(dll_name, RTLD_LAZY | RTLD_GLOBAL); + hdl = dlopen(dll_name, RTLD_LAZY|RTLD_LOCAL); /* see Note [RTLD_LOCAL] */ errmsg = NULL; if (hdl == NULL) { @@ -1786,11 +1786,12 @@ internal_dlopen(const char *dll_name) errmsg_copy = stgMallocBytes(strlen(errmsg)+1, "addDLL"); strcpy(errmsg_copy, errmsg); errmsg = errmsg_copy; + } else { + o_so = stgMallocBytes(sizeof(OpenedSO), "addDLL"); + o_so->handle = hdl; + o_so->next = openedSOs; + openedSOs = o_so; } - o_so = stgMallocBytes(sizeof(OpenedSO), "addDLL"); - o_so->handle = hdl; - o_so->next = openedSOs; - openedSOs = o_so; RELEASE_LOCK(&dl_mutex); //--------------- End critical section ------------------- @@ -1798,14 +1799,39 @@ internal_dlopen(const char *dll_name) return errmsg; } +/* + Note [RTLD_LOCAL] + + In GHCi we want to be able to override previous .so's with newly + loaded .so's when we recompile something. This further implies that + when we look up a symbol in internal_dlsym() we have to iterate + through the loaded libraries (in order from most recently loaded to + oldest) looking up the symbol in each one until we find it. + + However, this can cause problems for some symbols that are copied + by the linker into the executable image at runtime - see #8935 for a + lengthy discussion. To solve that problem we need to look up + symbols in the main executable *first*, before attempting to look + them up in the loaded .so's. But in order to make that work, we + have to always call dlopen with RTLD_LOCAL, so that the loaded + libraries don't populate the global symbol table. +*/ + static void * -internal_dlsym(void *hdl, const char *symbol) { +internal_dlsym(const char *symbol) { OpenedSO* o_so; void *v; // We acquire dl_mutex as concurrent dl* calls may alter dlerror ACQUIRE_LOCK(&dl_mutex); dlerror(); + // look in program first + v = dlsym(dl_prog_handle, symbol); + if (dlerror() == NULL) { + RELEASE_LOCK(&dl_mutex); + return v; + } + for (o_so = openedSOs; o_so != NULL; o_so = o_so->next) { v = dlsym(o_so->handle, symbol); if (dlerror() == NULL) { @@ -1813,7 +1839,6 @@ internal_dlsym(void *hdl, const char *sy return v; } } - v = dlsym(hdl, symbol); RELEASE_LOCK(&dl_mutex); return v; } @@ -1981,7 +2006,7 @@ lookupSymbol( char *lbl ) if (!ghciLookupSymbolTable(symhash, lbl, &val)) { IF_DEBUG(linker, debugBelch("lookupSymbol: symbol not found\n")); # if defined(OBJFORMAT_ELF) - return internal_dlsym(dl_prog_handle, lbl); + return internal_dlsym(lbl); # elif defined(OBJFORMAT_MACHO) # if HAVE_DLFCN_H /* On OS X 10.3 and later, we use dlsym instead of the old legacy @@ -1995,7 +2020,7 @@ lookupSymbol( char *lbl ) */ IF_DEBUG(linker, debugBelch("lookupSymbol: looking up %s with dlsym\n", lbl)); ASSERT(lbl[0] == '_'); - return internal_dlsym(dl_prog_handle, lbl + 1); + return internal_dlsym(lbl + 1); # else if (NSIsSymbolNameDefined(lbl)) { NSSymbol symbol = NSLookupAndBindSymbol(lbl); ++++++ ghc-7.8.2-cgen-constify.patch ++++++ commit b0cf3ab7a69b878a4335d21a347b56e4b0ca0b7b Author: Sergei Trofimovich <slyfox(a)gentoo.org> Date: Mon Apr 14 19:06:24 2014 +0300 compiler/cmm/PprC.hs: constify local string literals Consider one-line module module B (v) where v = "hello" in -fvia-C mode it generates code like static char gibberish_str[] = "hello"; It uselessly eats data section (precious resource on ia64!). The patch switches genrator to emit: static const char gibberish_str[] = "hello"; Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index 2398981..fdb578d 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -112,6 +112,12 @@ pprTop (CmmProc infos clbl _ graph) = -- We only handle (a) arrays of word-sized things and (b) strings. +pprTop (CmmData ReadOnlyData (Statics lbl [CmmString str])) = + hcat [ + pprLocalness lbl, ptext (sLit "const char "), ppr lbl, + ptext (sLit "[] = "), pprStringInCStyle str, semi + ] + pprTop (CmmData _section (Statics lbl [CmmString str])) = hcat [ pprLocalness lbl, ptext (sLit "char "), ppr lbl, ++++++ ghc-cabal-unversion-docdir.patch ++++++ --- /var/tmp/diff_new_pack.vrQA4V/_old 2014-11-26 10:32:58.000000000 +0100 +++ /var/tmp/diff_new_pack.vrQA4V/_new 2014-11-26 10:32:58.000000000 +0100 @@ -1,13 +1,15 @@ ---- ghc-7.6.3/utils/ghc-cabal/Main.hs~ 2013-04-19 06:22:47.000000000 +0900 -+++ ghc-7.6.3/utils/ghc-cabal/Main.hs 2013-10-29 12:35:18.916340631 +0900 -@@ -180,8 +180,8 @@ - libsubdir = toPathTemplate "$pkgid", - docdir = toPathTemplate $ - if relocatableBuild -- then "$topdir/../doc/html/libraries/$pkgid" -- else (myDocdir </> "$pkgid"), -+ then "$topdir/../doc/html/libraries/$pkg" -+ else (myDocdir </> "$pkg"), - htmldir = toPathTemplate "$docdir" - } - progs = withPrograms lbi +Index: ghc-7.7.20131120/utils/ghc-cabal/Main.hs +=================================================================== +--- ghc-7.7.20131120.orig/utils/ghc-cabal/Main.hs ++++ ghc-7.7.20131120/utils/ghc-cabal/Main.hs +@@ -253,8 +253,8 @@ updateInstallDirTemplates relocatableBui + libsubdir = toPathTemplate "$pkgid", + docdir = toPathTemplate $ + if relocatableBuild +- then "$topdir/../doc/html/libraries/$pkgid" +- else (myDocdir </> "$pkgid"), ++ then "$topdir/../doc/html/libraries/$pkg" ++ else (myDocdir </> "$pkg"), + htmldir = toPathTemplate "$docdir" + } + ++++++ ghc.git-e18525f.patch ++++++ From: Sergei Trofimovich <slyfox(a)gentoo.org> Date: Thu, 4 Sep 2014 14:50:45 +0000 (+0300) Subject: pprC: declare extern cmm primitives as functions, not data X-Git-Url: https://git.haskell.org/ghc.git/commitdiff_plain/e18525fae273f4c1ad8d6cbe1d… pprC: declare extern cmm primitives as functions, not data Summary: The commit fixes incorrect code generation of integer-gmp package on ia64 due to C prototypes mismatch. Before the patch prototypes for "foreign import prim" were: StgWord poizh[]; After the patch they became: StgFunPtr poizh(); Long story: Consider the following simple example: {-# LANGUAGE MagicHash, GHCForeignImportPrim, UnliftedFFITypes #-} module M where import GHC.Prim -- Int# foreign import prim "poizh" poi# :: Int# -> Int# Before the patch unregisterised build generated the following 'poizh' reference: EI_(poizh); /* StgWord poizh[]; */ FN_(M_poizh_entry) { // ... JMP_((W_)&poizh); } After the patch it looks this way: EF_(poizh); /* StgFunPtr poizh(); */ FN_(M_poizh_entry) { // ... JMP_((W_)&poizh); } On ia64 it leads to different relocation types being generated: incorrect one: addl r14 = @ltoffx(poizh#) ld8.mov r14 = [r14], poizh# ; r14 = address-of 'poizh#' correct one: addl r14 = @ltoff(@fptr(poizh#)), gp ; r14 = address-of-thunk 'poizh#' ld8 r14 = [r14] '@fptr(poizh#)' basically instructs assembler to creates another obect consisting of real address to 'poizh' instructions and module address. That '@fptr' object is used as a function "address" This object is different for every module referencing 'poizh' symbol. All indirect function calls expect '@fptr' object. That way call site reads real destination address and set destination module address in 'gp' register from '@fptr'. Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> --- Index: ghc-7.8.3/compiler/cmm/CLabel.hs =================================================================== --- ghc-7.8.3.orig/compiler/cmm/CLabel.hs +++ ghc-7.8.3/compiler/cmm/CLabel.hs @@ -801,6 +801,7 @@ labelType (CmmLabel _ _ CmmClosure) labelType (CmmLabel _ _ CmmCode) = CodeLabel labelType (CmmLabel _ _ CmmInfo) = DataLabel labelType (CmmLabel _ _ CmmEntry) = CodeLabel +labelType (CmmLabel _ _ CmmPrimCall) = CodeLabel labelType (CmmLabel _ _ CmmRetInfo) = DataLabel labelType (CmmLabel _ _ CmmRet) = CodeLabel labelType (RtsLabel (RtsSelectorInfoTable _ _)) = DataLabel ++++++ integer-gmp.patch ++++++ Index: ghc-7.8.3/libraries/integer-gmp/gmp/ghc.mk =================================================================== --- ghc-7.8.3.orig/libraries/integer-gmp/gmp/ghc.mk +++ ghc-7.8.3/libraries/integer-gmp/gmp/ghc.mk @@ -66,6 +66,12 @@ else BUILD_SHARED=no endif +ifeq "$(firstword $(subst -, ,$(HOSTPLATFORM)))" "x86_64" + FORCE_PIC=--with-pic=yes +else + FORCE_PIC= +endif + # In a bindist, we don't want to know whether /this/ machine has gmp, # but whether the machine the bindist was built on had gmp. ifeq "$(BINDIST)" "YES" @@ -147,7 +153,7 @@ libraries/integer-gmp/gmp/libgmp.a libra export PATH; \ cd gmpbuild && \ CC=$(CCX) NM=$(NM) AR=$(AR_STAGE1) ./configure \ - --enable-shared=no \ + --enable-shared=no $(FORCE_PIC) \ --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM) $(MAKE) -C libraries/integer-gmp/gmp/gmpbuild MAKEFLAGS= $(CP) libraries/integer-gmp/gmp/gmpbuild/gmp.h libraries/integer-gmp/gmp/ ++++++ llvm-powerpc64-datalayout.patch ++++++ --- /var/tmp/diff_new_pack.vrQA4V/_old 2014-11-26 10:32:58.000000000 +0100 +++ /var/tmp/diff_new_pack.vrQA4V/_new 2014-11-26 10:32:58.000000000 +0100 @@ -1,18 +1,14 @@ -Index: ghc-7.6.3/compiler/llvmGen/LlvmCodeGen/Ppr.hs +Index: ghc-7.8.2/compiler/llvmGen/LlvmCodeGen/Ppr.hs =================================================================== ---- ghc-7.6.3.orig/compiler/llvmGen/LlvmCodeGen/Ppr.hs -+++ ghc-7.6.3/compiler/llvmGen/LlvmCodeGen/Ppr.hs -@@ -68,6 +68,13 @@ moduleLayout = - $+$ text "target triple = \"arm-unknown-linux-gnueabi\"" - #endif - -+#elif defined (powerpc64_TARGET_ARCH) -+ -+#if linux_TARGET_OS -+ text "target datalayout = \"E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v128:128:128-n32:64\"" -+ $+$ text "target triple = \"powerpc64-unknown-linux-gnu\"" -+#endif -+ - #else - -- FIX: Other targets - empty +--- ghc-7.8.2.orig/compiler/llvmGen/LlvmCodeGen/Ppr.hs ++++ ghc-7.8.2/compiler/llvmGen/LlvmCodeGen/Ppr.hs +@@ -64,6 +64,9 @@ moduleLayout = sdocWithPlatform $ \platf + Platform { platformArch = ArchX86, platformOS = OSiOS } -> + text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32\"" + $+$ text "target triple = \"i386-apple-darwin11\"" ++ Platform { platformArch = ArchPPC_64 , platformOS = OSLinux } -> ++ text "target datalayout = \"E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v128:128:128-n32:64\"" ++ $+$ text "target triple = \"powerpc64-unknown-linux-gnu\"" + _ -> + -- FIX: Other targets + empty -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hwinfo for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2014-11-26 10:32:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hwinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2014-11-10 17:28:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2014-11-26 10:32:45.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 24 15:10:26 CET 2014 - snwint_jenkins(a)suse.com + +- add arm platform devices +- 21.9 + +------------------------------------------------------------------- Old: ---- hwinfo-21.8.tar.xz New: ---- hwinfo-21.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.ASUu5o/_old 2014-11-26 10:32:46.000000000 +0100 +++ /var/tmp/diff_new_pack.ASUu5o/_new 2014-11-26 10:32:46.000000000 +0100 @@ -36,7 +36,7 @@ Group: Hardware/Other # Until migration to github this should be correct url Url: http://gitorious.org/opensuse/hwinfo -Version: 21.8 +Version: 21.9 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.8.tar.xz -> hwinfo-21.9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.8/VERSION new/hwinfo-21.9/VERSION --- old/hwinfo-21.8/VERSION 2014-11-07 08:20:34.000000000 +0100 +++ new/hwinfo-21.9/VERSION 2014-11-24 15:01:48.000000000 +0100 @@ -1 +1 @@ -21.8 +21.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.8/changelog new/hwinfo-21.9/changelog --- old/hwinfo-21.8/changelog 2014-11-07 08:20:34.000000000 +0100 +++ new/hwinfo-21.9/changelog 2014-11-24 15:01:48.000000000 +0100 @@ -1,3 +1,6 @@ +2014-11-24: 21.9 + - add arm platform devices + 2014-11-07: 21.8 - fix bashisms in getsysinfo script - mark gen-hwcfg-disk.sh as shell, no bash script diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.8/src/hd/pci.c new/hwinfo-21.9/src/hd/pci.c --- old/hwinfo-21.8/src/hd/pci.c 2014-11-07 08:20:34.000000000 +0100 +++ new/hwinfo-21.9/src/hd/pci.c 2014-11-24 15:01:48.000000000 +0100 @@ -878,10 +878,12 @@ */ void hd_read_platform(hd_data_t *hd_data) { - char *s, *platform_type; + char *s, *platform_type, *device_type = NULL; str_list_t *sf_bus, *sf_bus_e, *sf_eth_dev = NULL; char *sf_dev, *sf_eth_net; int mv643xx_eth_seen = 0; + int is_net, is_storage, is_usb; + hd_t *hd; sf_bus = read_dir("/sys/bus/platform/devices", 'l'); @@ -901,21 +903,70 @@ if((s = get_sysfs_attr_by_path(sf_dev, "modalias"))) { platform_type = canon_str(s, strlen(s)); - ADD2LOG(" type = \"%s\"\n", platform_type); + device_type = free_mem(device_type); + if((s = get_sysfs_attr_by_path(sf_dev, "uevent"))) { + char *t, *t2; + if((t = strstr(s, "OF_NAME="))) { + t += sizeof "OF_NAME=" - 1; + if((t2 = strchr(t, '\n'))) *t2 = 0; + device_type = strdup(t); + } + } + ADD2LOG(" type = \"%s\", modalias = \"%s\"\n", device_type, platform_type); + is_net = 0; sf_eth_net = new_str(hd_read_sysfs_link(sf_dev, "net")); sf_eth_dev = read_dir(sf_eth_net, 'd'); - ADD2LOG(" platform device: sf_eth_net = %s sf_eth_dev = %p\n", sf_eth_net, sf_eth_dev); - if ( + is_net = sf_eth_net && sf_eth_dev; + is_storage = device_type && !strcmp(device_type, "sata"); + is_usb = device_type && !strcmp(device_type, "usb"); + if(is_net) ADD2LOG(" is net: sf_eth_net = %s\n", sf_eth_net); + if(is_storage) ADD2LOG(" is storage\n"); + if(is_usb) ADD2LOG(" is usb\n"); + free_mem(sf_eth_net); + free_str_list(sf_eth_dev); + if( /* there is 'mv643xx_eth.0', 'mv643xx_eth.1' and 'mv643xx_eth_shared.' */ - sf_eth_dev && sf_eth_net && + is_net && strstr(platform_type, "mv643xx_eth") && !mv643xx_eth_seen++ ) { add_mv643xx_eth(hd_data, sf_bus_e->str, platform_type); } + else if(is_net) { + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->base_class.id = bc_network; + hd->sub_class.id = 0; + str_printf(&hd->device.name, 0, "ARM Ethernet %d", hd->slot); + hd->modalias = new_str(platform_type); + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); + if(s) add_str_list(&hd->drivers, s); + } + else if(is_storage) { + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->base_class.id = bc_storage; + hd->sub_class.id = sc_sto_ide; + str_printf(&hd->device.name, 0, "ARM SATA %d", hd->slot); + hd->modalias = new_str(platform_type); + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); + if(s) add_str_list(&hd->drivers, s); + } + else if(is_usb) { + hd = add_hd_entry(hd_data, __LINE__, 0); + hd->base_class.id = bc_serial; + hd->sub_class.id = sc_ser_usb; + + str_printf(&hd->device.name, 0, "ARM USB %d", hd->slot); + hd->modalias = new_str(platform_type); + hd->sysfs_id = new_str(hd_sysfs_id(sf_dev)); + hd->sysfs_bus_id = new_str(sf_bus_e->str); + s = hd_sysfs_find_driver(hd_data, hd->sysfs_id, 1); + if(s) add_str_list(&hd->drivers, s); + } free_mem(platform_type); - free_mem(sf_eth_net); - free_str_list(sf_eth_dev); } free_mem(sf_dev); @@ -1563,6 +1614,7 @@ free_str_list(sf_bus); } + /* * uisvirtpci */ @@ -1634,5 +1686,6 @@ free_str_list(sf_bus); } + /** @} */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdump for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2014-11-26 10:32:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdump" Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2014-11-15 12:17:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2014-11-26 10:32:42.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 23 05:31:00 UTC 2014 - Led <ledest(a)gmail.com> + +- fix shebang in rc.kdump.functions +- add patches: + * kdump-0.8.15-fix-shebang.patch + +------------------------------------------------------------------- New: ---- kdump-0.8.15-fix-shebang.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump.spec ++++++ --- /var/tmp/diff_new_pack.e4PlQ1/_old 2014-11-26 10:32:43.000000000 +0100 +++ /var/tmp/diff_new_pack.e4PlQ1/_new 2014-11-26 10:32:43.000000000 +0100 @@ -80,6 +80,7 @@ Patch13: %{name}-fadump-bootloader-always.patch Patch14: %{name}-bootloader-grub2.patch Patch15: %{name}-fadump-keep-sysroot.patch +Patch16: %{name}-0.8.15-fix-shebang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) Provides: kdump-helpers = %{version} @@ -133,6 +134,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build export CFLAGS="%optflags" ++++++ kdump-0.8.15-fix-shebang.patch ++++++ diff -Ndur kdump-0.8.15/init/rc.kdump.functions kdump-0.8.15-fix-shebang/init/rc.kdump.functions --- kdump-0.8.15/init/rc.kdump.functions 2014-06-23 18:47:39.000000000 +0300 +++ kdump-0.8.15-fix-shebang/init/rc.kdump.functions 2014-11-23 07:28:42.856444929 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright 2005 Red Hat, Inc. # Author: Jeff Moyer <jmoyer(a)redhat.com> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bash-completion for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package bash-completion for openSUSE:Factory checked in at 2014-11-26 10:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bash-completion (Old) and /work/SRC/openSUSE:Factory/.bash-completion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bash-completion" Changes: -------- --- /work/SRC/openSUSE:Factory/bash-completion/bash-completion.changes 2013-05-16 09:43:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bash-completion.new/bash-completion.changes 2014-11-26 10:32:44.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 17 12:46:11 UTC 2014 - werner(a)suse.de + +- Add patch PS1-completion-boo903362.patch to avoid trouble if + restricted characters of the shell are used in PS1 like + exclamation mark (boo#903362). +- Add patch FOO-dir-completion-boo905348.patch to expand variables + which value is actual a directory to avoid excaped dollar sign + (boo#905348). + +------------------------------------------------------------------- New: ---- FOO-dir-completion-boo905348.patch PS1-completion-boo903362.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash-completion.spec ++++++ --- /var/tmp/diff_new_pack.WyNn4G/_old 2014-11-26 10:32:44.000000000 +0100 +++ /var/tmp/diff_new_pack.WyNn4G/_new 2014-11-26 10:32:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bash-completion # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,10 @@ Patch0: %{name}-%{version}.patch # PATCH-PATCH-EXTEND-OPENSUSE bnc#818365 -- bash completion for builtin command "pushd" is missing Patch1: pushd-completion-bnc818365.patch +# PATCH-FIX-SUSE bnc#903362 -- tab completion for file names prints error +Patch2: PS1-completion-boo903362.patch +# PATCH-FIX-SUSE bnc#905348 -- tab completion with shell variable changes command line with backslash +Patch3: FOO-dir-completion-boo905348.patch BuildRequires: pkg-config Requires: bash BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +46,8 @@ %setup -q %patch0 -b .p0 %patch1 -b .p1 +%patch2 -b .p2 +%patch3 -b .p3 %build %configure ++++++ FOO-dir-completion-boo905348.patch ++++++ --- bash_completion | 8 ++++++++ 1 file changed, 8 insertions(+) --- bash_completion +++ bash_completion 2014-11-17 12:41:17.573518527 +0000 @@ -565,6 +565,14 @@ _filedir() local -a toks local quoted x tmp + if [[ $cur =~ ^(\$\{?)([A-Za-z0-9_]*)/ ]]; then + eval local dir="${cur%%/*}" + if [[ -d "$dir" ]]; then + cur="${dir}/${cur#*/}" + [[ "$1" != -d ]] && set -- -d $@ + fi + fi + _quote_readline_by_ref "$cur" quoted x=$( compgen -d -- "$quoted" ) && while read -r tmp; do ++++++ PS1-completion-boo903362.patch ++++++ --- bash_completion.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- bash_completion.sh.in +++ bash_completion.sh.in 2014-11-17 12:17:01.505519084 +0000 @@ -1,9 +1,10 @@ # Check for interactive bash and that we haven't already been sourced. -[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION_COMPAT_DIR" ] && return +[ -z "$BASH_VERSION" ] && return +[ -n "$BASH_COMPLETION_COMPAT_DIR" ] && return +[[ $- =~ i ]] || return # Check for recent enough version of bash. -bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} -if [ $bmajor -gt 4 ] || [ $bmajor -eq 4 -a $bminor -ge 1 ]; then +if [ ${BASH_VERSINFO[0]} -gt 4 ] || [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \ . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" if shopt -q progcomp && [ -r @pkgdatadir@/bash_completion ]; then @@ -11,4 +12,3 @@ if [ $bmajor -gt 4 ] || [ $bmajor -eq 4 . @pkgdatadir@/bash_completion fi fi -unset bash bmajor bminor -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-firmware for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package kernel-firmware for openSUSE:Factory checked in at 2014-11-26 10:32:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-firmware (Old) and /work/SRC/openSUSE:Factory/.kernel-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-firmware" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-firmware/kernel-firmware.changes 2014-09-10 17:01:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-firmware.new/kernel-firmware.changes 2014-11-26 10:32:39.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Nov 22 22:42:35 CET 2014 - tiwai(a)suse.de + +- Updated to git snapshot 20141122: + Realtek WiFi and Ethernet updates and Intel BT updates + (bnc#906212) + +------------------------------------------------------------------- Old: ---- linux-firmware-20140903git.tar.xz New: ---- linux-firmware-20141122git.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-firmware.spec ++++++ --- /var/tmp/diff_new_pack.gqtwot/_old 2014-11-26 10:32:42.000000000 +0100 +++ /var/tmp/diff_new_pack.gqtwot/_new 2014-11-26 10:32:42.000000000 +0100 @@ -20,7 +20,7 @@ BuildRequires: fdupes BuildRequires: kernel-default BuildRequires: suse-module-tools -Version: 20140903git +Version: 20141122git Release: 0 Summary: Linux kernel firmware files License: SUSE-Firmware and GPL-2.0 and GPL-2.0+ and MIT ++++++ linux-firmware-20140903git.tar.xz -> linux-firmware-20141122git.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-firmware/linux-firmware-20140903git.tar.xz /work/SRC/openSUSE:Factory/.kernel-firmware.new/linux-firmware-20141122git.tar.xz differ: char 27, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit firebird for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package firebird for openSUSE:Factory checked in at 2014-11-26 10:32:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/firebird (Old) and /work/SRC/openSUSE:Factory/.firebird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "firebird" Changes: -------- --- /work/SRC/openSUSE:Factory/firebird/firebird.changes 2014-07-10 09:32:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.firebird.new/firebird.changes 2014-11-26 10:32:37.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 17 01:29:00 UTC 2014 - Led <ledest(a)gmail.com> + +- fix bashisms in scripts +- add patches: + * Firebird-2.5.2.26539-0-fix-bashisms.patch + +------------------------------------------------------------------- New: ---- Firebird-2.5.2.26539-0-fix-bashisms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firebird.spec ++++++ --- /var/tmp/diff_new_pack.QNo8ep/_old 2014-11-26 10:32:39.000000000 +0100 +++ /var/tmp/diff_new_pack.QNo8ep/_new 2014-11-26 10:32:39.000000000 +0100 @@ -48,6 +48,7 @@ Patch1: %{name}-2.5.1-chown.patch Patch2: %{name}-2.5.2-gpidfile.patch Patch3: %{name}-2.5.2-init.patch +Patch4: Firebird-2.5.2.26539-0-fix-bashisms.patch Patch5: %{name}-2.5.1-disable.patch Patch6: %{name}-2.5.1-config.patch Patch7: %{name}-2.5.2-pkgconfig.patch @@ -76,6 +77,7 @@ %patch1 %patch2 -p1 %patch3 +%patch4 -p1 %patch5 %patch6 %patch7 ++++++ Firebird-2.5.2.26539-0-fix-bashisms.patch ++++++ diff -Ndur Firebird-2.5.2.26539-0/builds/install/arch-specific/aix/misc/aixLibrary.sh.in Firebird-2.5.2.26539-0-fix-bashisms/builds/install/arch-specific/aix/misc/aixLibrary.sh.in --- Firebird-2.5.2.26539-0/builds/install/arch-specific/aix/misc/aixLibrary.sh.in 2012-11-01 11:30:52.000000000 +0200 +++ Firebird-2.5.2.26539-0-fix-bashisms/builds/install/arch-specific/aix/misc/aixLibrary.sh.in 2014-11-17 03:24:44.577260996 +0200 @@ -104,7 +104,7 @@ generateNewDBAPassword() { # openssl generates random data. - openssl </dev/null >/dev/null 2&>/dev/null + openssl </dev/null >/dev/null 2>/dev/null if [ $? -eq 0 ] then # We generate 20 random chars, strip any '/''s and get the first 8 diff -Ndur Firebird-2.5.2.26539-0/builds/install/arch-specific/freebsd/freebsdLibrary.sh.in Firebird-2.5.2.26539-0-fix-bashisms/builds/install/arch-specific/freebsd/freebsdLibrary.sh.in --- Firebird-2.5.2.26539-0/builds/install/arch-specific/freebsd/freebsdLibrary.sh.in 2012-11-01 11:30:57.000000000 +0200 +++ Firebird-2.5.2.26539-0-fix-bashisms/builds/install/arch-specific/freebsd/freebsdLibrary.sh.in 2014-11-17 03:24:37.314261488 +0200 @@ -128,7 +128,7 @@ generateNewDBAPassword() { # openssl generates random data. - openssl </dev/null >/dev/null 2&>/dev/null + openssl </dev/null >/dev/null 2>/dev/null if [ $? -eq 0 ] then # We generate 20 random chars, strip any '/''s and get the first 8 diff -Ndur Firebird-2.5.2.26539-0/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in Firebird-2.5.2.26539-0-fix-bashisms/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in --- Firebird-2.5.2.26539-0/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in 2012-11-01 11:30:51.000000000 +0200 +++ Firebird-2.5.2.26539-0-fix-bashisms/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in 2014-11-17 03:24:51.836260505 +0200 @@ -183,7 +183,7 @@ generateNewDBAPassword() { # openssl generates random data. - openssl </dev/null >/dev/null 2&>/dev/null + openssl </dev/null >/dev/null 2>/dev/null if [ $? -eq 0 ] then # We generate 20 random chars, strip any '/''s and get the first 8 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireless-regdb for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package wireless-regdb for openSUSE:Factory checked in at 2014-11-26 10:32:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireless-regdb (Old) and /work/SRC/openSUSE:Factory/.wireless-regdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireless-regdb" Changes: -------- --- /work/SRC/openSUSE:Factory/wireless-regdb/wireless-regdb.changes 2014-09-10 07:28:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wireless-regdb.new/wireless-regdb.changes 2014-11-26 10:32:36.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 16 14:22:05 UTC 2014 - crrodriguez(a)opensuse.org + +- Update 2014.10.07 + +------------------------------------------------------------------- Old: ---- wireless-regdb-2014.06.13.tar.xz New: ---- wireless-regdb-2014.10.07.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireless-regdb.spec ++++++ --- /var/tmp/diff_new_pack.7ntx1o/_old 2014-11-26 10:32:37.000000000 +0100 +++ /var/tmp/diff_new_pack.7ntx1o/_new 2014-11-26 10:32:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: wireless-regdb -Version: 2014.06.13 +Version: 2014.10.07 Release: 0 Summary: 802.11 regulatory domain database License: ISC ++++++ wireless-regdb-2014.06.13.tar.xz -> wireless-regdb-2014.10.07.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2014.06.13/db.txt new/wireless-regdb-2014.10.07/db.txt --- old/wireless-regdb-2014.06.13/db.txt 2014-06-13 21:08:55.000000000 +0200 +++ new/wireless-regdb-2014.10.07/db.txt 2014-10-07 21:36:16.000000000 +0200 @@ -18,6 +18,10 @@ country AD: + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57240 - 65880 @ 2160), (40), NO-OUTDOOR @@ -34,6 +38,14 @@ (5250 - 5330 @ 80), (20), DFS (5490 - 5710 @ 80), (27), DFS +# Source: +# http://pucanguilla.org/Downloads/January2005-Anguilla%20Table%20of%20Alloca… +country AI: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS + country AL: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20.00) @@ -130,10 +142,11 @@ (5250 - 5330 @ 80), (20), DFS (5735 - 5835 @ 80), (20) -country BL: +country BL: DFS-ETSI (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 40), (18) - (5250 - 5330 @ 40), (18), DFS + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS country BN: DFS-JP (2402 - 2482 @ 40), (20) @@ -142,7 +155,8 @@ (5735 - 5835 @ 80), (20) country BO: DFS-JP - (2402 - 2482 @ 40), (30) + (2402 - 2482 @ 40), (20) + (5250 - 5330 @ 80), (30), DFS (5735 - 5835 @ 80), (30) country BR: DFS-FCC @@ -284,6 +298,14 @@ # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57240 - 65880 @ 2160), (40), NO-OUTDOOR +# Source: +# http://www.ntrcdom.org/index.php?option=com_content&view=category&layout=bl… +country DM: DFS-FCC + (2402 - 2472 @ 40), (30) + (5170 - 5250 @ 80), (17) + (5250 - 5330 @ 80), (23), DFS + (5735 - 5835 @ 80), (30) + country DO: DFS-FCC (2402 - 2472 @ 40), (30) (5170 - 5250 @ 80), (17) @@ -316,9 +338,16 @@ (5170 - 5250 @ 80), (20) (5250 - 5330 @ 80), (20), DFS +# Orden IET/787/2013, de 25 de abril, por la que se aprueba +# el cuadro nacional de atribución de frecuencias. +# http://www.boe.es/diario_boe/txt.php?id=BOE-A-2013-4845 +# +# more info at "Cuadro nacional de atribución de frecuencias (CNAF)": +# http://www.minetur.gob.es/telecomunicaciones/espectro/paginas/cnaf.aspx + country ES: DFS-ETSI (2400 - 2483.5 @ 40), (100 mW) - (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR + (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS (5470 - 5725 @ 80), (500 mW), DFS # 60 gHz band channels 1-4, ref: Etsi En 302 567 @@ -521,6 +550,15 @@ (5250 - 5330 @ 80), (20), DFS (5490 - 5710 @ 80), (27), DFS +# Source +# http://ntrc.kn/?page_id=7 +country KN: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (30), DFS + (5735 - 5815 @ 80), (30) + country KP: DFS-JP (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20) @@ -533,7 +571,7 @@ (5170 - 5250 @ 80), (20) (5250 - 5330 @ 80), (20), DFS (5490 - 5710 @ 80), (30), DFS - (5735 - 5815 @ 80), (30) + (5735 - 5835 @ 80), (30) country KW: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -550,6 +588,15 @@ (5490 - 5730 @ 80), (24), DFS (5735 - 5835 @ 80), (30) +# Source: +# http://www.ntrc.org.lc/operational_structures.htm +country LC: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (30), DFS + (5735 - 5815 @ 80), (30) + country LI: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20) @@ -563,6 +610,14 @@ (5490 - 5730 @ 80), (24), DFS (5735 - 5835 @ 80), (30) +# Source: +# http://lca.org.ls/images/documents/lesotho_national_frequency_allocation_pl… +country LS: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS + country LT: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20) @@ -599,6 +654,14 @@ (5250 - 5330 @ 80), (20), DFS # Source: +# http://www.cnfr.md/index.php?pag=sec&id=117&l=en +country MD: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS + +# Source: # http://www.cept.org/files/1050/Tools%20and%20Services/EFIS%20-%20ECO%20Freq… country ME: DFS-ETSI (2402 - 2482 @ 40), (20) @@ -606,12 +669,25 @@ (5250 - 5330 @ 80), (20), DFS (5490 - 5710 @ 80), (27), DFS +country MF: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS + country MO: (2402 - 2482 @ 40), (20) (5170 - 5250 @ 40), (23) (5250 - 5330 @ 40), (23), DFS (5735 - 5835 @ 40), (30) +country MH: DFS-FCC + (2402 - 2472 @ 40), (30) + (5170 - 5250 @ 80), (24) + (5250 - 5330 @ 80), (24), DFS + (5490 - 5730 @ 80), (24), DFS + (5735 - 5835 @ 80), (30) + country MK: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20) @@ -730,6 +806,12 @@ # 60 gHz band channels 1-4, ref: Etsi En 302 567 (57240 - 65880 @ 2160), (40), NO-OUTDOOR +country PM: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS + country PT: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20) @@ -843,6 +925,15 @@ country SY: (2402 - 2482 @ 40), (20) +# Source: +# http://www.telecommission.tc/Spectrum-plan20110324-101210.html +country TC: DFS-FCC + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (24) + (5250 - 5330 @ 80), (24), DFS + (5490 - 5730 @ 80), (24), DFS + (5735 - 5835 @ 80), (30) + country TD: DFS-ETSI (2402 - 2482 @ 40), (20) (5170 - 5250 @ 80), (20) @@ -929,6 +1020,14 @@ (5250 - 5330 @ 80), (20), DFS # Source: +# http://www.ntrc.vc/regulations/Jun_2006_Spectrum_Managment_Regulations.pdf +country VC: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS + +# Source: # Official Gazette (Gaceta Oficial) concerning Unlicensed transmitter use # (10 June 2013) # http://www.conatel.gob.ve/ @@ -954,6 +1053,12 @@ (5490 - 5730 @ 80), (24), DFS (5735 - 5835 @ 80), (30) +country WF: DFS-ETSI + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20) + (5250 - 5330 @ 80), (20), DFS + (5490 - 5710 @ 80), (27), DFS + country YE: (2402 - 2482 @ 40), (20) Files old/wireless-regdb-2014.06.13/regulatory.bin and new/wireless-regdb-2014.10.07/regulatory.bin differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wireless-regdb-2014.06.13/sha1sum.txt new/wireless-regdb-2014.10.07/sha1sum.txt --- old/wireless-regdb-2014.06.13/sha1sum.txt 2014-06-13 21:08:55.000000000 +0200 +++ new/wireless-regdb-2014.10.07/sha1sum.txt 2014-10-07 21:36:16.000000000 +0200 @@ -1 +1 @@ -b69cb715febf25a871405767e2bcd827387398dd db.txt +26c9471d94665085a636094ecec257d14aa236a7 db.txt -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0