August 2012 - openSUSE Commits - openSUSE Mailing Lists

commit libtorrent-rasterbar for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package libtorrent-rasterbar for openSUSE:Factory checked in at 2012-08-27 16:23:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libtorrent-rasterbar (Old) and /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libtorrent-rasterbar", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libtorrent-rasterbar/libtorrent-rasterbar.changes 2012-04-12 09:38:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libtorrent-rasterbar.new/libtorrent-rasterbar.changes 2012-08-27 16:23:24.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 3 09:23:46 UTC 2012 - aj(a)suse.de + +- Fix build with updated boost + +------------------------------------------------------------------- New: ---- libtorrent-rasterbar-boost-time_utc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtorrent-rasterbar.spec ++++++ --- /var/tmp/diff_new_pack.YicR71/_old 2012-08-27 16:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.YicR71/_new 2012-08-27 16:23:27.000000000 +0200 @@ -31,6 +31,7 @@ Url: http://www.rasterbar.com/products/libtorrent/ Source: http://libtorrent.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: libtorrent-rasterbar-0.15.9-missing-return.patch +Patch1: libtorrent-rasterbar-boost-time_utc.patch BuildRequires: boost-devel >= 1.36 BuildRequires: gcc-c++ BuildRequires: libGeoIP-devel @@ -110,6 +111,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags} -fvisibility=hidden -fno-strict-aliasing" ++++++ libtorrent-rasterbar-boost-time_utc.patch ++++++ Index: libtorrent-rasterbar-0.15.10/src/alert.cpp =================================================================== --- libtorrent-rasterbar-0.15.10.orig/src/alert.cpp +++ libtorrent-rasterbar-0.15.10/src/alert.cpp @@ -68,7 +68,7 @@ namespace libtorrent { int secs = total_seconds(max_wait); max_wait -= seconds(secs); boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); xt.sec += secs; boost::int64_t nsec = xt.nsec + total_microseconds(max_wait) * 1000; if (nsec > 1000000000) Index: libtorrent-rasterbar-0.15.10/test/setup_transfer.cpp =================================================================== --- libtorrent-rasterbar-0.15.10.orig/test/setup_transfer.cpp +++ libtorrent-rasterbar-0.15.10/test/setup_transfer.cpp @@ -109,7 +109,7 @@ bool print_alerts(libtorrent::session& s void test_sleep(int millisec) { boost::xtime xt; - boost::xtime_get(&xt, boost::TIME_UTC); + boost::xtime_get(&xt, boost::TIME_UTC_); boost::uint64_t nanosec = (millisec % 1000) * 1000000 + xt.nsec; int sec = millisec / 1000; if (nanosec > 1000000000) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libQtWebKit4 for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package libQtWebKit4 for openSUSE:Factory checked in at 2012-08-27 16:22:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libQtWebKit4 (Old) and /work/SRC/openSUSE:Factory/.libQtWebKit4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libQtWebKit4", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libQtWebKit4/libQtWebKit4.changes 2012-06-10 23:14:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libQtWebKit4.new/libQtWebKit4.changes 2012-08-27 16:22:15.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 13 16:32:27 UTC 2012 - dmueller(a)suse.com + +- reduce memory usage for arm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libQtWebKit4.spec ++++++ --- /var/tmp/diff_new_pack.k0x5ei/_old 2012-08-27 16:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.k0x5ei/_new 2012-08-27 16:23:16.000000000 +0200 @@ -117,21 +117,18 @@ %build export QTDIR=%{_prefix} -%ifarch armv7l -# There is a bug in gcc 4.6 that triggers an ICE with vfpv3 and -O2/-O3. We can -# either work it around by forcing the FPU to neon (which breaks tegra2) or -# compiling with -O1. We do the latter. Can most likely be removed with gcc 4.7 -# -# https://bugs.launchpad.net/gcc-linaro/+bug/795131 -# -RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-O2/-O1}" -# debug stuff uses too much memory so linking fails +%ifarch %arm +# debug uses crazy amount of memory which we don't have RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g/}" %endif Tools/Scripts/build-webkit \ --release \ --qt \ +%ifarch %arm + --no-svg \ + --no-mathml \ +%endif --makeargs="%{?_smp_mflags}" \ --qmakearg="CONFIG+=use_system_icu QMAKE_CFLAGS+=\"${RPM_OPT_FLAGS}\" QMAKE_CXXFLAGS+=\"${RPM_OPT_FLAGS}\" DEFINES+=USE_GSTREAMER=1" ++++++ do-not-force-optimization-level.diff ++++++ --- /var/tmp/diff_new_pack.k0x5ei/_old 2012-08-27 16:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.k0x5ei/_new 2012-08-27 16:23:16.000000000 +0200 @@ -67,23 +67,25 @@ # We clear the environ after calling gyp. When the auto-regeneration happens, --- Source/WebKit.pri +++ Source/WebKit.pri -@@ -1,5 +1,8 @@ +@@ -1,5 +1,9 @@ # Include file to make it easy to include WebKit into Qt projects +QMAKE_CFLAGS_RELEASE = "" +QMAKE_CXXFLAGS_RELEASE = "" ++QMAKE_LFLAGS_RELEASE = "" + contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded # Detect that we are building as a standalone package by the presence of --- Tools/Tools.pro.orig 2011-12-06 08:25:34.777703423 +0100 +++ Tools/Tools.pro 2011-12-06 08:26:19.511396680 +0100 -@@ -2,6 +2,9 @@ +@@ -2,6 +2,10 @@ TEMPLATE = subdirs CONFIG += ordered +QMAKE_CFLAGS_RELEASE = "" +QMAKE_CXXFLAGS_RELEASE = "" ++QMAKE_LFLAGS_RELEASE = "" + include($$PWD/../Source/common.pri) include($$PWD/../Source/WebCore/features.pri) ++++++ reduce-link-optimization.diff ++++++ --- /var/tmp/diff_new_pack.k0x5ei/_old 2012-08-27 16:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.k0x5ei/_new 2012-08-27 16:23:16.000000000 +0200 @@ -6,7 +6,7 @@ -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections -linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF +#unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections -+linux*-g++*:QMAKE_LFLAGS += -Wl,--reduce-memory-overheads -Wl,--no-keep-memory ++linux*-g++*:QMAKE_LFLAGS = -Wl,--reduce-memory-overheads -Wl,--no-keep-memory unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork unix:!mac:!symbian:CONFIG += link_pkgconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmlt for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package libmlt for openSUSE:Factory checked in at 2012-08-27 16:15:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmlt (Old) and /work/SRC/openSUSE:Factory/.libmlt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmlt", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libmlt/libmlt.changes 2012-08-13 14:45:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmlt.new/libmlt.changes 2012-08-27 16:15:11.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Aug 25 14:33:18 UTC 2012 - reddwarf(a)opensuse.org + +- Make python-mlt require at least the same version of libmlt++ + +------------------------------------------------------------------- +Fri Aug 17 14:09:45 UTC 2012 - reddwarf(a)opensuse.org + +- Make vdpau support work without the need of the devel package + +------------------------------------------------------------------- +Thu Aug 16 12:27:53 UTC 2012 - reddwarf(a)opensuse.org + +- Package module specific data in the -modules subpackage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmlt.spec ++++++ --- /var/tmp/diff_new_pack.wx0TST/_old 2012-08-27 16:15:16.000000000 +0200 +++ /var/tmp/diff_new_pack.wx0TST/_new 2012-08-27 16:15:16.000000000 +0200 @@ -145,10 +145,11 @@ Group: Productivity/Multimedia/Video/Editors and Convertors Requires: %{_bindir}/melt Requires: %{libname}%{soname} = %{version} -Requires: %{libname}%{soname}-data Recommends: frei0r-plugins %if %{with ffmpeg} Provides: mlt(%{soname})(avformat) +# I would recommend it, but to the best of my knowledge nobody but nvidia provides a backend +Suggests: %(rpm -qf $(readlink -e %{_libdir}/libvdpau.so) --qf '%{NAME}') %endif %description -n %{libname}%{soname}-modules @@ -176,7 +177,8 @@ Group: Development/Languages/Python BuildRequires: python-devel BuildRequires: swig -Requires: %{libname}%{soname} = %{version} +Requires: %{libname_pp}%{soname_pp} >= %{version} +Requires: %{libname}%{soname} >= %{version} %{py_requires} Provides: python-%{_name}%{soname} @@ -189,6 +191,11 @@ %patch1 %patch2 +# To complement libmlt-0.8.0-vdpau.patch. +# When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway. +VDPAU_SONAME=$(objdump -p $(readlink -e %{_libdir}/libvdpau.so) | grep SONAME | sed 's/.*SONAME.* //' | tr -d '\n') +sed "s/__VDPAU_SONAME__/${VDPAU_SONAME}/" -i src/modules/avformat/vdpau.c + %build %configure --enable-gpl --enable-gpl3 \ %ifarch i586 @@ -206,6 +213,22 @@ install -Dpm 0644 src/swig/python/_%{_name}.so '%{buildroot}%{python_sitearch}/_%{_name}.so' install -Dpm 0644 src/swig/python/%{_name}.py '%{buildroot}%{python_sitearch}/%{_name}.py' +# Get the modules that need data +for MODULE in %{buildroot}%{_libdir}/mlt-%{soname}/libmlt*.so; do + echo $MODULE + MODULEDIR=%{_datadir}/mlt-%{soname}/$(echo $MODULE | sed 's|%{buildroot}%{_libdir}/mlt-%{soname}/libmlt$.*$.so|\1|') + echo $MODULEDIR + if [ -e %{buildroot}$MODULEDIR ]; then + echo Done $MODULEDIR + echo $MODULEDIR >> module_data.dirs + fi; +done + +# Pure data modules +for MODULE in feeds lumas; do + echo %{_datadir}/mlt-%{soname}/$MODULE >> module_data.dirs +done + %post -n %{libname}%{soname} -p /sbin/ldconfig %postun -n %{libname}%{soname} -p /sbin/ldconfig @@ -242,13 +265,17 @@ %attr(0755, root, root) %{_bindir}/melt %{_mandir}/man1/melt.1%{ext_man} -%files -n %{libname}%{soname}-modules +%files -n %{libname}%{soname}-modules -f module_data.dirs %defattr(0644, root, root, 0755) %{_libdir}/%{_name}-%{soname}/ +%dir %{_datadir}/%{_name}-%{soname}/ %files -n %{libname}%{soname}-data %defattr(0644, root, root, 0755) -%{_datadir}/%{_name}-%{soname}/ +%dir %{_datadir}/%{_name}-%{soname}/ +%{_datadir}/%{_name}-%{soname}/metaschema.yaml +%{_datadir}/%{_name}-%{soname}/profiles/ +%{_datadir}/%{_name}-%{soname}/presets/ %files -n python-%{_name} %defattr(0644, root, root, 0755) ++++++ libmlt-0.8.0-vdpau.patch ++++++ --- /var/tmp/diff_new_pack.wx0TST/_old 2012-08-27 16:15:16.000000000 +0200 +++ /var/tmp/diff_new_pack.wx0TST/_new 2012-08-27 16:15:16.000000000 +0200 @@ -11,7 +11,7 @@ - object = dlopen( "/usr/lib/libvdpau.so", flags ); - if ( !object ) - object = dlopen( "/usr/local/lib/libvdpau.so", flags ); -+ object = dlopen( "libvdpau.so", flags ); ++ object = dlopen( "__VDPAU_SONAME__", flags ); if ( object ) vdpau_device_create_x11 = dlsym( object, "vdp_device_create_x11" ); else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libarchive for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package libarchive for openSUSE:Factory checked in at 2012-08-27 16:08:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libarchive (Old) and /work/SRC/openSUSE:Factory/.libarchive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libarchive", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libarchive/libarchive.changes 2012-08-12 15:26:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libarchive.new/libarchive.changes 2012-08-27 16:08:49.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 23 08:30:05 UTC 2012 - dvaleev(a)suse.com + +- libarchive-ppc64.patch: + fix http://code.google.com/p/libarchive/issues/detail?id=277 + test_option_b and test_option_nodump are failing on ppc64 + +------------------------------------------------------------------- New: ---- libarchive-ppc64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libarchive.spec ++++++ --- /var/tmp/diff_new_pack.cG3IGJ/_old 2012-08-27 16:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.cG3IGJ/_new 2012-08-27 16:08:53.000000000 +0200 @@ -36,6 +36,8 @@ Source1: baselibs.conf # PATCH-FIX-UPSTREAM libarchive-fix-checks.patch dimstar(a)opensuse.org -- Fix GCC 4.7 side effects. Taken from upstream. Patch0: libarchive-fix-checks.patch +# PATCH-FIX-UPSTREAM libarchive-ppc64.patch dvaleev(a)suse.com -- fix tests failing on ppc64 +Patch1: libarchive-ppc64.patch %description Libarchive is a programming library that can create and read several @@ -134,6 +136,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %global optflags %{optflags} -D_REENTRANT -pipe ++++++ libarchive-ppc64.patch ++++++ Index: libarchive-3.0.4/libarchive/archive_read_disk_entry_from_file.c =================================================================== --- libarchive-3.0.4.orig/libarchive/archive_read_disk_entry_from_file.c +++ libarchive-3.0.4/libarchive/archive_read_disk_entry_from_file.c @@ -197,7 +197,7 @@ archive_read_disk_entry_from_file(struct fd = open(path, O_RDONLY | O_NONBLOCK); } if (fd >= 0) { - unsigned long stflags; + int stflags; r = ioctl(fd, EXT2_IOC_GETFLAGS, &stflags); if (r == 0 && stflags != 0) archive_entry_set_fflags(entry, stflags, 0); Index: libarchive-3.0.4/libarchive/archive_read_disk_posix.c =================================================================== --- libarchive-3.0.4.orig/libarchive/archive_read_disk_posix.c +++ libarchive-3.0.4/libarchive/archive_read_disk_posix.c @@ -984,7 +984,7 @@ next_entry(struct archive_read_disk *a, #elif defined(EXT2_IOC_GETFLAGS) && defined(EXT2_NODUMP_FL) &&\ defined(HAVE_WORKING_EXT2_IOC_GETFLAGS) if (S_ISREG(st->st_mode) || S_ISDIR(st->st_mode)) { - unsigned long stflags; + int stflags; t->entry_fd = open_on_current_dir(t, tree_current_access_path(t), O_RDONLY | O_NONBLOCK); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:12.2
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:12.2 checked in at 2012-08-27 16:04:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/kiwi-instsource-plugins-openSUSE-12-1 (Old) and /work/SRC/openSUSE:12.2/.kiwi-instsource-plugins-openSUSE-12-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi-instsource-plugins-openSUSE-12-1", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes 2012-06-25 15:37:53.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes 2012-08-27 16:04:39.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 27 13:19:05 UTC 2012 - coolo(a)suse.com + +- add special hack for promo dvds so the kiwi live cds boot from + product DVDs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-instsource-plugins-openSUSE-12-1.diff ++++++ --- /var/tmp/diff_new_pack.k0CF0B/_old 2012-08-27 16:04:39.000000000 +0200 +++ /var/tmp/diff_new_pack.k0CF0B/_new 2012-08-27 16:04:39.000000000 +0200 @@ -1,7 +1,7 @@ Index: KIWILiveTreePlugin.pm =================================================================== ---- KIWILiveTreePlugin.pm.orig 2012-03-05 13:56:09.045673886 +0100 -+++ KIWILiveTreePlugin.pm 2012-03-05 13:56:10.640598808 +0100 +--- KIWILiveTreePlugin.pm.orig ++++ KIWILiveTreePlugin.pm @@ -109,16 +109,6 @@ sub new } # /constructor @@ -59,8 +59,8 @@ } Index: KIWIDescrPlugin.pm =================================================================== ---- KIWIDescrPlugin.pm.orig 2012-03-05 13:56:09.045673886 +0100 -+++ KIWIDescrPlugin.pm 2012-03-10 15:14:03.808988785 +0100 +--- KIWIDescrPlugin.pm.orig ++++ KIWIDescrPlugin.pm @@ -230,6 +230,25 @@ sub executeDir return 1; } @@ -87,3 +87,171 @@ if($this->{m_compress} =~ m{yes}i) { foreach my $pfile(glob("$targetdir/packages*")) { +Index: KIWIPromoDVDPlugin.ini +=================================================================== +--- /dev/null ++++ KIWIPromoDVDPlugin.ini +@@ -0,0 +1,5 @@ ++[base] ++name = KIWIPromoDVDPlugin ++order = 7 ++defaultenable = 1 ++ +Index: KIWIPromoDVDPlugin.pm +=================================================================== +--- /dev/null ++++ KIWIPromoDVDPlugin.pm +@@ -0,0 +1,153 @@ ++################################################################ ++# Copyright (c) 2012 SUSE ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License version 2 as ++# published by the Free Software Foundation. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program (see the file LICENSE); if not, write to the ++# Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA ++# ++################################################################ ++ ++#================ ++# FILE : KIWIPromoDVDPlugin.pm ++#---------------- ++# PROJECT : OpenSUSE Build-Service ++# COPYRIGHT : (c) 2012 SUSE LINUX Products GmbH, Germany ++# : ++# AUTHOR : Stephan Kulow <coolo(a)suse.de> ++# : ++# BELONGS TO : Operating System images ++# : ++# DESCRIPTION : Module patching mini iso builds ++# : ++# STATUS : Development ++#---------------- ++ ++package KIWIPromoDVDPlugin; ++ ++use strict; ++ ++use base "KIWIBasePlugin"; ++use Data::Dumper; ++use Config::IniFiles; ++use File::Find; ++use File::Basename; ++ ++ ++sub new ++{ ++ # ... ++ # Create a new KIWIPromoDVDPlugin object ++ # --- ++ my $class = shift; ++ my $handler = shift; ++ my $config = shift; ++ ++ my $this = new KIWIBasePlugin($handler); ++ bless ($this, $class); ++ ++ $config =~ m{(.*)/([^/]+)$}; ++ my $configpath = $1; ++ my $configfile = $2; ++ if(not defined($configpath) or not defined($configfile)) { ++ $this->logMsg("E", "wrong parameters in plugin initialisation\n"); ++ return undef; ++ } ++ ++ ## now gather all necessary information from the inifile: ++ #=== ++ # Issue: why duplicate code here? Why not put it into the base class? ++ # Answer: Each plugin may have different options. Some only need a target filename, ++ # whilst some others may need much more. I don't want to specify a complicated framework ++ # for the plugin, it shall just be a simple straightforward way to get information ++ # into the plugin. The idea is that the people who decide on the metadata write ++ # the plugin, and therefore damn well know what it needs and what not. ++ # I'm definitely not bothering PMs with Yet Another File Specification (tm) ++ #--- ++ ++ ## plugin content: ++ #----------------- ++ #[base] ++ #name = KIWIEulaPlugin ++ #order = 3 ++ #defaultenable = 1 ++ # ++ #[target] ++ #targetfile = content ++ #targetdir = $PRODUCT_DIR ++ #media = (list of numbers XOR "all") ++ # ++ my $ini = new Config::IniFiles( -file => "$configpath/$configfile" ); ++ my $name = $ini->val('base', 'name'); # scalar value ++ my $order = $ini->val('base', 'order'); # scalar value ++ my $enable = $ini->val('base', 'defaultenable'); # scalar value ++ ++ # if any of those isn't set, complain! ++ if(not defined($name) ++ or not defined($order) ++ or not defined($enable) ++ ) { ++ $this->logMsg("E", "Plugin ini file <$config> seems broken!\n"); ++ return undef; ++ } ++ ++ $this->name($name); ++ $this->order($order); ++ if($enable != 0) { ++ $this->ready(1); ++ } ++ return $this; ++} ++# /constructor ++ ++# returns: number of patched gfxboot files ++sub execute ++{ ++ my $this = shift; ++ if(not ref($this)) { ++ return undef; ++ } ++ my $retval = 0; ++ # sanity check: ++ if($this->{m_ready} == 0) { ++ return $retval; ++ } ++ ++ my $ismini = $this->collect()->productData()->getVar("FLAVOR"); ++ if(not defined($ismini)) { ++ $this->logMsg("W", "FLAVOR not set?"); ++ return $retval; ++ } ++ if($ismini !~ m{dvd-promo}i) { ++ return $retval; ++ } ++ ++ my $medium = $this->collect()->productData()->getVar("MEDIUM_NAME"); ++ my $name = $this->{m_basesubdir}->{$cd} ) =~ s{.*/(.*)/*$}{$1}; ++ my $cd; ++ find( sub { if (m/initrd.liv/) { $cd = $File::Find::name; } }, $this->handler()->collect()->basedir()); ++ if (!$cd) { ++ $this->logMsg("E", "initrd.liv not found\n"); ++ exit(1); ++ } ++ $this->logMsg("I", "$cd $medium $name"); ++ my $dname = dirname($cd); ++ $this->logMsg("I", "$dname"); ++ system("mkdir -p boot/grub; echo $medium > boot/grub/mbrid"); ++ system("echo boot/grub/mbrid | cpio --create --format=newc --quiet | gzip -9 -f >> $cd"); ++ $this->logMsg("I", "updated $cd"); ++ ++ return $retval; ++} ++ ++1; ++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 2012-08-27 16:04:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old) and /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi-instsource-plugins-openSUSE-12-1", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes 2012-03-11 20:04:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes 2012-08-27 16:04:33.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 27 13:19:05 UTC 2012 - coolo(a)suse.com + +- add special hack for promo dvds so the kiwi live cds boot from + product DVDs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-instsource-plugins-openSUSE-12-1.diff ++++++ --- /var/tmp/diff_new_pack.GMjksA/_old 2012-08-27 16:04:36.000000000 +0200 +++ /var/tmp/diff_new_pack.GMjksA/_new 2012-08-27 16:04:36.000000000 +0200 @@ -1,7 +1,7 @@ Index: KIWILiveTreePlugin.pm =================================================================== ---- KIWILiveTreePlugin.pm.orig 2012-03-05 13:56:09.045673886 +0100 -+++ KIWILiveTreePlugin.pm 2012-03-05 13:56:10.640598808 +0100 +--- KIWILiveTreePlugin.pm.orig ++++ KIWILiveTreePlugin.pm @@ -109,16 +109,6 @@ sub new } # /constructor @@ -59,8 +59,8 @@ } Index: KIWIDescrPlugin.pm =================================================================== ---- KIWIDescrPlugin.pm.orig 2012-03-05 13:56:09.045673886 +0100 -+++ KIWIDescrPlugin.pm 2012-03-10 15:14:03.808988785 +0100 +--- KIWIDescrPlugin.pm.orig ++++ KIWIDescrPlugin.pm @@ -230,6 +230,25 @@ sub executeDir return 1; } @@ -87,3 +87,171 @@ if($this->{m_compress} =~ m{yes}i) { foreach my $pfile(glob("$targetdir/packages*")) { +Index: KIWIPromoDVDPlugin.ini +=================================================================== +--- /dev/null ++++ KIWIPromoDVDPlugin.ini +@@ -0,0 +1,5 @@ ++[base] ++name = KIWIPromoDVDPlugin ++order = 7 ++defaultenable = 1 ++ +Index: KIWIPromoDVDPlugin.pm +=================================================================== +--- /dev/null ++++ KIWIPromoDVDPlugin.pm +@@ -0,0 +1,153 @@ ++################################################################ ++# Copyright (c) 2012 SUSE ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License version 2 as ++# published by the Free Software Foundation. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program (see the file LICENSE); if not, write to the ++# Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA ++# ++################################################################ ++ ++#================ ++# FILE : KIWIPromoDVDPlugin.pm ++#---------------- ++# PROJECT : OpenSUSE Build-Service ++# COPYRIGHT : (c) 2012 SUSE LINUX Products GmbH, Germany ++# : ++# AUTHOR : Stephan Kulow <coolo(a)suse.de> ++# : ++# BELONGS TO : Operating System images ++# : ++# DESCRIPTION : Module patching mini iso builds ++# : ++# STATUS : Development ++#---------------- ++ ++package KIWIPromoDVDPlugin; ++ ++use strict; ++ ++use base "KIWIBasePlugin"; ++use Data::Dumper; ++use Config::IniFiles; ++use File::Find; ++use File::Basename; ++ ++ ++sub new ++{ ++ # ... ++ # Create a new KIWIPromoDVDPlugin object ++ # --- ++ my $class = shift; ++ my $handler = shift; ++ my $config = shift; ++ ++ my $this = new KIWIBasePlugin($handler); ++ bless ($this, $class); ++ ++ $config =~ m{(.*)/([^/]+)$}; ++ my $configpath = $1; ++ my $configfile = $2; ++ if(not defined($configpath) or not defined($configfile)) { ++ $this->logMsg("E", "wrong parameters in plugin initialisation\n"); ++ return undef; ++ } ++ ++ ## now gather all necessary information from the inifile: ++ #=== ++ # Issue: why duplicate code here? Why not put it into the base class? ++ # Answer: Each plugin may have different options. Some only need a target filename, ++ # whilst some others may need much more. I don't want to specify a complicated framework ++ # for the plugin, it shall just be a simple straightforward way to get information ++ # into the plugin. The idea is that the people who decide on the metadata write ++ # the plugin, and therefore damn well know what it needs and what not. ++ # I'm definitely not bothering PMs with Yet Another File Specification (tm) ++ #--- ++ ++ ## plugin content: ++ #----------------- ++ #[base] ++ #name = KIWIEulaPlugin ++ #order = 3 ++ #defaultenable = 1 ++ # ++ #[target] ++ #targetfile = content ++ #targetdir = $PRODUCT_DIR ++ #media = (list of numbers XOR "all") ++ # ++ my $ini = new Config::IniFiles( -file => "$configpath/$configfile" ); ++ my $name = $ini->val('base', 'name'); # scalar value ++ my $order = $ini->val('base', 'order'); # scalar value ++ my $enable = $ini->val('base', 'defaultenable'); # scalar value ++ ++ # if any of those isn't set, complain! ++ if(not defined($name) ++ or not defined($order) ++ or not defined($enable) ++ ) { ++ $this->logMsg("E", "Plugin ini file <$config> seems broken!\n"); ++ return undef; ++ } ++ ++ $this->name($name); ++ $this->order($order); ++ if($enable != 0) { ++ $this->ready(1); ++ } ++ return $this; ++} ++# /constructor ++ ++# returns: number of patched gfxboot files ++sub execute ++{ ++ my $this = shift; ++ if(not ref($this)) { ++ return undef; ++ } ++ my $retval = 0; ++ # sanity check: ++ if($this->{m_ready} == 0) { ++ return $retval; ++ } ++ ++ my $ismini = $this->collect()->productData()->getVar("FLAVOR"); ++ if(not defined($ismini)) { ++ $this->logMsg("W", "FLAVOR not set?"); ++ return $retval; ++ } ++ if($ismini !~ m{dvd-promo}i) { ++ return $retval; ++ } ++ ++ my $medium = $this->collect()->productData()->getVar("MEDIUM_NAME"); ++ my $name = $this->{m_basesubdir}->{$cd} ) =~ s{.*/(.*)/*$}{$1}; ++ my $cd; ++ find( sub { if (m/initrd.liv/) { $cd = $File::Find::name; } }, $this->handler()->collect()->basedir()); ++ if (!$cd) { ++ $this->logMsg("E", "initrd.liv not found\n"); ++ exit(1); ++ } ++ $this->logMsg("I", "$cd $medium $name"); ++ my $dname = dirname($cd); ++ $this->logMsg("I", "$dname"); ++ system("mkdir -p boot/grub; echo $medium > boot/grub/mbrid"); ++ system("echo boot/grub/mbrid | cpio --create --format=newc --quiet | gzip -9 -f >> $cd"); ++ $this->logMsg("I", "updated $cd"); ++ ++ return $retval; ++} ++ ++1; ++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iscsitarget for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package iscsitarget for openSUSE:Factory checked in at 2012-08-27 15:59:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iscsitarget (Old) and /work/SRC/openSUSE:Factory/.iscsitarget.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iscsitarget", Maintainer is "hare(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/iscsitarget/iscsitarget.changes 2012-04-23 16:11:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iscsitarget.new/iscsitarget.changes 2012-08-27 15:59:28.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 27 11:47:22 UTC 2012 - idonmez(a)suse.com + +- Add iscsitarget-kernel-3.5.patch to fix compilation with kernel + 3.5 : ioc_task_link now returns void. + +------------------------------------------------------------------- New: ---- iscsitarget-kernel-3.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscsitarget.spec ++++++ --- /var/tmp/diff_new_pack.tTRDmr/_old 2012-08-27 15:59:31.000000000 +0200 +++ /var/tmp/diff_new_pack.tTRDmr/_new 2012-08-27 15:59:31.000000000 +0200 @@ -33,6 +33,7 @@ Source2: %{name}.sysconfig Source3: preamble Source4: services +Patch1: iscsitarget-kernel-3.5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %suse_kernel_module_package -n %{name} -p %{S:3} kdump um @@ -55,6 +56,9 @@ %prep %setup -q -n %name-%version-svn +%if 0%{?suse_version} > 1220 +%patch1 -p1 +%endif echo "iscsi_trgt.ko yes" > kernel/Module.supported %build ++++++ iscsitarget-kernel-3.5.patch ++++++ Index: iscsitarget-1.4.20.3-svn/kernel/wthread.c =================================================================== --- iscsitarget-1.4.20.3-svn/kernel/wthread.c +++ iscsitarget-1.4.20.3-svn/kernel/wthread.c @@ -70,7 +70,8 @@ static int worker_thread(void *arg) if (current->io_context) put_io_context(current->io_context); - if (!(current->io_context = ioc_task_link(info->wthread_ioc))) + ioc_task_link(info->wthread_ioc); + if (!(current->io_context = info->wthread_ioc)) info->wthread_ioc = get_task_io_context(current, GFP_KERNEL, -1); add_wait_queue(&info->wthread_sleep, &wait); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ibus-chewing for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package ibus-chewing for openSUSE:Factory checked in at 2012-08-27 15:58:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-chewing (Old) and /work/SRC/openSUSE:Factory/.ibus-chewing.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus-chewing", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-chewing/ibus-chewing.changes 2012-06-26 15:52:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-chewing.new/ibus-chewing.changes 2012-08-27 15:59:00.000000000 +0200 @@ -1,0 +2,26 @@ +Sat Aug 25 16:05:48 UTC 2012 - swyear(a)gmail.com + +- Update to 1.4.2 +- Fixed GitHub issue #7: highlighted text be cut after switch back to pure ibus + by merging pull request #24 from buganini +- Fixed GitHub issue #20: Shift key will send duplicated strings + by merging pull request #22 from buganini +- Fixed GitHub issue #21: somethings wrong with cmake +- Fixed GitHub issue #25: Weird symbol when input with somethings highlighted + by merging pull request #26 from buganini +- Fixed GitHub issue #27: Local path committed into tree +- Fixed: Bug 713033 - [zh_TW] ibus-chewing problem +- Fixed: Bug 745371 - ibus-chewing: mode confusion In Temporary English mode and Chinese mode later on +- Fixed: Google Issue 1172: [ibus-chewing] move elf file to standard directory. +- Fixed: Google Issue 1426: ibus-chewing-1.3.10 installs directory /gconf to root filesystem +- Fixed: Google Issue 1428: ibus-chewing-1.3.10 fails to save it's settings +- Fixed: Google Issue 1481: Some characters are missing when a long string in preedit buffer. +- Fixed: Google Issue 1490: Cannot change INSTAL prefix for ibus-chewing-1.4.0 + +------------------------------------------------------------------- +Thu Aug 23 11:47:00 UTC 2012 - swyear(a)gmail.com + +- Update to 1.4.0 +- fix issue http://code.google.com/p/ibus/issues/detail?id=1481 + +------------------------------------------------------------------- Old: ---- ibus-chewing-1.3.10-Source.tar.gz ibus-chewing-1.3.10-fix_save_setting.patch ibus-chewing-for-1.4.1.diff New: ---- ibus-chewing-1.4.2-Source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-chewing.spec ++++++ --- /var/tmp/diff_new_pack.JwrD31/_old 2012-08-27 15:59:07.000000000 +0200 +++ /var/tmp/diff_new_pack.JwrD31/_new 2012-08-27 15:59:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: ibus-chewing -Version: 1.3.10 +Version: 1.4.2 Release: 0 Summary: The Chewing engine for IBus input platform License: GPL-2.0+ @@ -25,8 +25,6 @@ Url: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz Source1: cmake-fedora-modules.tar.bz2 -Patch1: ibus-chewing-for-1.4.1.diff -Patch2: ibus-chewing-1.3.10-fix_save_setting.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -52,8 +50,6 @@ %prep %setup -q -n %{name}-%{version}-Source -%patch1 -p1 -%patch2 -p1 %build tar -jxvf %{SOURCE1} ++++++ cmake-fedora-modules.tar.bz2 ++++++ ++++ 4386 lines of diff (skipped) ++++++ ibus-chewing-1.3.10-Source.tar.gz -> ibus-chewing-1.4.2-Source.tar.gz ++++++ ++++ 5196 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 gnome-keyring for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at 2012-08-27 15:53:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-keyring (Old) and /work/SRC/openSUSE:Factory/.gnome-keyring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-keyring", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-keyring/gnome-keyring.changes 2012-08-26 11:31:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-keyring.new/gnome-keyring.changes 2012-08-27 15:53:59.000000000 +0200 @@ -4 +4,3 @@ -- Add gnome-keyring-bnc775235-passphrase-cache.patch +- Add gnome-keyring-bnc775235-passphrase-cache.patch: + + Fix gnome-keyring:Passwords cached indefinitely (bnc#775235, + CVE-2012-3466). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit busybox for openSUSE:Factory
by root＠hilbert.suse.de 27 Aug '12

27 Aug '12

Hello community, here is the log from the commit of package busybox for openSUSE:Factory checked in at 2012-08-27 15:52:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox (Old) and /work/SRC/openSUSE:Factory/.busybox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "busybox", Maintainer is "ihno(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/busybox/busybox-static.changes 2012-06-06 18:02:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.busybox.new/busybox-static.changes 2012-08-27 15:52:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 18 07:44:02 UTC 2012 - aj(a)suse.de + +- Add missing sys/resource include (glibc 2.16) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/busybox/busybox.changes 2012-06-06 18:02:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.busybox.new/busybox.changes 2012-08-27 15:52:56.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 1 14:15:40 UTC 2012 - lnussel(a)suse.de + +- fix path in busybox.install (bnc#680153) + +------------------------------------------------------------------- +Wed Jul 18 07:43:58 UTC 2012 - aj(a)suse.de + +- Add missing sys/resource include (glibc 2.16) + +------------------------------------------------------------------- New: ---- busybox-resource.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox-static.spec ++++++ --- /var/tmp/diff_new_pack.57lmS2/_old 2012-08-27 15:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.57lmS2/_new 2012-08-27 15:53:08.000000000 +0200 @@ -33,6 +33,7 @@ Patch100: busybox.install.patch Patch101: busybox-1.18.3-libarchive.patch Patch102: busybox-1.19.4-ext2fs_h.diff +Patch103: busybox-resource.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: uClibc-devel @@ -53,6 +54,7 @@ %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 %{__cp} -a %{S:1} docs/ %{__cp} -a %{S:2} .config find -name CVS | xargs rm -rf ++++++ busybox.spec ++++++ --- /var/tmp/diff_new_pack.57lmS2/_old 2012-08-27 15:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.57lmS2/_new 2012-08-27 15:53:08.000000000 +0200 @@ -32,6 +32,7 @@ Patch100: busybox.install.patch Patch101: %{name}-1.18.3-libarchive.patch Patch102: busybox-1.19.4-ext2fs_h.diff +Patch103: busybox-resource.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,6 +51,7 @@ %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 %{__cp} -a %{S:1} docs/ %{__cp} -a %{S:2} .config find -name CVS | xargs rm -rf ++++++ busybox-resource.patch ++++++ Index: busybox-1.19.4/include/libbb.h =================================================================== --- busybox-1.19.4.orig/include/libbb.h +++ busybox-1.19.4/include/libbb.h @@ -35,6 +35,7 @@ #include <sys/poll.h> #include <sys/ioctl.h> #include <sys/mman.h> +#include <sys/resource.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> ++++++ busybox.install.patch ++++++ --- /var/tmp/diff_new_pack.57lmS2/_old 2012-08-27 15:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.57lmS2/_new 2012-08-27 15:53:08.000000000 +0200 @@ -1,6 +1,13 @@ ---- busybox-1.19.4/applets/install.sh +Index: busybox-1.19.4/applets/install.sh +=================================================================== +--- busybox-1.19.4.orig/applets/install.sh +++ busybox-1.19.4/applets/install.sh -@@ -9,7 +9,7 @@ +@@ -5,11 +5,11 @@ export LC_CTYPE=POSIX + + prefix=$1 + if [ -z "$prefix" ]; then +- echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--scriptwrapper]" ++ echo "usage: busybox.install DESTINATION [--symlinks/--hardlinks/--scriptwrapper]" exit 1 fi @@ -9,3 +16,12 @@ linkopts="" scriptwrapper="n" +@@ -64,7 +64,7 @@ fi + + rm -f "$prefix/bin/busybox" || exit 1 + mkdir -p "$prefix/bin" || exit 1 +-install -m 755 busybox "$prefix/bin/busybox" || exit 1 ++install -m 755 /usr/bin/busybox "$prefix/bin/busybox" || exit 1 + + for i in $h; do + appdir=`dirname "$i"` -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0