March 2015 - openSUSE Commits - openSUSE Mailing Lists

commit rpm for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '15

01 Mar '15

Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2015-03-01 14:45:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpm" Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2015-01-30 06:02:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2015-03-01 14:45:35.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Feb 27 12:21:40 UTC 2015 - coolo(a)suse.com + +- apply db.diff from the subdir to avoid patching through a symlink + (to please new patch) +- comment gcc-PIE for now + +------------------------------------------------------------------- +Fri Feb 20 12:26:17 UTC 2015 - meissner(a)suse.com + +- add gcc-PIE to requires of rpm-build to make PIE building + default. bsc#912298 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-rpm.spec ++++++ --- /var/tmp/diff_new_pack.dVEFHX/_old 2015-03-01 14:45:38.000000000 +0100 +++ /var/tmp/diff_new_pack.dVEFHX/_new 2015-03-01 14:45:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-rpm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.dVEFHX/_old 2015-03-01 14:45:38.000000000 +0100 +++ /var/tmp/diff_new_pack.dVEFHX/_new 2015-03-01 14:45:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -176,6 +176,7 @@ Requires: findutils Requires: gawk Requires: gcc +#Requires: gcc-PIE Requires: gettext-tools Requires: glibc-devel Requires: glibc-locale @@ -206,10 +207,13 @@ tar xjf %{SOURCE10} tar xjf %{SOURCE11} ln -s db-4.8.30 db +cd db +%patch2 -p1 +cd .. ln -s beecrypt-4.1.2 beecrypt chmod -R u+w db/* rm -f rpmdb/db.h -%patch -P 1 -P 2 +%patch -P 1 %patch3 -p1 %patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patch for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '15

01 Mar '15

Hello community, here is the log from the commit of package patch for openSUSE:Factory checked in at 2015-03-01 14:45:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patch (Old) and /work/SRC/openSUSE:Factory/.patch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patch" Changes: -------- --- /work/SRC/openSUSE:Factory/patch/patch.changes 2014-11-24 11:08:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.patch.new/patch.changes 2015-03-01 14:45:28.000000000 +0100 @@ -1,0 +2,41 @@ +Mon Feb 16 11:51:58 CET 2015 - jdelvare(a)suse.de + +- patch 2.7.4 + Fixes a functional regression introduced by the previous security + fix. The security fix would forbid legitimate use cases of + relative symbolic links. + [boo#918058] + + Allow arbitrary symlink targets again. + + Do not change permissions if there isn't an explicit mode + change. + + Fix indentation heuristic for context diffs. +- Please also note that the previous update fixed security bugs + boo#915328 and boo#915329 even though it did not say so. + +------------------------------------------------------------------- +Fri Jan 23 00:58:35 UTC 2015 - andreas.stieger(a)gmx.de + +- patch 2.7.3 + Contains a security fix for a directory traversal flaw when + handling git-style patches. This could allow an attacker to + overwrite arbitrary files by applying a specially crafted patch. + [boo#913678] [CVE-2015-1196] + + With git-style patches, symlinks that point outside the working + directory will no longer be created (CVE-2015-1196). + + When a file isn't being deleted because the file contents don't + match the patch, the resulting message is now "Not deleting + file ... as content differs from patch" instead of "File ... + is not empty after patch; not deleting". + + Function names in hunks (from diff -p) are now preserved in + reject files + This change was previously added as a patch. [boo#904519] +- Version 2.7.2 differed from the above only slightly. +- packaging changes: + + Verify source signatures + + Removed patches now upstream: + * error-report-crash.patch + * reject-print-function-01-drop-useless-test.patch + * reject-print-function-02-handle-unified-format.patch + + run spec-cleaner + +------------------------------------------------------------------- Old: ---- error-report-crash.patch patch-2.7.1.tar.bz2 reject-print-function-01-drop-useless-test.patch reject-print-function-02-handle-unified-format.patch New: ---- patch-2.7.4.tar.bz2 patch-2.7.4.tar.bz2.sig patch.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patch.spec ++++++ --- /var/tmp/diff_new_pack.yV58dr/_old 2015-03-01 14:45:30.000000000 +0100 +++ /var/tmp/diff_new_pack.yV58dr/_new 2015-03-01 14:45:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package patch # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,55 +16,43 @@ # -Url: http://ftp.gnu.org/gnu/patch/ - Name: patch -# See bnc#662957. The fix for CVE-2010-4651 breaks the way interdiff was -# invoking patch, so interdiff had to be fixed too. -Conflicts: patchutils < 0.3.2 -Version: 2.7.1 +Version: 2.7.4 Release: 0 Summary: GNU patch License: GPL-3.0+ Group: Productivity/Text/Utilities -Source: http://ftp.gnu.org/gnu/patch/patch-%version.tar.bz2 -Patch: error-report-crash.patch -Patch1: reject-print-function-01-drop-useless-test.patch -Patch2: reject-print-function-02-handle-unified-format.patch +Url: http://ftp.gnu.org/gnu/patch/ +Source: http://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.bz2 +Source2: http://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.bz2.sig +Source3: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=patch&download… BuildRoot: %{_tmppath}/%{name}-%{version}-build +# See bnc#662957. The fix for CVE-2010-4651 breaks the way interdiff was +# invoking patch, so interdiff had to be fixed too. +Conflicts: patchutils < 0.3.2 %description The GNU patch program is used to apply diffs between original and changed files (generated by the diff command) to the original files. - - -Authors: --------- - Larry Wall - Paul Eggert - %prep %setup -q -%patch -p1 -%patch1 -p1 -%patch2 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" -%configure --prefix=%{_prefix} +export CFLAGS="%{optflags} -Wall -O2 -pipe" +%configure make %{?_smp_mflags} %{verbose:V=1}; %check -make check %{verbose:V=1} +make %{?_smp_mflags} check %{verbose:V=1} %install -make install DESTDIR=$RPM_BUILD_ROOT %{verbose:V=1} +make install DESTDIR=%{buildroot} %{verbose:V=1} %files %defattr(-,root,root) %doc NEWS README -/usr/bin/patch +%{_bindir}/patch %doc %{_mandir}/man1/patch.1.gz %changelog ++++++ patch-2.7.1.tar.bz2 -> patch-2.7.4.tar.bz2 ++++++ ++++ 41475 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 star for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Mar '15

01 Mar '15

Hello community, here is the log from the commit of package star for openSUSE:13.1:Update checked in at 2015-03-01 13:27:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/star (Old) and /work/SRC/openSUSE:13.1:Update/.star.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "star" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.0YOKUf/_old 2015-03-01 13:27:14.000000000 +0100 +++ /var/tmp/diff_new_pack.0YOKUf/_new 2015-03-01 13:27:14.000000000 +0100 @@ -1 +1 @@ -<link package='star.2878' cicount='copy' /> +<link package='star.3556' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit star.3556 for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Mar '15

01 Mar '15

Hello community, here is the log from the commit of package star.3556 for openSUSE:13.1:Update checked in at 2015-03-01 13:27:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/star.3556 (Old) and /work/SRC/openSUSE:13.1:Update/.star.3556.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "star.3556" Changes: -------- New Changes file: --- /dev/null 2015-02-28 12:43:00.252025756 +0100 +++ /work/SRC/openSUSE:13.1:Update/.star.3556.new/star.changes 2015-03-01 13:27:11.000000000 +0100 @@ -0,0 +1,321 @@ +------------------------------------------------------------------- +Thu Feb 19 15:55:09 UTC 2015 - kstreitova(a)suse.com + +- add patch star-1.5-content_to_stderr.patch to fix situation when + star outputs contents of an archive to stderr instead of stdout + (bnc#918021). + +------------------------------------------------------------------- +Fri Jun 13 13:08:58 UTC 2014 - vdziewiecki(a)suse.com + +-fix bnc#858660 - star does not detect gzip failures: + bnc#858660_detect_gzip_failures.patch +-The return code of gzip was lost in the way star calls gzip. +star returned zero regardless of errors reported during the gzip +operation. + +------------------------------------------------------------------- +Sun Jun 16 23:59:28 UTC 2013 - jengelh(a)inai.de + +- Explicitly list libattr-devel as BuildRequires +- Remove redundant %clean section. + +------------------------------------------------------------------- +Wed Mar 20 10:49:11 UTC 2013 - schwab(a)suse.de + +- Port baroque configuration system to aarch64 + +------------------------------------------------------------------- +Tue Jun 19 14:29:48 UTC 2012 - cfarrell(a)suse.com + +- license update: CDDL-1.0 + SPDX format + +------------------------------------------------------------------- +Wed Jan 4 15:47:36 CET 2012 - meissner(a)suse.de + +- for ppc64, we need to do the stuff that suse_update_config did. + +------------------------------------------------------------------- +Wed Dec 21 13:40:32 UTC 2011 - coolo(a)suse.com + +- add autoconf as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Wed Dec 21 10:31:49 UTC 2011 - coolo(a)suse.com + +- remove call to suse_update_config (very old work around) + +------------------------------------------------------------------- +Fri Sep 30 14:11:20 UTC 2011 - agraf(a)novell.com + +- fix build on armv7 + +------------------------------------------------------------------- +Wed Jul 28 14:39:29 UTC 2010 - puzel(a)novell.com + +- star-1.5.1-bufferoverflow.patch (bnc#625527) + +------------------------------------------------------------------- +Mon Jun 8 00:16:00 CEST 2009 - ro(a)suse.de + +- rename getline to my_getline to avoid collision with function + from glibc +- rename fexecve to my_fexecve to avoid collision with function + from glibc + +------------------------------------------------------------------- +Tue Mar 10 17:34:47 CET 2009 - werner(a)suse.de + +- Set read lock before using the semaphore wait on a pipe fd + to avoid deadlock (bnc#414251) + +------------------------------------------------------------------- +Wed Aug 20 15:20:06 CEST 2008 - mkoenig(a)suse.de + +- enable SELinux support [fate#303662] + +------------------------------------------------------------------- +Tue Apr 29 15:23:56 CEST 2008 - mkoenig(a)suse.de + +- set version to 1.5final to avoid update problem with previous + version number 1.5a70. + +------------------------------------------------------------------- +Mon Apr 28 16:17:51 CEST 2008 - skh(a)suse.de + +- update to version 1.5 final (see Changelog in package documentation + for all changes) +- remove patch star-CVE-2007-4134.patch (is upstream now) +- don't build with -D_GNU_SOURCE + +------------------------------------------------------------------- +Fri Aug 31 14:59:09 CEST 2007 - mkoenig(a)suse.de + +- fix directory traversal vulnerability CVE-2007-4134 [#302489] + +------------------------------------------------------------------- +Mon Sep 11 12:37:53 CEST 2006 - jw(a)suse.de + +- remove unused GPL code. Fixing #134113 + +------------------------------------------------------------------- +Wed May 10 19:52:36 CEST 2006 - mmj(a)suse.de + +- compile with RPM_OPT_FLAGS [#170464] + +------------------------------------------------------------------- +Wed Jan 25 21:41:49 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Dec 20 17:06:13 CET 2005 - mmj(a)suse.de + +- update to 1.5a70 + o null.diff is upstream + +------------------------------------------------------------------- +Fri Dec 9 10:00:33 CET 2005 - ro(a)suse.de + +- disable selinux + +------------------------------------------------------------------- +Tue Nov 22 13:01:50 CET 2005 - mmj(a)suse.de + +- ustar should link to star [#134107] + +------------------------------------------------------------------- +Tue Nov 15 16:07:43 CET 2005 - uli(a)suse.de + +- link armv4l build rules to armv5tel (aka QEMU) + +------------------------------------------------------------------- +Mon Jul 25 16:42:07 CEST 2005 - nadvornik(a)suse.cz + +- install symlink /etc/rmt -> /sbin/rmt +- provide rmt + +------------------------------------------------------------------- +Thu Jul 21 12:56:39 CEST 2005 - mmj(a)suse.de + +- Disable fsync again [#97500] +- Enable null.diff + +------------------------------------------------------------------- +Wed Jul 20 11:56:08 CEST 2005 - mmj(a)suse.de + +- Move rmt to /sbin [#97266] + +------------------------------------------------------------------- +Tue Jun 28 12:13:53 CEST 2005 - agruen(a)suse.de + +- null.diff: Add -null option to star (patch from Bj�rn Jacke). + +------------------------------------------------------------------- +Fri Feb 18 18:13:50 CET 2005 - agruen(a)suse.de + +- The new version also needs e2fsprogs-devel for some defines. + +------------------------------------------------------------------- +Wed Feb 16 22:28:27 CET 2005 - agruen(a)suse.de + +- star-acl-fix.diff: Drop this patch: it contains a bug (#50874) + and nothing else that would be useful. + +------------------------------------------------------------------- +Wed Feb 16 18:24:17 CET 2005 - agruen(a)suse.de + +- Update to version 1.5a58-pre2. + +------------------------------------------------------------------- +Wed Feb 16 11:00:51 CET 2005 - agruen(a)suse.de + +- Add support for the ext3 'j' flag (per-file data journaling). + +------------------------------------------------------------------- +Wed Aug 11 12:55:45 CEST 2004 - mmj(a)suse.de + +- Update to star-1.5a44 + +------------------------------------------------------------------- +Fri Jul 9 14:03:07 CEST 2004 - mmj(a)suse.de + +- Update to star-1.5a41 and move stuff from %prep to %build + +------------------------------------------------------------------- +Mon Mar 15 16:46:10 CET 2004 - kukuk(a)suse.de + +- Add SELinux support + +------------------------------------------------------------------- +Fri Mar 5 11:46:58 CET 2004 - mmj(a)suse.de + +- Fix testsuite + +------------------------------------------------------------------- +Thu Mar 4 20:04:50 CET 2004 - mmj(a)suse.de ++++ 124 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.star.3556.new/star.changes New: ---- README-FIRST bnc#858660_detect_gzip_failures.patch rmt-move.diff star-1.5-content_to_stderr.patch star-1.5.1-bufferoverflow.patch star-1.5.tar.bz2 star-configuration.diff star-fexecve.diff star-getline.diff star-lock.diff star-no_fsync.diff star-selinux.patch star.changes star.spec tests.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ star.spec ++++++ # # spec file for package star # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: star Version: 1.5final Release: 0 %define upver 1.5 Summary: POSIX.1-2001-Compliant Tar Implementation License: CDDL-1.0 Group: Productivity/Archiving/Backup Url: http://cdrecord.berlios.de/old/private/star.html Source: ftp://ftp.berlios.de/pub/star/alpha/star-%{upver}.tar.bz2 Source1: README-FIRST Source2: tests.tar.bz2 Patch0: star-configuration.diff Patch2: star-no_fsync.diff Patch5: rmt-move.diff Patch6: star-selinux.patch Patch7: star-lock.diff Patch8: star-getline.diff Patch9: star-fexecve.diff Patch10: star-1.5.1-bufferoverflow.patch #PATCH_FIX_OPENSUSE_BNC#858660 Patch11: bnc#858660_detect_gzip_failures.patch # PATCH-FIX-UPSTREAM bnc#918021 kstreitova(a)suse.com -- fix a wrong outputting of an archive content to stderr instead of stdout Patch12: star-1.5-content_to_stderr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: e2fsprogs-devel BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: libselinux-devel %ifarch aarch64 ppc64 BuildRequires: libtool %endif Provides: rmt %description Star is a tar like archiver. TAR stands for Tape ARchiver. Star is the fastest known implementation of a tar archiver. Features: - FIFO to keep the tape streaming. - remote tape support. - accurate sparse files (if the OS supports it). - pattern matcher to archive and extract a subset of files. - user tailorable interface for comparing tar archives against file trees. - path names up to 1024 Bytes may be archived. - stores and restores all 3 file times (even creation time). With POSIX.1-2001 the times are in nanosecond granularity. Authors: -------- Joerg Schilling <schilling(a)fokus.gmd.de> %prep #%setup -b 2 -n tests #%setup -b 0 -n star-1.5 %setup -q -T -b 2 -n tests -b 0 -n star-1.5 %patch0 -p1 %patch2 -p1 %patch5 -p1 %patch6 %patch7 %patch8 %patch9 %patch10 -p1 %patch11 -p1 %patch12 -p1 %build # bugzilla#134113: incompatible license and unused: SKH: removed # upstream # rm include/unls.h # Autoconf does not handle inline comments correctly: Split comments and # variables into separate lines. mv conf/xconfig.h.in conf/xconfig.h.in.orig sed -e 's|$#.*$$/\*.*\*/$|\2\n\1|g' \ conf/xconfig.h.in.orig >conf/xconfig.h.in #ln -sf i586-linux-gcc.rul RULES/i586-linux-cc.rul #ln -s i586-linux-cc.rul RULES/x86_64-linux-cc.rul ln -s i586-linux-cc.rul RULES/s390x-linux-cc.rul ln -s i586-linux-cc.rul RULES/ppc64-linux-cc.rul #ln -s i586-linux-gcc.rul RULES/x86_64-linux-gcc.rul ln -s i586-linux-gcc.rul RULES/s390x-linux-gcc.rul ln -s i586-linux-gcc.rul RULES/ppc64-linux-gcc.rul ln -s armv4l-linux-gcc.rul RULES/armv5tel-linux-gcc.rul ln -s armv4l-linux-gcc.rul RULES/armv7l-linux-gcc.rul ln -s i586-linux-gcc.rul RULES/aarch64-linux-gcc.rul cd conf %ifarch aarch64 ppc64 cp /usr/share/libtool/config/config.* . %endif autoconf %define star_cflags $RPM_OPT_FLAGS -g -W -Wall -Wpointer-arith -Wformat-security cp %{SOURCE1} . make all MAKEPROG=gmake MANDIR=share/man COPTX="%{star_cflags}" CPPOPTX="-DNO_FSYNC" %install make install MAKEPROG=gmake INS_BASE=$RPM_BUILD_ROOT/usr MANDIR=share/man \ COPTX="%{star_cflags}" CPPOPTX="-DNO_FSYNC" mkdir -p $RPM_BUILD_ROOT/etc/default mkdir $RPM_BUILD_ROOT/sbin install -m 644 rmt/rmt.dfl $RPM_BUILD_ROOT/etc/default/rmt mv $RPM_BUILD_ROOT/usr/etc/default/{rmt,star} $RPM_BUILD_ROOT/etc/default #mv $RPM_BUILD_ROOT/usr/bin/star_fat $RPM_BUILD_ROOT/usr/bin/star mkdir -p $RPM_BUILD_ROOT/%{_docdir}/{star,rmt} mv $RPM_BUILD_ROOT/usr/share/doc/star/* $RPM_BUILD_ROOT/%{_docdir}/star mv $RPM_BUILD_ROOT/usr/share/doc/rmt/* $RPM_BUILD_ROOT/%{_docdir}/rmt # if we put these as files-to-install in %doc in the filelist, docdir is # deleted and recreated. it's either all in %install or all in %files install AN* BUILD COMPILE INSTALL PORTING README Changelog CDDL.Schily.txt CDDL.Sun.txt README.* TODO $RPM_BUILD_ROOT/%{_docdir}/star/ rm -f $RPM_BUILD_ROOT/usr/bin/ustar rm -f $RPM_BUILD_ROOT/usr/bin/tar ln -sf ./star $RPM_BUILD_ROOT/usr/bin/ustar rm -rf $RPM_BUILD_ROOT/%{_prefix}/{lib,include,bin/mt} \ $RPM_BUILD_ROOT%{_mandir}/man[35] \ $RPM_BUILD_ROOT%{_mandir}/man1/{gnutar,scpio,smt,spax,suntar}.1 \ $RPM_BUILD_ROOT/usr/bin/{spax,gnutar,scpio,suntar,star_sym} # Run test suite? ( [ -r /proc/config.gz ] \ && eval "$(zcat /proc/config.gz \ | sed -e 's/^# $.*$ is not set/\1=n/')" if [ "$CONFIG_EXT2_FS" == y -a \ "$CONFIG_EXT2_FS_POSIX_ACL" == y -a \ "$CONFIG_EXT2_FS_XATTR_USER" == y ] ; then cd %_builddir/tests export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make else echo "Test suite skipped: requires a kernel with the " \ "CONFIG_EXT2_FS_POSIX_ACL and CONFIG_EXT2_FS_XATTR_USER features." fi ) mv $RPM_BUILD_ROOT/usr/sbin/rmt $RPM_BUILD_ROOT/sbin ln -sf ../sbin/rmt $RPM_BUILD_ROOT/etc/rmt %files %defattr(-, root, root) %dir %{_docdir}/star %docdir %{_docdir}/star %attr(644,root,root) %{_docdir}/star/* %dir %{_docdir}/rmt %docdir %{_docdir}/rmt %attr(644,root,root) %{_docdir}/rmt/* %config(noreplace) %attr(644, root, root) /etc/default/rmt %config(noreplace) %attr(644, root, root) /etc/default/star /usr/bin/smt /usr/bin/star /usr/bin/ustar /usr/bin/tartest /sbin/rmt /etc/rmt /usr/share/man/man1/match.1.gz /usr/share/man/man1/rmt.1.gz /usr/share/man/man1/star.1.gz /usr/share/man/man1/tartest.1.gz %changelog ++++++ README-FIRST ++++++ For an english version see below. Wenn sie das Programm rmt aus diesem Paket benutzen wollen, m�ssen Sie die Konfiguration in /etc/default/rmt anpassen. Standardm�ssig ist niemandem die Benutzung von rmt gestattet (Eintrag USER) und das einzig Ger�t, auf welches zugegriffen werden kann ist /dev/null (Eintrag ACCESS). Es empfiehlt sich, einen Benutzer anzulegen, der direkt rmt startet. Setzen Sie f�r diesen Benutzer die Shell auf /usr/sbin/rmt. Ausserdem sollten Sie alle Benutzer, die �ber das Netz auf diesen Account zugreifen d�rfen, in die die Datei .rhosts im Homeverzeichnis des obigen Benutzers eintragen. Diesen Benutzer k�nnen Sie entweder �ber YaST2 oder mittels useradd anlegen. Ein Beispiel f�r die verwendung von useradd w�re: useradd -c "Remote TAPE" -G bin -s /usr/sbin/rmt rtape Nachdem Sie diesen Benutzer angelegt haben, sollten Sie ihn in /etc/default/rmt eintragen. --------------------------------------------------------------------------- If you want to use rmt from this package, you have to edit /etc/default/rmt to configure it. By default, nobody is allowed to run mt (entry USER) and the only visible target (entry ACCESS) is the null device. If you would like to have an account to directly access rmt, you will have to create one yourself, setting the default shell to /usr/sbin/rmt. Please don't forget to add entries to .rhosts in the home directory of said account for all remote users that are allowed to use this account. The creation of this account may be done either via YaST2 or via useradd. An example for using useradd would be: useradd -c "Remote TAPE" -G bin -s /usr/sbin/rmt rtape After creating this account, you have to add this user to /etc/default/rmt. ++++++ bnc#858660_detect_gzip_failures.patch ++++++ Index: star-1.5/star/buffer.c =================================================================== --- star-1.5.orig/star/buffer.c +++ star-1.5/star/buffer.c @@ -37,6 +37,8 @@ static char sccsid[] = #endif #include <stdio.h> +#include <sys/types.h> +#include <sys/wait.h> #include <schily/stdlib.h> #include <schily/unistd.h> #include <schily/libport.h> /* getpagesize() */ @@ -1731,6 +1733,10 @@ checkerrs() errmsgno(EX_BAD, "Problems with restore database.\n"); return (TRUE); } + if (xstats.s_comprerrs > 0) { + errmsgno(EX_BAD, "Compress program returned error[%d].\n", xstats.s_comprerrs); + return (TRUE); + } return (FALSE); } @@ -1806,6 +1812,16 @@ die(err) excomerrno(err, "Cannot recover from error - exiting.\n"); } +void sigchld_handler(int sig) +{ + int status; + pid_t pid; + while ((pid = wait4(compresspid, &status, 0, NULL)) > 0) { + if (pid == compresspid) + xstats.s_comprerrs = WEXITSTATUS(status); + } + +} /* * Quick hack to implement a -z flag. May be changed soon. */ @@ -1821,6 +1837,8 @@ compressopen() int mypid; char *zip_prog = "gzip"; + compresspid = 0; + if (compress_prg) zip_prog = compress_prg; else if (bzflag) @@ -1880,6 +1898,7 @@ compressopen() #else if (fpipe(pp) == 0) comerr("Compress pipe failed\n"); + signal(SIGCHLD, sigchld_handler); mypid = fork(); if (mypid < 0) comerr("Compress fork failed\n"); @@ -1909,7 +1928,10 @@ compressopen() fexecl(zip_prog, tarf, pp[1], null, zip_prog, "-d", (char *)NULL); errmsg("Compress: exec of '%s' failed\n", zip_prog); _exit(-1); + } else { + compresspid = mypid; } + fclose(tarf); if (cflag) { tarf = pp[1]; Index: star-1.5/star/star.c =================================================================== --- star-1.5.orig/star/star.c +++ star-1.5/star/star.c @@ -112,6 +112,7 @@ char strvers[] = "1.5"; /* The pure ver char *vers; /* the full version string */ struct star_stats xstats; /* for printing statistics */ +pid_t compresspid = 0; extern BOOL havepat; /* Pattern matching in use */ Index: star-1.5/star/star.h =================================================================== --- star-1.5.orig/star/star.h +++ star-1.5/star/star.h @@ -823,9 +823,11 @@ struct star_stats { int s_setxattr; /* set xattr for file failed */ #endif int s_restore; /* other incremental restore specific */ + int s_comprerrs; /* errors of compress-subprogram */ }; extern struct star_stats xstats; +extern pid_t compresspid; /* pid of compress-subprogram child */ #include <schily/param.h> ++++++ rmt-move.diff ++++++ diff -Naur star-1.5.orig/rmt/rmt.1 star-1.5/rmt/rmt.1 --- star-1.5.orig/rmt/rmt.1 2008-04-28 15:53:41.000000000 +0200 +++ star-1.5/rmt/rmt.1 2008-04-28 15:55:03.000000000 +0200 @@ -20,7 +20,7 @@ .B /opt/schily/sbin/rmt .br .B /etc/rmt -.B /usr/sbin/rmt +.B /sbin/rmt .SH DESCRIPTION .IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server" ++++++ star-1.5-content_to_stderr.patch ++++++ Index: star-1.5/star/star_unix.c =================================================================== --- star-1.5.orig/star/star_unix.c +++ star-1.5/star/star_unix.c @@ -548,6 +548,7 @@ samefile(fp1, fp2) return (FALSE); if (fstat(fdown(fp1), &stbuf1) < 0) + return (FALSE); if (fstat(fdown(fp2), &stbuf2) < 0) return (FALSE); ++++++ star-1.5.1-bufferoverflow.patch ++++++ diff -urNp star-1.5.1-orig/star/longnames.c star-1.5.1/star/longnames.c --- star-1.5.1-orig/star/longnames.c 2009-10-16 00:38:55.000000000 +0200 +++ star-1.5.1/star/longnames.c 2010-02-03 13:36:03.000000000 +0100 @@ -155,7 +155,7 @@ name_to_tcb(info, ptb) if (add) strcatl(ptb->dbuf.t_name, name, "/", (char *)NULL); else - strcpy(ptb->dbuf.t_name, name); + strncpy(ptb->dbuf.t_name, name, props.pr_maxsname); return (TRUE); } ++++++ star-configuration.diff ++++++ diff -Naur star-1.5.orig/conf/configure.in star-1.5/conf/configure.in --- star-1.5.orig/conf/configure.in 2008-03-27 19:58:16.000000000 +0100 +++ star-1.5/conf/configure.in 2008-04-28 13:54:36.000000000 +0200 @@ -6,6 +6,8 @@ AC_CONFIG_HEADER(xconfig.h) AC_CANONICAL_HOST +AC_DEFINE(_GNU_SOURCE,,[Use GNU extensions on systems that provide them]) + dnl Checks for programs. AC_SHELL_BASH dnl CC=${CC-cc} diff -Naur star-1.5.orig/DEFAULTS/Defaults.linux star-1.5/DEFAULTS/Defaults.linux --- star-1.5.orig/DEFAULTS/Defaults.linux 2007-05-08 16:56:55.000000000 +0200 +++ star-1.5/DEFAULTS/Defaults.linux 2008-04-28 13:54:36.000000000 +0200 @@ -8,8 +8,7 @@ # Compiler stuff # ########################################################################### -DEFCCOM= cc -#DEFCCOM= gcc +DEFCCOM= gcc ########################################################################### # @@ -26,7 +25,7 @@ # If the next line is uncommented, compilation is done with minimal warnings # ########################################################################### -CWARNOPTS= +#CWARNOPTS= ########################################################################### # @@ -40,20 +39,20 @@ LINUX_SRC_INCLUDE= $(__LINUX_SRC_INCLUDE:$(_UNIQ)no%=%) DEFINCDIRS= $(SRCROOT)/include -LDPATH= -L/opt/schily/lib -RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +LDPATH= -L/usr/lib +RUNPATH= ########################################################################### # # Installation config stuff # ########################################################################### -INS_BASE= /opt/schily +INS_BASE= /usr INS_KBASE= / # DEFUMASK= 002 # -DEFINSMODEF= 444 +DEFINSMODEF= 644 DEFINSMODEX= 755 DEFINSUSR= bin DEFINSGRP= bin diff -Naur star-1.5.orig/include/schily/schily.h star-1.5/include/schily/schily.h --- star-1.5.orig/include/schily/schily.h 2008-02-16 16:32:01.000000000 +0100 +++ star-1.5/include/schily/schily.h 2008-04-28 14:13:10.000000000 +0200 @@ -238,7 +238,7 @@ #endif /*PRINTFLIKE1*/ -extern int error __PR((const char *, ...)) __printflike__(1, 2); +extern int error __PR((const char *, ...)); extern char *fillbytes __PR((void *, int, char)); extern char *findbytes __PR((const void *, int, char)); extern int findline __PR((const char *, char, const char *, diff -Naur star-1.5.orig/lib/fexec.c star-1.5/lib/fexec.c --- star-1.5.orig/lib/fexec.c 2007-07-01 12:04:35.000000000 +0200 +++ star-1.5/lib/fexec.c 2008-04-28 14:07:35.000000000 +0200 @@ -40,7 +40,6 @@ */ #if defined(HAVE_DUP) && (defined(HAVE_DUP2) || defined(F_DUPFD)) - #define MAX_F_ARGS 16 #if defined(IS_MACOS_X) && defined(HAVE_CRT_EXTERNS_H) diff -Naur star-1.5.orig/mt/Makefile star-1.5/mt/Makefile --- star-1.5.orig/mt/Makefile 2007-02-04 02:18:40.000000000 +0100 +++ star-1.5/mt/Makefile 2008-04-28 13:54:36.000000000 +0200 @@ -7,7 +7,7 @@ INSDIR= bin TARGET= smt -SYMLINKS= mt +#SYMLINKS= mt CPPOPTS += -DUSE_REMOTE CPPOPTS += -DSCHILY_PRINT diff -Naur star-1.5.orig/rmt/rmt.1 star-1.5/rmt/rmt.1 --- star-1.5.orig/rmt/rmt.1 2008-03-24 01:06:54.000000000 +0100 +++ star-1.5/rmt/rmt.1 2008-04-28 13:54:36.000000000 +0200 @@ -20,6 +20,7 @@ .B /opt/schily/sbin/rmt .br .B /etc/rmt +.B /usr/sbin/rmt .SH DESCRIPTION .IX "rmt command" "" "\fLrmt\fP \(em remote magnetic tape protocol server" diff -Naur star-1.5.orig/rmt/rmt.dfl star-1.5/rmt/rmt.dfl --- star-1.5.orig/rmt/rmt.dfl 2005-08-09 15:20:37.000000000 +0200 +++ star-1.5/rmt/rmt.dfl 2008-04-28 13:54:36.000000000 +0200 @@ -18,15 +18,13 @@ # Each USER= entry adds the listed user to the users who may run rmt # # A typical passwd entry looks like this: -# rtape:x:1999:1000:Remote TAPE:/export/home/rtape:/opt/schily/sbin/rmt +# rtape:x:1999:1000:Remote TAPE:/home/tape:/usr/sbin/rmt # -# Add entries for all valid remote users to /export/home/rtape/.rhosts +# Add entries for all valid remote users to /home/tape/.rhosts +# See /usr/share/doc/packages/star/README.SuSE # #USER=rtape -#USER=joerg -# Default to old SunOS behavior. If you like to be more restrictive, comment -# out the entry below and enable the explicit USER= entries above. -USER=* +#USER=* # # Each ACCESS= entry adds a target or group of targets to the list of visible @@ -44,7 +42,7 @@ # name name # #ACCESS=rtape sparky /dev/rmt/* -ACCESS=* * /dev/rmt/* +#ACCESS=* * /dev/rmt/* ACCESS=* * /dev/null -ACCESS=* * /dev/zero +#ACCESS=* * /dev/zero #ACCESS=* * * diff -Naur star-1.5.orig/RULES/cc-gcc64.rul star-1.5/RULES/cc-gcc64.rul --- star-1.5.orig/RULES/cc-gcc64.rul 2007-05-09 14:25:30.000000000 +0200 +++ star-1.5/RULES/cc-gcc64.rul 2008-04-28 13:54:36.000000000 +0200 @@ -26,9 +26,7 @@ CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) COPTS= -m64 # -Wtraditional now causes more pain than it helps -CWOPTS= -Wall -Wtraditional -CWOPTS= -Wall -Wno-unknown-pragmas \ - -Wshadow -Wmissing-prototypes -Wstrict-prototypes +CWOPTS= -Wall -Wstrict-prototypes -Wpointer-arith COPTOPT= -O COPTDYN= -fpic COPTGPROF= -pg diff -Naur star-1.5.orig/RULES/cc-gcc.rul star-1.5/RULES/cc-gcc.rul --- star-1.5.orig/RULES/cc-gcc.rul 2007-05-09 14:25:30.000000000 +0200 +++ star-1.5/RULES/cc-gcc.rul 2008-04-28 13:54:36.000000000 +0200 @@ -26,9 +26,7 @@ CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) COPTS= # -Wtraditional now causes more pain than it helps -CWOPTS= -Wall -Wtraditional -CWOPTS= -Wall -Wno-unknown-pragmas \ - -Wshadow -Wmissing-prototypes -Wstrict-prototypes +CWOPTS= -Wall -Wstrict-prototypes -Wpointer-arith COPTOPT= -O COPTDYN= -fpic COPTGPROF= -pg diff -Naur star-1.5.orig/RULES/rules.inc star-1.5/RULES/rules.inc --- star-1.5.orig/RULES/rules.inc 2007-05-06 14:50:26.000000000 +0200 +++ star-1.5/RULES/rules.inc 2008-04-28 14:01:23.000000000 +0200 @@ -44,7 +44,7 @@ $(LDCC) $(_LD_OUTPUT_OPTION) $(POFILES) $(LDFLAGS) $(LDLIBS) $(PTARGET): $(OINCSDIR) $(PTARGETCX) - @echo " ==> GENERATING include file \"$@\""; $(PTARGETC)$(_XEXEEXT) > $@ + @echo " ==> GENERATING include file \"$@\""; $(PTARGETC) > $@ ########################################################################### include $(SRCROOT)/$(RULESDIR)/sub.htm diff -Naur star-1.5.orig/RULES/rules.prg star-1.5/RULES/rules.prg --- star-1.5.orig/RULES/rules.prg 2006-07-07 11:42:38.000000000 +0200 +++ star-1.5/RULES/rules.prg 2008-04-28 13:54:36.000000000 +0200 @@ -89,7 +89,7 @@ #LEX= @echo " ==> LEXING \"$@\""; lex #AWK= @echo " ==> AWKING \"$@\""; awk RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; true -MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; makedepend +MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; gccmakedep MKDEP_OUT= -f - MKDIR= @echo " ==> MAKING DIRECTORY \"$@\""; $(UMASK); mkdir MKDIR_SH= @echo " ==> MAKING DIRECTORY \"$@\""; $(UMASK); sh $(SRCROOT)/conf/mkdir-sh ++++++ star-fexecve.diff ++++++ --- include/schily/schily.h +++ include/schily/schily.h @@ -113,7 +113,7 @@ /* 6th arg not const, fexecv forces av[ac] = NULL */ extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int, char **)); -extern int fexecve __PR((const char *, FILE *, FILE *, FILE *, +extern int my_fexecve __PR((const char *, FILE *, FILE *, FILE *, char * const *, char * const *)); extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *)); extern int fspawnl __PR((FILE *, FILE *, FILE *, --- lib/fexec.c +++ lib/fexec.c @@ -164,7 +164,7 @@ } while (p != NULL); va_end(args); - ret = fexecve(name, in, out, err, av, env); + ret = my_fexecve(name, in, out, err, av, env); if (av != xav) free(av); return (ret); @@ -178,11 +178,11 @@ char *av[]; { av[ac] = NULL; /* force list to be null terminated */ - return (fexecve(name, in, out, err, av, environ)); + return (my_fexecve(name, in, out, err, av, environ)); } EXPORT int -fexecve(name, in, out, err, av, env) +my_fexecve(name, in, out, err, av, env) const char *name; FILE *in, *out, *err; char * const av[], * const env[]; --- lib/libschily-mapvers +++ lib/libschily-mapvers @@ -77,7 +77,7 @@ fexecl; fexecle; fexecv; - fexecve; + my_fexecve; ffileread; ffilewrite; fgetline; --- libfind/find.c +++ libfind/find.c @@ -1730,7 +1730,7 @@ #endif av[ac] = NULL; /* -exec {} \; is not NULL terminated */ - fexecve(av[0], state->std[0], state->std[1], state->std[2], + my_fexecve(av[0], state->std[0], state->std[1], state->std[2], av, state->env); #ifdef PLUS_DEBUG error("argsize %d\n", ++++++ star-getline.diff ++++++ --- include/schily/schily.h +++ include/schily/schily.h @@ -243,7 +243,7 @@ extern char *findbytes __PR((const void *, int, char)); extern int findline __PR((const char *, char, const char *, int, char **, int)); -extern int getline __PR((char *, int)); +extern int my_getline __PR((char *, int)); extern int getstr __PR((char *, int)); extern int breakline __PR((char *, char, char **, int)); extern int getallargs __PR((int *, char * const**, const char *, ...)); --- lib/libschily-mapvers +++ lib/libschily-mapvers @@ -123,7 +123,7 @@ geterrno; getfiles; getfp; - getline; + my_getline; getmainfp; #getstr; #handlecond; --- lib/stdio/fgetline.c +++ lib/stdio/fgetline.c @@ -61,7 +61,7 @@ } EXPORT int -getline(buf, len) +my_getline(buf, len) char *buf; int len; { ++++++ star-lock.diff ++++++ --- star/fifo.c +++ star/fifo.c 2009-03-10 17:52:09.292002187 +0100 @@ -477,13 +477,42 @@ LOCAL int swait(f) int f; { - int ret; + int ret, err; unsigned char c; + struct flock lock; + useconds_t wait; + + wait = 500000; + lock.l_type = F_RDLCK; + lock.l_whence = SEEK_CUR; + lock.l_start = 0; + lock.l_len = 0; + do { + err = fcntl(f, F_SETLK, &lock); + if (err < 0) { + err = geterrno(); + if (err == EINTR) + continue; + if ((err == EACCES || err == EAGAIN) && (wait > 0)) { + usleep(10000); + wait -= 10000; + continue; + } + errmsg("Can not get lock on semaphore wait for file descriptor\n"); + exprstats(-1); + } + } while (0); seterrno(0); do { ret = read(f, &c, 1); } while (ret < 0 && geterrno() == EINTR); + + lock.l_type = F_UNLCK; + do { + err = fcntl(f, F_SETLK, &lock); + } while (err < 0 && geterrno() == EINTR); + if (ret < 0 || (ret == 0 && pid)) { /* * If pid != 0, this is the foreground process ++++++ star-no_fsync.diff ++++++ --- star-1.5/star/star.c +++ star-1.5/star/star.c @@ -182,7 +182,7 @@ BOOL silent = FALSE; /* -silent no informal msg */ BOOL prblockno = FALSE; /* -block-number for all files */ BOOL no_xheader = FALSE; /* -no-xheader ignore P.2001 */ -BOOL no_fsync = FALSE; /* -no-fsync on extract */ +BOOL no_fsync = TRUE; /* -no-fsync on extract */ BOOL readnull = FALSE; /* -read0 on with list= */ BOOL tpath = FALSE; /* -tpath print path only */ BOOL cflag = FALSE; /* -c has been specified */ ++++++ star-selinux.patch ++++++ --- conf/configure.in +++ conf/configure.in @@ -530,6 +530,15 @@ AC_SUBST(may_linux_src_include) +AC_CHECK_HEADERS(selinux/selinux.h) +if test "$ac_cv_header_selinux_selinux_h" = yes; then + AC_CHECKING(for SELinux support) + AC_CHECK_LIB(selinux, is_selinux_enabled, lib_selinux="-lselinux -lattr") + ac_save_LIBS="$LIBS" + LIBS="$LIBS $lib_selinux" + AC_CHECK_FUNCS(is_selinux_enabled) +fi + AC_SUBST(largefile_cc_opt) AC_SUBST(lib_crypt) @@ -545,5 +554,6 @@ AC_SUBST(lib_gen) AC_SUBST(lib_pthread) AC_SUBST(lib_rt) +AC_SUBST(lib_selinux) AC_OUTPUT(rules.cnf) --- conf/rules.cnf.in +++ conf/rules.cnf.in @@ -17,6 +17,7 @@ LIB_ACL= @lib_acl@ # Full (test/set) ACL users like star LIB_ACL_TEST= @lib_acl_test@ # Test only ACL users like libfind LIB_ATTR = @lib_attr@ +LIB_SELINUX = @lib_selinux@ LIB_SECDB = @lib_secdb@ LIB_GEN = @lib_gen@ LIB_PTHREAD = @lib_pthread@ --- star/Makefile +++ star/Makefile @@ -25,6 +25,7 @@ CPPOPTS += -DUSE_FIND CPPOPTS += -DUSE_ACL CPPOPTS += -DUSE_XATTR +CPPOPTS += -DWITH_SELINUX CPPOPTS += -DUSE_FFLAGS CPPOPTS += -DCOPY_LINKS_DELAYED CPPOPTS += -DSTAR_FAT @@ -48,7 +49,7 @@ #LIBS= -lunos #LIBS= -lschily -lc /usr/local/lib/gcc-gnulib -LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) +LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SELINUX) $(LIB_SOCKET) $(LIB_INTL) # # Wenn -lfind, dann auch $(LIB_INTL) # --- star/extract.c +++ star/extract.c @@ -238,6 +238,16 @@ if (prblockno) (void) tblocks(); /* set curblockno */ +#ifdef WITH_SELINUX + if (!to_stdout && selinux_enabled) { + if (setselinux(&finfo) == FALSE) { + errmsgno(EX_BAD, + "Can not setup security context for '%s'. Not created.\n", + finfo.f_name); + } + } +#endif + if (is_volhdr(&finfo)) { if (!get_volhdr(&finfo, vhname)) { excomerrno(EX_BAD, --- star/pax.mk +++ star/pax.mk @@ -18,6 +18,7 @@ CPPOPTS += -DUSE_FIND CPPOPTS += -DUSE_ACL CPPOPTS += -DUSE_XATTR +CPPOPTS += -DWITH_SELINUX CPPOPTS += -DUSE_FFLAGS CPPOPTS += -DPAX CPPOPTS += -DSCHILY_PRINT @@ -35,7 +36,7 @@ HFILES= star.h starsubs.h dirtime.h xtab.h xutimes.h \ movearch.h table.h props.h fifo.h diff.h \ checkerr.h dumpdate.h bitstring.h -LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) +LIBS= -ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SELINUX) $(LIB_SOCKET) $(LIB_INTL) XMK_FILE= spaxman.mk ########################################################################### --- star/star.c +++ star/star.c @@ -39,6 +39,11 @@ #include <schily/idcache.h> #include "fifo.h" /* Needed for #undef FIFO */ #include "dumpdate.h" + +#ifdef WITH_SELINUX +int selinux_enabled=0; +#endif + #ifdef USE_FIND #include <schily/walk.h> #include <schily/find.h> @@ -387,6 +392,11 @@ #endif comerr("Panic cannot set back effective uid.\n"); } + +#ifdef WITH_SELINUX + selinux_enabled = is_selinux_enabled() > 0; +#endif + my_uid = geteuid(); /* * WARNING: We now are no more able to open a new remote connection --- star/starsubs.h +++ star/starsubs.h @@ -304,6 +304,11 @@ extern BOOL get_xattr __PR((register FINFO *info)); extern BOOL set_xattr __PR((register FINFO *info)); extern void free_xattr __PR((star_xattr_t **xattr)); +#ifdef WITH_SELINUX +#include <selinux/selinux.h> +extern BOOL setselinux __PR((register FINFO *info)); +extern int selinux_enabled; +#endif #endif /* --- star/xattr.c +++ star/xattr.c @@ -196,6 +196,27 @@ #endif /* USE_XATTR */ } +#ifdef WITH_SELINUX +EXPORT BOOL +setselinux(info) + register FINFO *info; +{ +#if defined(USE_XATTR) && defined(HAVE_SETXATTR) && defined(WITH_SELINUX) + if (info->f_xattr) { + star_xattr_t *xap; + for (xap = info->f_xattr; xap->name != NULL; xap++) { + if (strcmp(xap->name, "security.selinux") == 0) { + if (setfscreatecon(xap->value)) { + return FALSE; + } + } + } + } +#endif /* USE_XATTR && WITH_SELINUX */ + return TRUE; +} +#endif + /* ARGSUSED */ EXPORT BOOL set_xattr(info) @@ -209,6 +230,10 @@ return (TRUE); for (xap = info->f_xattr; xap->name != NULL; xap++) { +#ifdef WITH_SELINUX + if (selinux_enabled && (strcmp(xap->name, "security.selinux") == 0)) + continue; +#endif if (lsetxattr(info->f_name, xap->name, xap->value, xap->value_len, 0) != 0) { if (!errhidden(E_SETXATTR, info->f_name)) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.3571 for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Mar '15

01 Mar '15

Hello community, here is the log from the commit of package patchinfo.3571 for openSUSE:13.1:Update checked in at 2015-03-01 10:00:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.3571 (Old) and /work/SRC/openSUSE:13.1:Update/.patchinfo.3571.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.3571" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo incident="3571"> <issue id="917597" tracker="bnc">VUL-0: MozillaFirefox 36 security release</issue> <issue id="910647" tracker="bnc"></issue> <issue id="CVE-2015-0836" tracker="cve" /> <issue id="CVE-2015-0825" tracker="cve" /> <issue id="CVE-2015-0834" tracker="cve" /> <issue id="CVE-2015-0835" tracker="cve" /> <issue id="CVE-2015-0832" tracker="cve" /> <issue id="CVE-2014-1569" tracker="cve" /> <issue id="CVE-2015-0830" tracker="cve" /> <issue id="CVE-2015-0831" tracker="cve" /> <issue id="CVE-2015-0824" tracker="cve" /> <issue id="CVE-2015-0822" tracker="cve" /> <issue id="CVE-2015-0829" tracker="cve" /> <issue id="CVE-2015-0827" tracker="cve" /> <issue id="CVE-2015-0823" tracker="cve" /> <issue id="CVE-2015-0828" tracker="cve" /> <issue id="CVE-2015-0826" tracker="cve" /> <issue id="CVE-2015-0819" tracker="cve" /> <issue id="CVE-2015-0820" tracker="cve" /> <issue id="CVE-2015-0821" tracker="cve" /> <category>security</category> <rating>important</rating> <packager>wrosenauer</packager> <description>MozillaFirefox, mozilla-nss were updated to fix 18 security issues. MozillaFirefox was updated to version 36.0. These security issues were fixed: - CVE-2015-0835, CVE-2015-0836: Miscellaneous memory safety hazards - CVE-2015-0832: Appended period to hostnames can bypass HPKP and HSTS protections - CVE-2015-0830: Malicious WebGL content crash when writing strings - CVE-2015-0834: TLS TURN and STUN connections silently fail to simple TCP connections - CVE-2015-0831: Use-after-free in IndexedDB - CVE-2015-0829: Buffer overflow in libstagefright during MP4 video playback - CVE-2015-0828: Double-free when using non-default memory allocators with a zero-length XHR - CVE-2015-0827: Out-of-bounds read and write while rendering SVG content - CVE-2015-0826: Buffer overflow during CSS restyling - CVE-2015-0825: Buffer underflow during MP3 playback - CVE-2015-0824: Crash using DrawTarget in Cairo graphics library - CVE-2015-0823: Use-after-free in Developer Console date with OpenType Sanitiser - CVE-2015-0822: Reading of local files through manipulation of form autocomplete - CVE-2015-0821: Local files or privileged URLs in pages can be opened into new tabs - CVE-2015-0819: UI Tour whitelisted sites in background tab can spoof foreground tabs - CVE-2015-0820: Caja Compiler JavaScript sandbox bypass mozilla-nss was updated to version 3.17.4 to fix the following issues: - CVE-2014-1569: QuickDER decoder length issue (bnc#910647). - bmo#1084986: If an SSL/TLS connection fails, because client and server don't have any common protocol version enabled, NSS has been changed to report error code SSL_ERROR_UNSUPPORTED_VERSION (instead of reporting SSL_ERROR_NO_CYPHER_OVERLAP). - bmo#1112461: libpkix was fixed to prefer the newest certificate, if multiple certificates match. - bmo#1094492: fixed a memory corruption issue during failure of keypair generation. - bmo#1113632: fixed a failure to reload a PKCS#11 module in FIPS mode. - bmo#1119983: fixed interoperability of NSS server code with a LibreSSL client. </description> <summary>Security update for MozillaFirefox, mozilla-nss</summary> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-nss for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Mar '15

01 Mar '15

Hello community, here is the log from the commit of package mozilla-nss for openSUSE:13.1:Update checked in at 2015-03-01 10:00:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/mozilla-nss (Old) and /work/SRC/openSUSE:13.1:Update/.mozilla-nss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozilla-nss" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.XsNRth/_old 2015-03-01 10:00:13.000000000 +0100 +++ /var/tmp/diff_new_pack.XsNRth/_new 2015-03-01 10:00:13.000000000 +0100 @@ -1 +1 @@ -<link package='mozilla-nss.3275' cicount='copy' /> +<link package='mozilla-nss.3571' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Mar '15

01 Mar '15

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:13.1:Update checked in at 2015-03-01 10:00:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/MozillaFirefox (Old) and /work/SRC/openSUSE:13.1:Update/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.YZ6TH1/_old 2015-03-01 10:00:11.000000000 +0100 +++ /var/tmp/diff_new_pack.YZ6TH1/_new 2015-03-01 10:00:11.000000000 +0100 @@ -1 +1 @@ -<link package='MozillaFirefox.3427' cicount='copy' /> +<link package='MozillaFirefox.3571' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox.3571 for openSUSE:13.1:Update
by root＠hilbert.suse.de 01 Mar '15

01 Mar '15

Hello community, here is the log from the commit of package MozillaFirefox.3571 for openSUSE:13.1:Update checked in at 2015-03-01 10:00:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/MozillaFirefox.3571 (Old) and /work/SRC/openSUSE:13.1:Update/.MozillaFirefox.3571.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox.3571" Changes: -------- New Changes file: --- /dev/null 2015-02-28 12:43:00.252025756 +0100 +++ /work/SRC/openSUSE:13.1:Update/.MozillaFirefox.3571.new/MozillaFirefox.changes 2015-03-01 10:00:03.000000000 +0100 @@ -0,0 +1,3897 @@ +------------------------------------------------------------------- +Fri Feb 20 22:53:39 UTC 2015 - wr(a)rosenauer.org + +- update to Firefox 36.0 (bnc#917597) + * mozilla-xremote-client was removed + * added libclearkey.so media plugin + * Pinned tiles on the new tab page can be synced + * Support for the full HTTP/2 protocol. HTTP/2 enables a faster, + more scalable, and more responsive web. + * Locale added: Uzbek (uz) + security fixes: + * MFSA 2015-11/CVE-2015-0835/CVE-2015-0836 + Miscellaneous memory safety hazards + * MFSA 2015-12/CVE-2015-0833 (bmo#945192) + Invoking Mozilla updater will load locally stored DLL files + (Windows only) + * MFSA 2015-13/CVE-2015-0832 (bmo#1065909) + Appended period to hostnames can bypass HPKP and HSTS protections + * MFSA 2015-14/CVE-2015-0830 (bmo#1110488) + Malicious WebGL content crash when writing strings + * MFSA 2015-15/CVE-2015-0834 (bmo#1098314) + TLS TURN and STUN connections silently fail to simple TCP connections + * MFSA 2015-16/CVE-2015-0831 (bmo#1130514) + Use-after-free in IndexedDB + * MFSA 2015-17/CVE-2015-0829 (bmo#1128939) + Buffer overflow in libstagefright during MP4 video playback + * MFSA 2015-18/CVE-2015-0828 (bmo#1030667, bmo#988675) + Double-free when using non-default memory allocators with a + zero-length XHR + * MFSA 2015-19/CVE-2015-0827 (bmo#1117304) + Out-of-bounds read and write while rendering SVG content + * MFSA 2015-20/CVE-2015-0826 (bmo#1092363) + Buffer overflow during CSS restyling + * MFSA 2015-21/CVE-2015-0825 (bmo#1092370) + Buffer underflow during MP3 playback + * MFSA 2015-22/CVE-2015-0824 (bmo#1095925) + Crash using DrawTarget in Cairo graphics library + * MFSA 2015-23/CVE-2015-0823 (bmo#1098497) + Use-after-free in Developer Console date with OpenType Sanitiser + * MFSA 2015-24/CVE-2015-0822 (bmo#1110557) + Reading of local files through manipulation of form autocomplete + * MFSA 2015-25/CVE-2015-0821 (bmo#1111960) + Local files or privileged URLs in pages can be opened into new tabs + * MFSA 2015-26/CVE-2015-0819 (bmo#1079554) + UI Tour whitelisted sites in background tab can spoof foreground + tabs + * MFSA 2015-27CVE-2015-0820 (bmo#1125398) + Caja Compiler JavaScript sandbox bypass +- rebased patches +- requires NSS 3.17.4 + +------------------------------------------------------------------- +Sat Jan 31 18:37:38 UTC 2015 - wr(a)rosenauer.org + +- update to Firefox 35.0.1 + * With the Enhanced Steam extension, Firefox could crash (bmo#1123732) + * Kerberos authentication did not work with alias (bmo#1108971) + * SVG / CSS animation had a regression causing rendering issues on + websites like openstreemap.org (bmo#1083079) + * On Godaddy webmail, Firefox could crash (bmo#1113121) + * document.baseURI did not get updated to document.location after + base tag was removed from DOM for site with a CSP (bmo#1121857) + * With a Right-to-left (RTL) version of Firefox, the text selection + could be broken (bmo#1104036) + * CSP had a change in behavior with regard to case sensitivity + resources loading (bmo#1122445) + +------------------------------------------------------------------- +Sat Jan 10 18:36:37 UTC 2015 - wr(a)rosenauer.org + +- update to Firefox 35.0 (bnc#910669) + notable features: + * Firefox Hello with new rooms-based conversations model + * Implemented HTTP Public Key Pinning Extension (for enhanced + authentication of encrypted connections) + security fixes: + * MFSA 2015-01/CVE-2014-8634/CVE-2014-8635 + Miscellaneous memory safety hazards + * MFSA 2015-02/CVE-2014-8637 (bmo#1094536) + Uninitialized memory use during bitmap rendering + * MFSA 2015-03/CVE-2014-8638 (bmo#1080987) + sendBeacon requests lack an Origin header + * MFSA 2015-04/CVE-2014-8639 (bmo#1095859) + Cookie injection through Proxy Authenticate responses + * MFSA 2015-05/CVE-2014-8640 (bmo#1100409) + Read of uninitialized memory in Web Audio + * MFSA 2015-06/CVE-2014-8641 (bmo#1108455) + Read-after-free in WebRTC + * MFSA 2015-07/CVE-2014-8643 (bmo#1114170) (Windows-only) + Gecko Media Plugin sandbox escape + * MFSA 2015-08/CVE-2014-8642 (bmo#1079658) + Delegated OCSP responder certificates failure with + id-pkix-ocsp-nocheck extension + * MFSA 2015-09/CVE-2014-8636 (bmo#987794) + XrayWrapper bypass through DOM objects +- rebased patches +- dropped explicit support for everything older than 12.3 + (including SLES11) + * merge firefox-kde.patch and firefox-kde-114.patch + * dropped mozilla-sle11.patch +- reworked specfile to build conditionally based on release channel + either Firefox or Firefox Developer Edition +- added mozilla-openaes-decl.patch to fix implicit declarations +- obsolete tracker-miner-firefox < 0.15 because it leads to startup + crashes (bnc#908892) + +------------------------------------------------------------------- +Sat Dec 13 22:13:00 UTC 2014 - Led <ledest(a)gmail.com> + +- fix bashism in mozilla.sh script + +------------------------------------------------------------------- +Sat Nov 29 21:23:03 UTC 2014 - wr(a)rosenauer.org + +- update to Firefox 34.0.5 (bnc#908009) + * Default search engine changed to Yahoo! for North America + * Default search engine changed to Yandex for Belarusian, Kazakh, + and Russian locales + * Improved search bar (en-US only) + * Firefox Hello real-time communication client + * Easily switch themes/personas directly in the Customizing mode + * Implementation of HTTP/2 (draft14) and ALPN + * Disabled SSLv3 + * MFSA 2014-83/CVE-2014-1587/CVE-2014-1588 + Miscellaneous memory safety hazards + * MFSA 2014-84/CVE-2014-1589 (bmo#1043787) + XBL bindings accessible via improper CSS declarations + * MFSA 2014-85/CVE-2014-1590 (bmo#1087633) + XMLHttpRequest crashes with some input streams + * MFSA 2014-86/CVE-2014-1591 (bmo#1069762) + CSP leaks redirect data via violation reports + * MFSA 2014-87/CVE-2014-1592 (bmo#1088635) + Use-after-free during HTML5 parsing + * MFSA 2014-88/CVE-2014-1593 (bmo#1085175) + Buffer overflow while parsing media content + * MFSA 2014-89/CVE-2014-1594 (bmo#1074280) + Bad casting from the BasicThebesLayer to BasicContainerLayer +- rebased patches +- limit linker memory usage for %ix86 +- rebased patches + +------------------------------------------------------------------- +Fri Nov 7 20:14:32 UTC 2014 - wr(a)rosenauer.org + +- update to Firefox 33.1 + * Adding DuckDuckGo as a search option (upstream) + * Forget Button added + * Enhanced Tiles + * Privacy tour introduced +- fix typo in GStreamer Recommends + +------------------------------------------------------------------- +Tue Nov 4 18:00:35 UTC 2014 - guillaume(a)opensuse.org + +- Disable elf-hack for aarch64 +- Enable EGL for aarch64 +- Limit RAM usage during link for %arm +- Fix _constraints for ARM + +------------------------------------------------------------------- +Mon Nov 3 11:36:04 UTC 2014 - dmueller(a)suse.com + +- use proper macros for ARM + +------------------------------------------------------------------- +Mon Nov 3 11:26:23 UTC 2014 - josua.mayer97(a)gmail.com + +- use '--disable-optimize' not only on 32-bit x86, but on 32-bit arm too + to fix compiling. +- pass '-Wl,--no-keep-memory' to linker to reduce required memory during + linking on arm. + +------------------------------------------------------------------- +Thu Oct 30 11:31:05 UTC 2014 - wr(a)rosenauer.org + +- update to Firefox 33.0.2 + * Fix a startup crash with some combination of hardware and drivers + 33.0.1 + * Firefox displays a black screen at start-up with certain + graphics drivers +- adjusted _constraints for ARM + +------------------------------------------------------------------- +Tue Oct 28 15:23:09 UTC 2014 - josua.mayer97(a)gmail.com + +- added mozilla-bmo1088588.patch to fix build with EGL (bmo#1088588) + +------------------------------------------------------------------- +Sat Oct 25 08:45:43 UTC 2014 - wr(a)rosenauer.org + +- define /usr/share/myspell as additional dictionary location + and remove add-plugins.sh finally (bnc#900639) + +------------------------------------------------------------------- +Sun Oct 19 12:59:28 UTC 2014 - vindex17(a)outlook.it + +- use Firefox default optimization flags instead of -Os ++++ 3700 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.MozillaFirefox.3571.new/MozillaFirefox.changes New: ---- MozillaFirefox-rpmlintrc MozillaFirefox.changes MozillaFirefox.desktop MozillaFirefox.spec _constraints compare-locales.tar.xz create-tar.sh find-external-requires.sh firefox-36.0-source.tar.xz firefox-appdata.xml firefox-branded-icons.patch firefox-kde.patch firefox-mimeinfo.xml firefox-multilocale-chrome.patch firefox-no-default-ualocale.patch firefox.1 firefox.js kde.js l10n-36.0.tar.xz mozilla-arm-disable-edsp.patch mozilla-bmo1088588.patch mozilla-get-app-id mozilla-icu-strncat.patch mozilla-kde.patch mozilla-language.patch mozilla-nongnome-proxies.patch mozilla-ntlm-full-path.patch mozilla-openaes-decl.patch mozilla-prefer_plugin_pref.patch mozilla-preferences.patch mozilla-repo.patch mozilla-shared-nss-db.patch mozilla.sh.in source-stamp.txt spellcheck.js toolkit-download-folder.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ ++++ 634 lines (skipped) ++++++ MozillaFirefox-rpmlintrc ++++++ addFilter("no-jar-manifest") ++++++ MozillaFirefox.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Name=%NAME GenericName=Web Browser Comment=Web Browser TryExec=%EXEC Exec=%EXEC %u Icon=%ICON Terminal=false StartupNotify=true MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; Type=Application ++++++ create-tar.sh ++++++ #!/bin/bash CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" RELEASE_TAG="FIREFOX_36_0_RELEASE" VERSION="36.0" # mozilla if [ -d mozilla ]; then pushd mozilla _repourl=$(hg paths) case "$_repourl" in *$BRANCH*) echo "updating previous tree" hg pull popd ;; * ) echo "removing obsolete tree" popd rm -rf mozilla ;; esac fi if [ ! -d mozilla ]; then echo "cloning new $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH mozilla fi pushd mozilla hg update --check [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG # get repo and source stamp echo -n "REV=" > ../source-stamp.txt hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt echo -n "REPO=" >> ../source-stamp.txt hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt popd echo "creating archive..." tar cJf firefox-$VERSION-source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla # l10n echo "fetching locales..." test ! -d l10n && mkdir l10n for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do case $locale in ja-JP-mac|en-US) ;; *) echo "fetching $locale ..." hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac done echo "creating l10n archive..." tar cJf l10n-$VERSION.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n # compare-locales echo "creating compare-locales" hg clone http://hg.mozilla.org/build/compare-locales tar cJf compare-locales.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales ++++++ find-external-requires.sh ++++++ #!/bin/sh # Finds requirements provided outside of the current file set filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" ) provides=$( echo "$filelist" | /usr/lib/rpm/find-provides ) echo "$filelist" \ | /usr/lib/rpm/find-requires \ | grep -F -v "$provides" \ | sort -u ++++++ firefox-branded-icons.patch ++++++ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -62,16 +62,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifdef MOZ_WIDGET_GTK libs:: $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default +ifdef MOZ_OFFICIAL_BRANDING + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default +endif endif ifndef LIBXUL_SDK # channel-prefs.js is handled separate from other prefs due to bug 756325 libs:: $(srcdir)/profile/channel-prefs.js $(NSINSTALL) -D $(DIST)/bin/defaults/pref $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) endif diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in @@ -35,18 +35,21 @@ BRANDING_FILES := \ document.icns \ dsstore \ $(NULL) endif ifdef MOZ_WIDGET_GTK BRANDING_FILES := \ default16.png \ + default22.png \ + default24.png \ default32.png \ default48.png \ + default256.png \ mozicon128.png \ $(NULL) endif BRANDING_DEST := $(DIST)/branding BRANDING_TARGET := export INSTALL_TARGETS += BRANDING diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -654,18 +654,21 @@ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/recording.manifest @RESPATH@/chrome/recording/* #ifdef MOZ_GTK @RESPATH@/browser/chrome/icons/default/default16.png +@RESPATH@/browser/chrome/icons/default/default22.png +@RESPATH@/browser/chrome/icons/default/default24.png @RESPATH@/browser/chrome/icons/default/default32.png @RESPATH@/browser/chrome/icons/default/default48.png +@RESPATH@/browser/chrome/icons/default/default256.png #endif ; [Webide Files] @RESPATH@/browser/chrome/webide@JAREXT@ @RESPATH@/browser/chrome/webide.manifest @RESPATH@/browser/@PREF_DIR@/webide-prefs.js ; shell icons ++++++ firefox-kde.patch ++++++ ++++ 1919 lines (skipped) ++++++ firefox-multilocale-chrome.patch ++++++ # HG changeset patch # Parent 16846914f968944f991c8b12fdc38ce8fc099d73 # User Wolfgang Rosenauer <wr(a)rosenauer.org> Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -389,16 +389,20 @@ pref("browser.helperApps.deleteTempFileO #endif // search engines URL pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +// Tell the search service to load search plugins from the locale JAR +pref("browser.search.loadFromJars", true); +pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/"); + // disable logging for the search service by default pref("browser.search.log", false); // Ordering of Search Engines in the Engine list. pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -66,24 +66,27 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ $(NULL) endif ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) else -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg +SEARCHPLUGINS_NAMES = $(shell cat \ + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ + @srcdir@/en-US/searchplugins/list.txt ) ) ddg endif SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins # metro build call a searchplugins target for search engine plugins .PHONY: searchplugins SEARCHPLUGINS_TARGET := libs searchplugins -SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin)))) -PP_TARGETS += SEARCHPLUGINS +#SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin)))) +SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) +#PP_TARGETS += SEARCHPLUGINS # Required for l10n.mk - defines a list of app sub dirs that should # be included in langpack xpis. ifdef MOZ_METRO # metro build, include both app folders DIST_SUBDIRS = browser metro else DIST_SUBDIRS = $(DIST_SUBDIR) @@ -117,16 +120,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ; libs:: $(addprefix generic/profile/,$(PROFILE_FILES)) $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome +tmp-search.jar.mn:: + printf "$(AB_CD).jar:" > $@ + printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ + @echo >> $@ + +searchplugins-jar:: $(SEARCHPLUGINS) + for SEARCHPLUGIN in $^; do \ + $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \ + $$SEARCHPLUGIN > $$SEARCHPLUGIN-new) ; \ + mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ + done + +searchplugins-jar:: tmp-search.jar.mn + $(call py_action,jar_maker,\ + $(QUIET) -j $(FINAL_TARGET)/chrome \ + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ + -s $(LOCALE_SRCDIR)/searchplugins \ + $(MAKE_JARS_FLAGS) tmp-search.jar.mn) + +libs:: searchplugins-jar + +GARBAGE += tmp-search.jar.mn + libs-%: $(NSINSTALL) -D $(DIST)/install @$(MAKE) -C ../../toolkit/locales libs-$* @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* ifdef MOZ_WEBAPP_RUNTIME @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* endif @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -141,14 +141,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides locale/browser/netError.dtd (%chrome/overrides/netError.dtd) locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) + locale/browser/searchplugins/list.txt (%searchplugins/list.txt) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd % locale pdf.js @AB_CD@ %locale/pdfviewer/ locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) ++++++ firefox-no-default-ualocale.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent 099312626f5f7c9cb5573a61d0230574ee12a660 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -261,17 +261,17 @@ pref("browser.uitour.pinnedTabUrl", "htt pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/"); pref("browser.customizemode.tip0.shown", false); pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize"); pref("keyword.enabled", true); pref("browser.fixup.domainwhitelist.localhost", true); -pref("general.useragent.locale", "@AB_CD@"); +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.skins.selectedSkin", "classic/1.0"); pref("general.smoothScroll", true); #ifdef UNIX_BUT_NOT_MAC pref("general.autoScroll", false); #else pref("general.autoScroll", true); #endif ++++++ firefox.1 ++++++ .TH FIREFOX 1 "January 04, 2006" firefox "Linux User's Manual" .SH NAME firefox \- a Web browser for X11 derived from the Mozilla browser .SH SYNOPSIS .B firefox [\fIOPTIONS\fR] [\fIURL\fR] .SH DESCRIPTION \fBMozilla Firefox\fR is an open-source web browser, designed for standards compliance, performance and portability. .SH USAGE \fBfirefox\fR is a simple shell script that will set up the environment for the actual executable. .SH OPTIONS A summary of the options supported by \fBfirefox\fR is included below. .SS "GTK options" \fB\-\-gdk-debug=\fR\fIFLAGS\fR Gdk debugging flags to set .TP \fB\-\-gdk-no-debug=\fR\fIFLAGS\fR Gdk debugging flags to unset .TP \fB\-\-gtk-debug=\fR\fIFLAGS\fR Gtk+ debugging flags to set .TP \fB\-\-gtk-no-debug=\fR\fIFLAGS\fR Gtk+ debugging flags to unset .TP \fB\-\-gtk-module=\fR\fIMODULE\fR Load an additional Gtk module .SS "X11 options" .TP .BI \-\-display= DISPLAY X display to use .TP .B \--sync Make X calls synchronous .TP .B \-\-no-xshm Don't use X shared memory extension .TP .BI \-\-xim-preedit= STYLE .TP .BI \-\-xim-status= STYLE .TP .B \-\-g-fatal-warnings Make all warnings fatal .SS "Firefox options" .TP .B \-h, \-help Show summary of options. .TP \fB\-height\fR \fIvalue\fR Set height of startup window to \fIvalue\fR. .TP \fB\-width\fR \fIvalue\fR Set width of startup window to \fIvalue\fR. .TP .B \-v, \-version Print \fB/usr/bin/firefox-bin\fR version. .TP \fB\-CreateProfile\fR \fIprofile\fR Create \fIprofile\fR. .TP \fB\-P\fR \fIprofile\fR Start with \fIprofile\fR. .TP .B \-ProfileManager Start with profile manager. .TP \fB\-UILocale\fR \fIlang-region\fR Start with \fIlang-region\fR resources. .TP \fB\-contentLocale\fR \fIlang-region\fR Start with \fIlang-region\fR resources. .TP \fB\-remote\fR \fIcommand\fR Execute \fIcommand\fR in an already running Firefox process. For more info, see: \fIhttp://www.mozilla.org/unix/remote.html\fR .TP .B \-no-remote Don't try to control an already running instance. .TP .B \-jsconsole Start with Javascript Console .TP \fB\-chrome\fR \fIurl\fR Load the specified chrome. .TP \fB\-new-window\fR \fIurl\fR Open URL in a new window if Firefox is already running. .TP \fB\-new-tab\fR \fIurl\fR Open URL in a new tab if Firefox is already running. .TP \fB\-preferences\fR Open Firefox preferences menu. .TP .B \-safe-mode Disables extensions and themes for this session. .TP .SH FILES \fI/usr/bin/firefox\fR - shell script wrapping \fBfirefox\fR .br \fI/usr/lib/firefox/firefox\fR - \fBfirefox\fR executable .SH VERSION 3.0 .SH BUGS To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR .SH "SEE ALSO" .BR mozilla(1) .SH AUTHORS .TP .B The Mozilla Organization .I http://www.mozilla.org/about.html ++++++ firefox.js ++++++ pref("browser.preferences.instantApply", true); ++++++ kde.js ++++++ pref("browser.preferences.instantApply", false); ++++++ mozilla-arm-disable-edsp.patch ++++++ # HG changeset patch # User Adrian Schröter <adrian(a)suse.de> # Parent b945e0c3b145b6b2245f42bab52f911c2d1f6759 disable ESDP support (no BNC or BMO reference yet :-() diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h --- a/mozglue/build/arm.h +++ b/mozglue/build/arm.h @@ -116,17 +116,17 @@ namespace mozilla { extern bool MFBT_DATA neon_enabled; #endif #endif } #if defined(MOZILLA_PRESUME_EDSP) # define MOZILLA_MAY_SUPPORT_EDSP 1 inline bool supports_edsp() { return true; } -#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \ +#elif 0 \ && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION) inline bool supports_edsp() { return arm_private::edsp_enabled; } #else inline bool supports_edsp() { return false; } #endif #if defined(MOZILLA_PRESUME_ARMV6) # define MOZILLA_MAY_SUPPORT_ARMV6 1 ++++++ mozilla-bmo1088588.patch ++++++ # HG changeset patch # User Dirk Mueller <dmueller(a)suse.com> # Date 1414618964 0 # Wed Oct 29 21:42:44 2014 +0000 # Node ID 8e3825b2d12a9f295b6ff9a972340b9d84fce068 # Parent 262e4847ad6cca40d7375e40a0d6ebe8b372e3d3 Bug 1088588 - fix ifdef in X11TextureSourceOGL.cpp, r?nical diff --git a/gfx/layers/opengl/X11TextureSourceOGL.cpp b/gfx/layers/opengl/X11TextureSourceOGL.cpp --- a/gfx/layers/opengl/X11TextureSourceOGL.cpp +++ b/gfx/layers/opengl/X11TextureSourceOGL.cpp @@ -94,14 +94,14 @@ X11TextureSourceOGL::ContentTypeToSurfac switch (aType) { case gfxContentType::COLOR: return SurfaceFormat::R8G8B8X8; case gfxContentType::COLOR_ALPHA: return SurfaceFormat::R8G8B8A8; default: return SurfaceFormat::UNKNOWN; } } +} +} + #endif - -} -} ++++++ mozilla-get-app-id ++++++ #!/usr/bin/perl -w use XML::Simple; my $file = shift || die "Usage: $0 [install.rdf|somefile.xpi]\n"; my $xml; if ($file =~ /\.xpi$/) { use Archive::Zip qw/:ERROR_CODES :CONSTANTS/; my $zip = Archive::Zip->new(); if ( $zip->read($file) != AZ_OK ) { die "zip file read error\n"; } my $data = $zip->contents("install.rdf"); die "missing install.rdf in $file\n" unless $data; $xml = XMLin($data) || die "$!\n"; } elsif ($file =~ /install.rdf/) { $xml = XMLin($file) || die "$!\n"; } else { die "unsupported file format\n"; } my $desc; for my $tag (qw/RDF:Description Description/) { if (exists $xml->{$tag}) { if (ref $xml->{$tag} eq 'ARRAY') { $desc = $xml->{$tag}; } else { $desc = [ $xml->{$tag} ]; } } } my $uuid; my $id; for my $x (@$desc) { if ($x->{"em:id"} =~ /{[[:xdigit:]]+-/) { print STDERR "Warning: multiple uuids!\n" if defined $uuid; $uuid = $x->{"em:id"}; } elsif ($x->{"em:id"} =~ /@/) { print STDERR "Warning: multiple ids!\n" if defined $id; $id = $x->{"em:id"}; } } if (defined $id) { print "$id\n"; } elsif (defined $uuid) { print "$uuid\n"; } else { exit 1; } ++++++ mozilla-icu-strncat.patch ++++++ # HG changeset patch # Parent 29be2a4daa0f512d22bde85b97b5460839026571 # User Wolfgang Rosenauer <wr(a)rosenauer.org> From: Jan Engelhardt <jengelh(a)inai.de> Reference: http://bugs.icu-project.org/trac/ticket/7808 diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp --- a/intl/icu/source/tools/pkgdata/pkgdata.cpp +++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp @@ -1975,22 +1975,22 @@ static void loadLists(UPKGOptions *o, UE FILE *p = NULL; size_t n; static char buf[512] = ""; char cmdBuf[1024]; UErrorCode status = U_ZERO_ERROR; const char cmd[] = "icu-config --incpkgdatafile"; /* #1 try the same path where pkgdata was called from. */ - findDirname(progname, cmdBuf, 1024, &status); + findDirname(progname, cmdBuf, sizeof(cmdBuf), &status); if(U_SUCCESS(status)) { if (cmdBuf[0] != 0) { - uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024); + uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf)); } - uprv_strncat(cmdBuf, cmd, 1024); + uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf)); if(verbose) { fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf); } p = popen(cmdBuf, "r"); } if(p == NULL || (n = fread(buf, 1, 511, p)) <= 0) { ++++++ mozilla-kde.patch ++++++ ++++ 3758 lines (skipped) ++++++ mozilla-language.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent 5a29924228527f8882c83cf62d470963ea1ce62e Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp --- a/intl/locale/nsLocaleService.cpp +++ b/intl/locale/nsLocaleService.cpp @@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void) nsRefPtr<nsLocale> resultLocale(new nsLocale()); NS_ENSURE_TRUE_VOID(resultLocale); #ifdef MOZ_WIDGET_QT const char* lang = QLocale::system().name().toUtf8(); #else // Get system configuration const char* lang = getenv("LANG"); + const char* language = getenv("LANGUAGE"); #endif nsAutoString xpLocale, platformLocale; nsAutoString category, category_platform; int i; for( i = 0; i < LocaleListLength; i++ ) { nsresult result; @@ -150,16 +151,21 @@ nsLocaleService::nsLocaleService(void) } else { CopyASCIItoUTF16(lang, platformLocale); result = nsPosixLocale::GetXPLocale(lang, xpLocale); } } if (NS_FAILED(result)) { return; } + // LANGUAGE is overriding LC_MESSAGES + if (i == LC_MESSAGES && language && *language) { + CopyASCIItoUTF16(language, platformLocale); + result = nsPosixLocale::GetXPLocale(language, xpLocale); + } resultLocale->AddCategory(category, xpLocale); resultLocale->AddCategory(category_platform, platformLocale); } mSystemLocale = do_QueryInterface(resultLocale); mApplicationLocale = do_QueryInterface(resultLocale); #endif // XP_UNIX ++++++ mozilla-nongnome-proxies.patch ++++++ From: Wolfgang Rosenauer Subject: Do not use gconf for proxy settings if not running within Gnome Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v retrieving revision 1.1 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp @@ -53,23 +53,27 @@ nsUnixSystemProxySettings::GetMainThread // dbus prevents us from being threadsafe, but this routine should not block anyhow *aMainThreadOnly = true; return NS_OK; } nsresult nsUnixSystemProxySettings::Init() { - mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); - if (mGSettings) { - mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), - getter_AddRefs(mProxySettings)); - } - if (!mProxySettings) { - mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + // only use GSettings if that is a GNOME session + const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); + if (sessionType && !strcmp(sessionType, "gnome")) { + mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); + if (mGSettings) { + mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), + getter_AddRefs(mProxySettings)); + } + if (!mProxySettings) { + mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + } } return NS_OK; } bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) { ++++++ mozilla-ntlm-full-path.patch ++++++ # HG changeset patch # User Petr Cerny <pcerny(a)novell.com> # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 Bug 634334 - call to the ntlm_auth helper fails diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp --- a/extensions/auth/nsAuthSambaNTLM.cpp +++ b/extensions/auth/nsAuthSambaNTLM.cpp @@ -168,17 +168,17 @@ static uint8_t* ExtractMessage(const nsA nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() { const char* username = PR_GetEnv("USER"); if (!username) return NS_ERROR_FAILURE; const char* const args[] = { - "ntlm_auth", + "/usr/bin/ntlm_auth", "--helper-protocol", "ntlmssp-client-1", "--use-cached-creds", "--username", username, nullptr }; bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, &mFromChildFD, &mToChildFD); if (!isOK) ++++++ mozilla-openaes-decl.patch ++++++ # HG changeset patch # Parent 33024abb3c58dab7239e32388df58e14f99defd5 # User Wolfgang Rosenauer <wr(a)rosenauer.org> diff --git a/media/gmp-clearkey/0.1/openaes/oaes_lib.c b/media/gmp-clearkey/0.1/openaes/oaes_lib.c --- a/media/gmp-clearkey/0.1/openaes/oaes_lib.c +++ b/media/gmp-clearkey/0.1/openaes/oaes_lib.c @@ -27,16 +27,17 @@ * POSSIBILITY OF SUCH DAMAGE. * --------------------------------------------------------------------------- */ static const char _NR[] = { 0x4e,0x61,0x62,0x69,0x6c,0x20,0x53,0x2e,0x20, 0x41,0x6c,0x20,0x52,0x61,0x6d,0x6c,0x69,0x00 }; #include <stdlib.h> +#include <stdio.h> #include <stddef.h> #include <time.h> #include <string.h> #ifdef WIN32 #include <process.h> #endif ++++++ mozilla-prefer_plugin_pref.patch ++++++ From: Ubuntu Subject: introduce a pref to prefer certain plugins for mime-types diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -1334,17 +1334,51 @@ nsPluginHost::FindPluginForType(const ch if (!aMimeType) { return nullptr; } LoadPlugins(); InfallibleTArray<nsPluginTag*> matchingPlugins; + char *preferredPluginPath = nullptr; + nsAutoCString mimetypePrefString ("modules.plugins.mimetype."); + mimetypePrefString.Append(aMimeType); + const char *mimetypePrefChar = mimetypePrefString.get(); + nsAdoptingCString pluginPath = Preferences::GetCString(mimetypePrefChar); + preferredPluginPath = (char*) pluginPath.get(); + nsPluginTag *plugin = mPlugins; + + if(preferredPluginPath) { + while (plugin) { + if (!aCheckEnabled || plugin->IsEnabled()) { + if (0 == PL_strcasecmp(plugin->mFileName.get(), preferredPluginPath) || + 0 == PL_strcasecmp(plugin->mFullPath.get(), preferredPluginPath)) { + matchingPlugins.AppendElement(plugin); + } + } + plugin = plugin->mNext; + } + + // now lets search for substrings + plugin = mPlugins; + while (plugin) { + if (!aCheckEnabled || plugin->IsEnabled()) { + if (nullptr != PL_strstr(plugin->mFileName.get(), preferredPluginPath) || + nullptr != PL_strstr(plugin->mFullPath.get(), preferredPluginPath)) { + matchingPlugins.AppendElement(plugin); + } + } + plugin = plugin->mNext; + } + + return FindPreferredPlugin(matchingPlugins); + } + while (plugin) { if (!aCheckEnabled || plugin->IsActive()) { int32_t mimeCount = plugin->mMimeTypes.Length(); for (int32_t i = 0; i < mimeCount; i++) { if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) { matchingPlugins.AppendElement(plugin); break; } ++++++ mozilla-preferences.patch ++++++ From: Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use system locale if available This setting used to live in the branding-openSUSE package but this is causing too much confusion and therefore is currently the only setting we switch in the unbranded package unconditionally. # HG changeset patch # Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1503,17 +1503,17 @@ pref("converter.html2txt.header_strategy pref("intl.accept_languages", "chrome://global/locale/intl.properties"); pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties"); pref("intl.charset.detector", "chrome://global/locale/intl.properties"); pref("intl.charset.fallback.override", ""); pref("intl.charset.fallback.tld", true); pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); -pref("intl.locale.matchOS", false); +pref("intl.locale.matchOS", true); // fallback charset list for Unicode conversion (converting from Unicode) // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) // for ISO-8859-1 pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252"); pref("font.language.group", "chrome://global/locale/intl.properties"); // these locales have right-to-left UI pref("intl.uidirection.ar", "rtl"); ++++++ mozilla-repo.patch ++++++ # HG changeset patch # Parent 80b6464bd883864fce57e8748010869af1be69e9 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -137,24 +137,24 @@ else BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) endif ifndef INCLUDED_RCS_MK USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/makeutils.mk endif -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) ########################################################################### # bug: 746277 - preserve existing functionality. # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists ########################################################################### ifdef MOZILLA_OFFICIAL -MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) +#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) endif MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json # JavaScript Shell PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip ++++++ mozilla-shared-nss-db.patch ++++++ From: Hans Petter Jansson <hpj(a)copyleft.no> Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use libnsssharedhelper if available at compile time (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -8268,16 +8268,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) fi fi AC_SUBST(MOZ_ENABLE_SKIA) dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + + PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, + [MOZ_ENABLE_NSSHELPER=1], + [MOZ_ENABLE_NSSHELPER=]) + +if test "$MOZ_ENABLE_NSSHELPER"; then + AC_DEFINE(MOZ_ENABLE_NSSHELPER) +fi +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST_LIST(NSSHELPER_CFLAGS) +AC_SUBST_LIST(NSSHELPER_LIBS) + +dnl ======================================================== dnl disable xul dnl ======================================================== MOZ_ARG_DISABLE_BOOL(xul, [ --disable-xul Disable XUL], MOZ_XUL= ) if test "$MOZ_XUL"; then AC_DEFINE(MOZ_XUL) else diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build @@ -77,16 +77,19 @@ SOURCES += [ 'nsNSSVersion.cpp', 'PSMContentListener.cpp', ] LOCAL_INCLUDES += [ '/security/manager/boot/src', ] +CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS']) +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) + if not CONFIG['MOZ_NO_SMART_CARDS']: UNIFIED_SOURCES += [ 'nsSmartCardMonitor.cpp', ] if CONFIG['MOZ_XUL']: UNIFIED_SOURCES += [ 'nsCertTree.cpp', diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -1,14 +1,21 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> +#pragma GCC visibility pop +#include "prenv.h" +#endif + #include "nsNSSComponent.h" #include "ExtendedValidation.h" #include "NSSCertDBTrustDomain.h" #include "mozilla/Telemetry.h" #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" #include "nsComponentManagerUtils.h" @@ -986,17 +993,31 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) { nsPSMInitPanic::SetPanic(); return NS_ERROR_NOT_AVAILABLE; } SECStatus init_rv = SECFailure; if (!profileStr.IsEmpty()) { // First try to initialize the NSS DB in read/write mode. - SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); +#ifdef MOZ_ENABLE_NSSHELPER + if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); + } else { + uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; + init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), flags); + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); + } + } +#else + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); +#endif // If that fails, attempt read-only mode. if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get())); init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true); } if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); } diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -208,16 +208,18 @@ if CONFIG['MOZ_B2G_CAMERA']: 'stagefright_omx', ] if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': OS_LIBS += [ 'rt', ] +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) + OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] if CONFIG['MOZ_NATIVE_JPEG']: OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] if CONFIG['MOZ_NATIVE_PNG']: OS_LIBS += CONFIG['MOZ_PNG_LIBS'] ++++++ mozilla.sh.in ++++++ #!/bin/sh # # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 # # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License # for the specific language governing rights and limitations under the # License. # # The Original Code is mozilla.org Code. # # The Initial Developer of the Original Code is # Netscape Communications Corporation. # Portions created by the Initial Developer are Copyright (C) 1998 # the Initial Developer. All Rights Reserved. # # Contributor(s): # Wolfgang Rosenauer <wolfgang.rosenauer(a)suse.de> # <wr(a)rosenauer.org> # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), # in which case the provisions of the GPL or the LGPL are applicable instead # of those above. If you wish to allow use of your version of this file only # under the terms of either the GPL or the LGPL, and not to allow others to # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** ## ## Usage: ## ## $ mozilla [args] ## ## This script is meant to run a mozilla program from the mozilla ## rpm installation. ## ## The script will setup all the environment voodoo needed to make ## mozilla work. cmdname=`basename $0` ## ## Variables ## MOZ_DIST_BIN="%PREFIX" MOZ_DIST_LIB="%PROGDIR" MOZ_APPNAME="%APPNAME" MOZ_PROGRAM="$MOZ_DIST_LIB/$MOZ_APPNAME" MOZ_APP_LAUNCHER="$MOZ_DIST_LIB/$MOZ_APPNAME.sh" if [ "$0" = "$MOZ_APP_LAUNCHER" ]; then [ -h "/usr/bin/$MOZ_APPNAME" ] && \ _link=$(readlink -f "/usr/bin/$MOZ_APPNAME") if [ "$_link" = "$MOZ_APP_LAUNCHER" ]; then export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi else export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi mozilla_lib=`file $MOZ_PROGRAM` LIB=lib echo $mozilla_lib | grep -q -E 'ELF.64-bit.*(x86-64|S/390|PowerPC)' && LIB=lib64 BROWSER_PLUGIN_DIR=/usr/$LIB/browser-plugins if [ ! -d $BROWSER_PLUGIN_DIR ]; then BROWSER_PLUGIN_DIR=/opt/netscape/plugins fi MOZILLA_FIVE_HOME="$MOZ_DIST_LIB" export MOZILLA_FIVE_HOME LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 ## if [ -z "$MOZ_PLUGIN_PATH" ]; then export MOZ_PLUGIN_PATH=$BROWSER_PLUGIN_DIR else # make sure that BROWSER_PLUGIN_DIR is in MOZ_PLUGIN_PATH echo "$MOZ_PLUGIN_PATH" | grep "$BROWSER_PLUGIN_DIR" 2>&1 >/dev/null _retval=$? if [ ${_retval} -ne 0 ]; then export MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$BROWSER_PLUGIN_DIR fi fi # disable Gnome crash dialog (doesn't make sense anyway) export GNOME_DISABLE_CRASH_DIALOG=1 moz_debug=0 script_args="" pass_arg_count=0 while [ $# -gt $pass_arg_count ] do case "$1" in -d | --debugger) moz_debugger=$2; if [ "${moz_debugger}" != "" ]; then shift 2 moz_debug=1 else echo "-d requires an argument" exit 1 fi ;; *) # Move the unrecognized argument to the end of the list. arg="$1" shift set -- "$@" "$arg" pass_arg_count=`expr $pass_arg_count + 1` ;; esac done if [ $moz_debug -eq 1 ]; then tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; } trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 echo "set args ${1+"$@"}" > $tmpfile echo "run" >> $tmpfile echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile" exec $moz_debugger "$MOZ_PROGRAM" -x $tmpfile else exec $MOZ_PROGRAM "$@" fi ++++++ source-stamp.txt ++++++ REV=59eefd8af5d7 REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ spellcheck.js ++++++ pref("spellchecker.dictionary_path", "/usr/share/myspell"); ++++++ toolkit-download-folder.patch ++++++ From: Wolfgang Rosenauer Subject: Don't use localized Downloads unless XDG is set up References: https://bugzilla.novell.com/show_bug.cgi?id=501724 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -290,17 +290,17 @@ var gMainPane = { // and was available as an option in the 1.5 drop down. On XP this // was in My Documents, on OSX it was in User Docs. In 2.0, we did // away with the drop down option, although the special label was // still supported for the folder if it existed. Because it was // not exposed it was rarely used. // With 3.0, a new desktop folder - 'Downloads' was introduced for // platforms and versions that don't support a default system downloads // folder. See nsDownloadManager for details. - downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); + downloadFolder.label = "Downloads"; iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); } else { // 'Desktop' downloadFolder.label = bundlePreferences.getString("desktopFolderName"); iconUrlSpec = fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop")); } downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16"; diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp @@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi // Vista: // Downloads // XP/2K: // My Documents/Downloads // Linux: // XDG user dir spec, with a fallback to Home/Downloads nsXPIDLString folderName; - mBundle->GetStringFromName(MOZ_UTF16("downloadsFolder"), - getter_Copies(folderName)); + // We don't want localized "Downloads" unless XDG is used + //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), + // getter_Copies(folderName)); + folderName.AssignLiteral("Downloads"); #if defined (XP_MACOSX) rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, NS_GET_IID(nsIFile), getter_AddRefs(downloadDir)); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_WIN) rv = dirService->Get(NS_WIN_DEFAULT_DOWNLOAD_DIR, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0