July 2014 - openSUSE Commits - openSUSE Mailing Lists

commit irssi for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package irssi for openSUSE:Factory checked in at 2014-07-29 21:22:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irssi (Old) and /work/SRC/openSUSE:Factory/.irssi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "irssi" Changes: -------- --- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2014-07-24 00:33:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.irssi.new/irssi.changes 2014-07-29 21:22:12.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 29 16:16:01 UTC 2014 - mrueckert(a)suse.de + +- disable ssl_passphrase patch but keep it until the discussion + with upstream ended: + https://github.com/irssi/irssi/issues/103 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irssi.spec ++++++ --- /var/tmp/diff_new_pack.Tjgx5E/_old 2014-07-29 21:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Tjgx5E/_new 2014-07-29 21:22:13.000000000 +0200 @@ -97,7 +97,7 @@ %prep %setup -q #patch -%patch1 +#patch1 %patch2 %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nip2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package nip2 for openSUSE:Factory checked in at 2014-07-29 21:21:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nip2 (Old) and /work/SRC/openSUSE:Factory/.nip2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nip2" Changes: -------- --- /work/SRC/openSUSE:Factory/nip2/nip2.changes 2014-06-30 21:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nip2.new/nip2.changes 2014-07-29 21:22:07.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jul 29 08:11:15 UTC 2014 - dmitry_r(a)opensuse.org + +- Update to version 7.40.3 + * fix compile with older libvipes, now goes back to at least 7.30 + * don't test IM by default, in case it's not installed + * get graph display working again with latest libgvc + * fix quoting in magick commands + * auto-fallback to gm if no convert found + * use libxml2 pretty-printer + +------------------------------------------------------------------- Old: ---- nip2-7.40.1.tar.gz New: ---- nip2-7.40.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nip2.spec ++++++ --- /var/tmp/diff_new_pack.gPxoSP/_old 2014-07-29 21:22:08.000000000 +0200 +++ /var/tmp/diff_new_pack.gPxoSP/_new 2014-07-29 21:22:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: nip2 -Version: 7.40.1 +Version: 7.40.3 Release: 0 Summary: Interactive tool for working with large images License: GPL-2.0+ ++++++ nip2-7.40.1.tar.gz -> nip2-7.40.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/nip2/nip2-7.40.1.tar.gz /work/SRC/openSUSE:Factory/.nip2.new/nip2-7.40.3.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit abiword-docs for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package abiword-docs for openSUSE:Factory checked in at 2014-07-29 21:21:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abiword-docs (Old) and /work/SRC/openSUSE:Factory/.abiword-docs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abiword-docs" Changes: -------- --- /work/SRC/openSUSE:Factory/abiword-docs/abiword-docs.changes 2011-10-02 09:46:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.abiword-docs.new/abiword-docs.changes 2014-07-29 21:22:05.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jul 22 12:09:30 UTC 2014 - fstrba(a)suse.com + +- Fix build breakages on openSUSE:Factory + * Gdk-ERROR **: error: XDG_RUNTIME_DIR not set in the environment + * working around by "export XDG_RUNTIME_DIR=/tmp" + +------------------------------------------------------------------- +Wed May 28 11:43:32 UTC 2014 - fstrba(a)suse.com + +- Upgrade to upstream version 3.0.0 + * rebuild against libabiword-3_0-devel + * correspond to abiword 3.0.0 + +------------------------------------------------------------------- Old: ---- abiword-docs-2.8.6.tar.bz2 New: ---- abiword-docs-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abiword-docs.spec ++++++ --- /var/tmp/diff_new_pack.tffQjB/_old 2014-07-29 21:22:07.000000000 +0200 +++ /var/tmp/diff_new_pack.tffQjB/_new 2014-07-29 21:22:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package abiword-docs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,22 @@ # - Name: abiword-docs -Version: 2.8.6 -Release: 5 -License: GPL-2.0 +Version: 3.0.0 +Release: 0 Summary: A Multiplatform Word Processor - Documentation -Url: http://www.abisource.com/ +License: GPL-2.0 Group: Productivity/Office/Word Processor -Source0: http://www.abisource.com/downloads/%{name}/%{version}/%{name}-%{version}.ta… +Url: http://www.abisource.com/ +Source0: http://www.abisource.com/downloads/abiword/3.0.0/source/%{name}-%{version}.… BuildRequires: abiword BuildRequires: fdupes BuildRequires: ghostscript-fonts-std -BuildRequires: libabiword-2_8-devel +BuildRequires: libabiword-3_0-devel Requires: abiword Supplements: abiword -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description AbiWord is a multiplatform word processor with a GTK+ interface on the @@ -44,15 +43,16 @@ %setup -q %build +export XDG_RUNTIME_DIR=/tmp %configure make %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} %fdupes %{buildroot} %files %defattr(-, root, root) -%doc %{_datadir}/abiword-2.8/help/ +%doc %{_datadir}/abiword-3.0/help/ %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit erlang for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package erlang for openSUSE:Factory checked in at 2014-07-29 21:21:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang (Old) and /work/SRC/openSUSE:Factory/.erlang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "erlang" Changes: -------- --- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2014-06-16 21:26:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2014-07-29 21:21:54.000000000 +0200 @@ -1,0 +2,30 @@ +Fri Jun 27 17:56:13 UTC 2014 - matwey.kornilov(a)gmail.com + +- Starting from 17.1 explicit --enable-systemd required +- To remake configure is not required anymore (patches had been dropped) + +------------------------------------------------------------------- +Fri Jun 27 12:26:47 UTC 2014 - kruber(a)zib.de + +- Update to 17.0: + * crypto: Add aes_cfb8 cypher to crypto:block_encrypt and + block_decrypt. + * diameter: Add result code counters for CEA, DWA, and DPA. + * erts: The following built in functions in the erlang and + binary modules now bump an appropriate amount + of reductions and yield when out of reductions: + binary_to_list/1, binary_to_list/3, bitstring_to_list/1, + list_to_binary/1, iolist_to_binary/1, + list_to_bitstring/1, binary:list_to_bin/1 + * hipe: Handle Maps instructions get_map_elements, put_map_assoc, + put_map_exact in the HiPE native code compiler. + * mnesia: The time for inserting locks for a transaction with + large number of locks is reduced significantly. + * ssh: Option max_sessions added to ssh:daemon/{2,3}. + * stdlib: Add maps:get/3 to maps module. The function will + return the supplied default value if the key does not + exist in the map. +- Drop erlang-ppc.patch: has been upstreamed +- Drop fix-armv7hl.patch: has been upstreamed + +------------------------------------------------------------------- Old: ---- erlang-ppc.patch fix-armv7hl.patch otp_doc_html_17.0.tar.gz otp_doc_man_17.0.tar.gz otp_src_17.0.tar.gz New: ---- otp_doc_html_17.1.tar.gz otp_doc_man_17.1.tar.gz otp_src_17.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang.spec ++++++ --- /var/tmp/diff_new_pack.YXMY7C/_old 2014-07-29 21:22:00.000000000 +0200 +++ /var/tmp/diff_new_pack.YXMY7C/_new 2014-07-29 21:22:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: erlang -Version: 17.0 +Version: 17.1 Release: 0 Summary: General-purpose programming language and runtime environment License: ErlPL-1.1 @@ -35,10 +35,6 @@ Source9: README.SUSE # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: otp-R16B-rpath.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch1: erlang-ppc.patch -# PATCH-FIX-UPSTREAM fix-armv7hl.patch - matwey.kornilov(a)gmail.com -- this makes erlang build at Factory:ARM for armv7hl -Patch3: fix-armv7hl.patch # PATCH-FIX-OPENSUSE erlang-not-install-misc.patch - matwey.kornilov(a)gmail.com -- patch from Fedora, this removes unneeded magic Patch4: erlang-not-install-misc.patch # PATCH-FIX-UPSTREAM crypto.patch - matwey.kornilov(a)gmail.com -- fix compilation with disabled EC in openssl @@ -70,6 +66,7 @@ %if 0%{?suse_version} >=1230 BuildRequires: pkgconfig(systemd) +BuildRequires: systemd-devel %{?systemd_requires} %define have_systemd 1 %endif @@ -278,13 +275,10 @@ %prep %setup -q -n otp_src_%{version} %patch0 -p1 -b .rpath -%patch1 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 cp %{S:9} . -./otp_build autoconf # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure # Remove shipped zlib sources @@ -307,6 +301,9 @@ export CXXFLAGS=$CFLAGS %configure \ +%if 0%{?have_systemd} + --enable-systemd \ +%endif --with-ssl=%{_prefix} \ --enable-threads \ --enable-smp-support \ ++++++ otp_doc_html_17.0.tar.gz -> otp_doc_html_17.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/erlang/otp_doc_html_17.0.tar.gz /work/SRC/openSUSE:Factory/.erlang.new/otp_doc_html_17.1.tar.gz differ: char 5, line 1 ++++++ otp_doc_man_17.0.tar.gz -> otp_doc_man_17.1.tar.gz ++++++ ++++ 4930 lines of diff (skipped) ++++++ otp_src_17.0.tar.gz -> otp_src_17.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/erlang/otp_src_17.0.tar.gz /work/SRC/openSUSE:Factory/.erlang.new/otp_src_17.1.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2014-07-29 21:21:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2014-07-13 14:05:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2014-07-29 21:21:51.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 21 14:10:26 UTC 2014 - sndirsch(a)suse.com + +- Update to version 10.2.4 + * Mesa 10.2.4 is a bug fix release which fixes bugs fixed since + the 10.2.3 release + +------------------------------------------------------------------- Old: ---- MesaLib-10.2.3.tar.bz2 New: ---- MesaLib-10.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.5T34Va/_old 2014-07-29 21:21:54.000000000 +0200 +++ /var/tmp/diff_new_pack.5T34Va/_new 2014-07-29 21:21:54.000000000 +0200 @@ -58,10 +58,10 @@ %endif %define _name_archive MesaLib -%define _version 10.2.3 +%define _version 10.2.4 Name: Mesa -Version: 10.2.3 +Version: 10.2.4 Release: 0 BuildRequires: autoconf >= 2.60 BuildRequires: automake ++++++ MesaLib-10.2.3.tar.bz2 -> MesaLib-10.2.4.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/Mesa/MesaLib-10.2.3.tar.bz2 /work/SRC/openSUSE:Factory/.Mesa.new/MesaLib-10.2.4.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-07-29 21:21:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-07-26 11:28:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-07-29 21:21:50.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 28 16:39:10 CEST 2014 - snwint(a)suse.de + +- add missing break +- more dead code cleanup +- fix evil nameserver config bug +- make debugwait option more useful +- make log file script behave +- 5.0.6 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.5.tar.xz New: ---- linuxrc-5.0.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.VDuLqb/_old 2014-07-29 21:21:51.000000000 +0200 +++ /var/tmp/diff_new_pack.VDuLqb/_new 2014-07-29 21:21:51.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.5 +Version: 5.0.6 Release: 0 -Source: linuxrc-5.0.5.tar.xz +Source: linuxrc-5.0.6.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-5.0.5.tar.xz -> linuxrc-5.0.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.5/VERSION new/linuxrc-5.0.6/VERSION --- old/linuxrc-5.0.5/VERSION 2014-07-25 18:15:07.000000000 +0200 +++ new/linuxrc-5.0.6/VERSION 2014-07-28 16:39:01.000000000 +0200 @@ -1 +1 @@ -5.0.5 +5.0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.5/changelog new/linuxrc-5.0.6/changelog --- old/linuxrc-5.0.5/changelog 2014-07-25 18:15:10.000000000 +0200 +++ new/linuxrc-5.0.6/changelog 2014-07-28 16:39:03.000000000 +0200 @@ -1,4 +1,13 @@ -2014-07-25: HEAD +2014-07-28: HEAD + - Merge pull request #13 from openSUSE/sw_0002 + - Sw 0002 + - add missing break + - more dead code cleanup + - fix evil nameserver config bug + - make debugwait option more useful + - make log file script behave + +2014-07-25: 5.0.5 - Merge pull request #12 from openSUSE/sw_0001 - Sw 0001 - remove more parts of old network code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.5/file.c new/linuxrc-5.0.6/file.c --- old/linuxrc-5.0.5/file.c 2014-07-25 18:13:49.000000000 +0200 +++ new/linuxrc-5.0.6/file.c 2014-07-28 16:37:52.000000000 +0200 @@ -149,7 +149,7 @@ { key_tmpfs, "_TmpFS", kf_cmd }, { key_netstop, "NetStop", kf_cfg + kf_cmd }, { key_testmode, "_TestMode", kf_cfg }, - { key_debugwait, "_DebugWait", kf_cfg + kf_cmd + kf_cmd_early }, + { key_debugwait, "DebugWait", kf_cfg + kf_cmd + kf_cmd_early }, { key_expert, "Expert", kf_cfg + kf_cmd }, /* drop it? */ { key_rescue, "Rescue", kf_cfg + kf_cmd }, { key_rootimage, "RootImage", kf_cfg + kf_cmd }, @@ -682,6 +682,7 @@ case key_nameserver: if(*f->value) str_copy(&config.ifcfg.manual->ns, f->value); + break; case key_proxy: url_free(config.url.proxy); @@ -763,7 +764,13 @@ break; case key_debugwait: - if(f->is.numeric) config.debugwait = f->nvalue; + if(f->is.numeric) { + config.debugwait = f->nvalue; + } + else if(*f->value) { + config.debugwait = 1; + slist_append_str(&config.debugwait_list, f->value); + } break; case key_manual: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.5/global.h new/linuxrc-5.0.6/global.h --- old/linuxrc-5.0.5/global.h 2014-07-25 18:13:49.000000000 +0200 +++ new/linuxrc-5.0.6/global.h 2014-07-28 16:37:52.000000000 +0200 @@ -341,6 +341,7 @@ unsigned extramount:1; /* mountpoints.extra is in use */ unsigned textmode:1; /* start yast2 in text mode */ unsigned debugwait:1; /* pop up dialogs at some critical points */ + unsigned debugwait_off:1; /* force debugwait off */ unsigned linemode:2; /* line mode */ unsigned ask_language:1; /* let use choose language */ unsigned ask_keytable:1; /* let user choose keytable */ @@ -403,6 +404,7 @@ char *dev; /* braille device */ char *type; /* braille driver */ } braille; + slist_t *debugwait_list; /* list of positions to stop at; see debugwait */ char *instsys_id; /* instsys id */ char *initrd_id; /* initrd id */ slist_t *disks; /* list of harddisk, without '/dev/' */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.5/net.c new/linuxrc-5.0.6/net.c --- old/linuxrc-5.0.5/net.c 2014-07-25 18:13:49.000000000 +0200 +++ new/linuxrc-5.0.6/net.c 2014-07-28 16:37:52.000000000 +0200 @@ -63,8 +63,8 @@ static void net_wicked_dhcp(void); static void net_cifs_build_options(char **options, char *user, char *password, char *workgroup); -static int ifcfg_write2(char *device, ifcfg_t *ifcfg, int initial); -static int ifcfg_write(char *device, ifcfg_t *ifcfg); +static int ifcfg_write(char *device, ifcfg_t *ifcfg, int initial); +static int _ifcfg_write(char *device, ifcfg_t *ifcfg); static char *inet2str(inet_t *inet, int type); static int net_get_ip(char *text, char **ip, int with_prefix); static int net_check_ip(char *buf, int multi, int with_prefix); @@ -237,7 +237,7 @@ } config.ifcfg.manual->dhcp = 0; - ifcfg_write2(config.ifcfg.manual->device, config.ifcfg.manual, 0); + ifcfg_write(config.ifcfg.manual->device, config.ifcfg.manual, 0); net_wicked_up(config.ifcfg.manual->device); @@ -1097,7 +1097,7 @@ ifcfg = calloc(1, sizeof *ifcfg); ifcfg->dhcp = 1; - ifcfg_write2(device, ifcfg, 0); + ifcfg_write(device, ifcfg, 0); free(ifcfg->type); free(ifcfg); @@ -1962,7 +1962,7 @@ // static config must be used only once if(ifcfg->used && !ifcfg->dhcp) continue; - ifcfg_write2(ifcfg->device, ifcfg, 1); + ifcfg_write(ifcfg->device, ifcfg, 1); } // 2nd, all interfaces with wildcard patterns @@ -1981,7 +1981,7 @@ matched = ifcfg->device ? match_netdevice(hd->unix_dev_name, hwaddr, ifcfg->device) : 0; - if(matched) ifcfg_write2(hd->unix_dev_name, ifcfg, 1); + if(matched) ifcfg_write(hd->unix_dev_name, ifcfg, 1); } } @@ -1997,12 +1997,18 @@ /* - * Wrapper around ifcfg_write() that does some more logging. + * Write ifcfg/ifroute files for device. + * + * May be a dhcp or static config. + * + * Wrapper around _ifcfg_write() that does some more logging. + * + * Note: 'device' is the interface name not including any vlan id. * * If initial is set, mark interface is 'initial'; that is, no further auto * config is tried on it. */ -int ifcfg_write2(char *device, ifcfg_t *ifcfg, int initial) +int ifcfg_write(char *device, ifcfg_t *ifcfg, int initial) { char *ifname = NULL; int i; @@ -2016,11 +2022,6 @@ if(ifcfg->vlan) strprintf(&ifname, "%s.%s", device, ifcfg->vlan); } - // FIXME: the next line is basically correct but shouldn't be here in this place - if(!ifname) { - str_copy(&ifname, config.net.device); - } - // if a device spec is a wildcard patterm, don't allow to overwrite an existing config if(slist_getentry(config.ifcfg.initial, ifname)) { if(ifcfg && ifcfg->pattern) { @@ -2033,7 +2034,7 @@ } } - i = ifcfg_write(device, ifcfg); + i = _ifcfg_write(device, ifcfg); if(i) { str_copy(&config.ifcfg.current, ifname); @@ -2053,30 +2054,30 @@ /* * Write ifcfg/ifroute files for device. * - * - may be a dhcp or static config - * - if global config is used we always create a ***static*** config + * May be a dhcp or static config. + * + * Note1: use ifcfg_write() instead! * - * Note: use ifcfg_write2()! + * Note2: 'device' is the verbatim interface name as used in ifcfg-* or + * ifroute-* (including vlan id) while ifcfg->device may even be a wildcard + * pattern. */ -int ifcfg_write(char *device, ifcfg_t *ifcfg) +int _ifcfg_write(char *device, ifcfg_t *ifcfg) { - char *fname, *s; + char *fname; FILE *fp, *fp2; char *gw = NULL; // allocated char *ns = NULL; // allocated char *domain = NULL; // allocated char *vlan = NULL; // allocated - int global_values = 0; int is_dhcp = 0; slist_t *sl; slist_t *sl_ifcfg = NULL; slist_t *sl_ifroute = NULL; unsigned ptp = 0; - // use global values + // obsolete: use global values if(!device || !ifcfg) { - global_values = 1; - fprintf(stderr, "\n\nXXX Old net config NOT SUPPORTED! XXX\n\n"); printf("\n\nXXX Old net config NOT SUPPORTED! XXX\n\n"); fflush(stdout); @@ -2086,26 +2087,7 @@ return 0; } - fprintf(stderr, "ifcfg_write: device = %s, global = %d, ifcfg = %s\n", device, global_values, ifcfg ? ifcfg->device : ""); - - if(global_values) { - device = config.net.device; - - if(!config.net.hostname.ok) return 0; - - // calculate prefix from netmask if missing - if( - config.net.hostname.ipv4 && - !config.net.hostname.prefix4 && - config.net.netmask.ok && - config.net.netmask.ip.s_addr - ) { - int i = netmask_to_prefix(config.net.netmask.name); - if(i >= 0) config.net.hostname.prefix4 = i; - } - } - - if(!device) return 0; + fprintf(stderr, "ifcfg_write: device = %s, ifcfg = %s\n", device, ifcfg ? ifcfg->device : ""); ptp = check_ptp(device); @@ -2113,9 +2095,9 @@ ptp |= ifcfg->ptp; - // 1. maybe dhcp config, but only if passed explicitly + // 1. maybe dhcp config - if(!global_values && ifcfg->dhcp) { + if(ifcfg->dhcp) { is_dhcp = 1; sl = slist_append_str(&sl_ifcfg, "BOOTPROTO"); @@ -2143,96 +2125,62 @@ str_copy(&sl->value, "auto"); if(!is_dhcp) { - if(global_values) { - char *ip1 = NULL, *ip2 = NULL; - - if((s = inet2str(&config.net.hostname, 4))) { - if(asprintf(&ip1, "%s/%u", s, config.net.hostname.prefix4) == -1) ip1 = NULL; - } + int i; + slist_t *sl0, *sl1; - if((s = inet2str(&config.net.hostname, 6))) { - if(asprintf(&ip2, "%s/%u", s, config.net.hostname.prefix6) == -1) ip2 = NULL; - } + str_copy(&gw, ifcfg->gw); + str_copy(&ns, ifcfg->ns); + str_copy(&domain, ifcfg->domain); + if(ifcfg->vlan) { + strprintf(&vlan, ".%s", ifcfg->vlan); + sl = slist_append_str(&sl_ifcfg, "ETHERDEVICE"); + str_copy(&sl->value, device); + } - if(ip1 && ip2) { - sl = slist_append_str(&sl_ifcfg, "IPADDR_1"); - str_copy(&sl->value, ip1); - sl = slist_append_str(&sl_ifcfg, "IPADDR_2"); - str_copy(&sl->value, ip2); + if((sl0 = slist_split(' ', ifcfg->ip))) { + if(!sl0->next) { + sl = slist_append_str(&sl_ifcfg, "IPADDR"); + str_copy(&sl->value, sl0->key); + if(ifcfg->netmask_prefix > 0 && !strchr(sl->value, '/')) { + strprintf(&sl->value, "%s/%d", sl->value, ifcfg->netmask_prefix); + } } else { - if(!ip1) { - ip1 = ip2; - ip2 = NULL; + for(i = 0, sl1 = sl0; sl1; sl1 = sl1->next) { + sl = slist_append(&sl_ifcfg, slist_new()); + strprintf(&sl->key, "IPADDR_%d", ++i); + str_copy(&sl->value, sl1->key); + if(ifcfg->netmask_prefix > 0 && !strchr(sl->value, '/')) { + strprintf(&sl->value, "%s/%d", sl->value, ifcfg->netmask_prefix); + } } - sl = slist_append_str(&sl_ifcfg, "IPADDR"); - str_copy(&sl->value, ip1); } - free(ip1); - free(ip2); - - // net_apply_ethtool() - // ETHTOOL_OPTIONS + sl0 = slist_free(sl0); } - else { - int i; - slist_t *sl0, *sl1; - str_copy(&gw, ifcfg->gw); - str_copy(&ns, ifcfg->ns); - str_copy(&domain, ifcfg->domain); - if(ifcfg->vlan) { - strprintf(&vlan, ".%s", ifcfg->vlan); - sl = slist_append_str(&sl_ifcfg, "ETHERDEVICE"); - str_copy(&sl->value, device); - } - - if((sl0 = slist_split(' ', ifcfg->ip))) { + if(ptp) { + if((sl0 = slist_split(' ', ifcfg->gw))) { if(!sl0->next) { - sl = slist_append_str(&sl_ifcfg, "IPADDR"); + sl = slist_append_str(&sl_ifcfg, "REMOTE_IPADDR"); str_copy(&sl->value, sl0->key); - if(ifcfg->netmask_prefix > 0 && !strchr(sl->value, '/')) { - strprintf(&sl->value, "%s/%d", sl->value, ifcfg->netmask_prefix); - } } else { for(i = 0, sl1 = sl0; sl1; sl1 = sl1->next) { sl = slist_append(&sl_ifcfg, slist_new()); - strprintf(&sl->key, "IPADDR_%d", ++i); + strprintf(&sl->key, "REMOTE_IPADDR_%d", ++i); str_copy(&sl->value, sl1->key); - if(ifcfg->netmask_prefix > 0 && !strchr(sl->value, '/')) { - strprintf(&sl->value, "%s/%d", sl->value, ifcfg->netmask_prefix); - } } } sl0 = slist_free(sl0); } + } - if(ptp) { - if((sl0 = slist_split(' ', ifcfg->gw))) { - if(!sl0->next) { - sl = slist_append_str(&sl_ifcfg, "REMOTE_IPADDR"); - str_copy(&sl->value, sl0->key); - } - else { - for(i = 0, sl1 = sl0; sl1; sl1 = sl1->next) { - sl = slist_append(&sl_ifcfg, slist_new()); - strprintf(&sl->key, "REMOTE_IPADDR_%d", ++i); - str_copy(&sl->value, sl1->key); - } - } - - sl0 = slist_free(sl0); - } - } - - for (sl = ifcfg->flags; sl; sl = sl->next) { - if(!(sl1 = slist_getentry(sl_ifcfg, sl->key))) sl1 = slist_append(&sl_ifcfg, slist_new()); - str_copy(&sl1->key, sl->key); - str_copy(&sl1->value, sl->value); - } + for (sl = ifcfg->flags; sl; sl = sl->next) { + if(!(sl1 = slist_getentry(sl_ifcfg, sl->key))) sl1 = slist_append(&sl_ifcfg, slist_new()); + str_copy(&sl1->key, sl->key); + str_copy(&sl1->value, sl->value); } } @@ -2257,28 +2205,15 @@ // 3. create ifroute entries if(!is_dhcp) { - if((global_values && config.net.gateway.ok) || gw) { - if(global_values) { - if((s = inet2str(&config.net.gateway, 4))) { - sl = slist_append(&sl_ifroute, slist_new()); - strprintf(&sl->key, "default %s - %s", s, device); - } + if(gw) { + slist_t *sl1, *sl0 = slist_split(' ', ifcfg->gw); - if((s = inet2str(&config.net.gateway, 6))) { - sl = slist_append(&sl_ifroute, slist_new()); - strprintf(&sl->key, "default %s - %s", s, device); - } + for(sl1 = sl0; sl1; sl1 = sl1->next) { + sl = slist_append(&sl_ifroute, slist_new()); + strprintf(&sl->key, "default %s - %s", sl1->key, device); } - else { - slist_t *sl1, *sl0 = slist_split(' ', ifcfg->gw); - - for(sl1 = sl0; sl1; sl1 = sl1->next) { - sl = slist_append(&sl_ifroute, slist_new()); - strprintf(&sl->key, "default %s - %s", sl1->key, device); - } - slist_free(sl0); - } + slist_free(sl0); } } @@ -2553,6 +2488,8 @@ sleep(1); + LXRC_WAIT + net_update_state(); str_copy(&buf, NULL); @@ -2574,6 +2511,8 @@ sleep(1); + LXRC_WAIT + net_update_state(); str_copy(&buf, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.5/util.c new/linuxrc-5.0.6/util.c --- old/linuxrc-5.0.5/util.c 2014-07-25 18:13:49.000000000 +0200 +++ new/linuxrc-5.0.6/util.c 2014-07-28 16:37:52.000000000 +0200 @@ -2423,7 +2423,7 @@ /* * copy strings, *dst points to malloc'ed memory */ -void str_copy(char **dst, char *src) +void str_copy(char **dst, const char *src) { char *s; @@ -3940,44 +3940,70 @@ } +/* + * Stop and allow to start a shell. + * + * Current code position is passed as arg. + * + * Useful for debugging. See linuxrc.debug and debug.wait options. + */ void util_wait(const char *file, int line) { - if(!config.debugwait) return; + char *pos = NULL, *s; - fprintf(stderr, "%s(%d)\n", file, line); - printf("%s(%d) ?", file, line); + if(!config.debugwait || config.debugwait_off) return; - switch(getchar()) { - case 'q': - util_umount_all(); - util_clear_downloads(); - config.debugwait = 0; - lxrc_end(); - exit(0); - break; + str_copy(&pos, file); + if((s = strrchr(pos, '.'))) *s = 0; + strprintf(&pos, "%s:%d", pos, line); - case 's': - kbd_end(0); - if(config.win) disp_cursor_on(); - if(!config.linemode) { - printf("\033c"); - if(config.utf8) printf("\033%%G"); - fflush(stdout); - } + if( + !config.debugwait_list || + slist_getentry(config.debugwait_list, pos) + ) { + fprintf(stderr, "== %s ==\n", pos); + printf("== %s ==\n(enter = next, s = shell, c = continue normally, q = quit)? ", pos); - system("PS1='\\w # ' /bin/bash 2>&1"); + switch(getchar()) { + case 'q': + util_umount_all(); + util_clear_downloads(); + config.debugwait = 0; + lxrc_end(); + exit(0); + break; - kbd_init(0); - if(config.win) { - disp_cursor_off(); - if(!config.linemode) disp_restore_screen(); - } + case 's': + kbd_end(0); + if(config.win) disp_cursor_on(); + if(!config.linemode) { + printf("\033c"); + if(config.utf8) printf("\033%%G"); + fflush(stdout); + } - default: - break; + system("PS1='\\w # ' /bin/bash 2>&1"); + + kbd_init(0); + if(config.win) { + disp_cursor_off(); + if(!config.linemode) disp_restore_screen(); + } + break; + + case 'c': + config.debugwait_off = 1; + break; + + default: + break; + } } + + str_copy(&pos, NULL); } + void util_umount_all_devices () { FILE *fd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.5/util.h new/linuxrc-5.0.6/util.h --- old/linuxrc-5.0.5/util.h 2014-07-25 18:13:49.000000000 +0200 +++ new/linuxrc-5.0.6/util.h 2014-07-28 16:37:52.000000000 +0200 @@ -70,7 +70,7 @@ void name2inet(inet_t *inet, char *name); void s_addr2inet(inet_t *inet, unsigned long s_addr); char *inet2print(inet_t *inet); -void str_copy(char **dst, char *src); +void str_copy(char **dst, const char *src); void strprintf(char **buf, char *format, ...) __attribute__ ((format (printf, 2, 3))); char *get_instmode_name(instmode_t instmode); char *get_instmode_name_up(instmode_t instmode); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cifs-utils for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package cifs-utils for openSUSE:Factory checked in at 2014-07-29 21:21:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cifs-utils (Old) and /work/SRC/openSUSE:Factory/.cifs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cifs-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/cifs-utils/cifs-utils.changes 2014-06-26 10:42:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cifs-utils.new/cifs-utils.changes 2014-07-29 21:21:49.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 28 11:27:12 UTC 2014 - lmuelle(a)suse.com + +- Update to cifs-utils 6.4. + + allow PAM directory to be configurable + - Make_the_PAM_security_directory_configurable_at_compile_time.patch + + better determination of default keytab file + + better cifscreds error handling + + uppercase devicename when retrying mount + +------------------------------------------------------------------- Old: ---- Make_the_PAM_security_directory_configurable_at_compile_time.patch cifs-utils-6.3.tar.bz2 cifs-utils-6.3.tar.bz2.asc New: ---- cifs-utils-6.4.tar.bz2 cifs-utils-6.4.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cifs-utils.spec ++++++ --- /var/tmp/diff_new_pack.Cu1xR1/_old 2014-07-29 21:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Cu1xR1/_new 2014-07-29 21:21:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: cifs-utils -Version: 6.3 +Version: 6.4 Release: 0 Summary: Utilities for doing and managing mounts of the Linux CIFS filesyste License: GPL-3.0+ @@ -35,7 +35,6 @@ Source2: mkinitrd_scripts_boot-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh Source4: cifstab -Patch: Make_the_PAM_security_directory_configurable_at_compile_time.patch %if 0%{?suse_version} PreReq: insserv %{?fillup_prereq} mkinitrd %else @@ -117,7 +116,6 @@ %prep %{?gpg_verify: %gpg_verify --keyring %{SOURCE6} %{SOURCE5}} %setup -q -%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie" ++++++ cifs-utils-6.3.tar.bz2 -> cifs-utils-6.4.tar.bz2 ++++++ ++++ 2259 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 samba for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2014-07-29 21:21:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "samba" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2014-07-16 16:37:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2014-07-29 21:21:47.000000000 +0200 @@ -1,0 +2,66 @@ +Mon Jul 28 10:12:04 UTC 2014 - lmuelle(a)suse.com + +- Update to 4.1.10. + + net/doc: Make clear that net vampire is for NT4 domains only; (bso#3263). + + dbcheck: Add check and test for various invalid userParameters values; + (bso#8077). + + s4:dsdb/samldb: Don't allow 'userParameters' to be modified over LDAP for + now; (bso#8077). + + Simple use case results in "no talloc stackframe around, leaking memory" + error; (bso#8449). + + s4:dsdb/repl_meta_data: Make sure objectGUID can't be deleted; (bso#9763). + + dsdb: Always store and return the userParameters as a array of LE 16-bit + values; (bso#10130). + + s4:repl_meta_data: fix array assignment in + replmd_process_linked_attribute(); (bso#10294). + + ldb-samba: fix a memory leak in ldif_canonicalise_objectCategory(); + (bso#10469). + + dbchecker: Verify and fix broken dn values; (bso#10536). + + dsdb: Rename private_data to rootdse_private_data in rootdse; (bso#10582). + + s3: libsmbclient: Work around bugs in SLES cifsd and Apple smbx SMB1 + servers; (bso#10587). + + Fix "PANIC: assert failed at ../source3/smbd/open.c(1582): ret"; + (bso#10593). + + rid_array used before status checked - segmentation fault due to null + pointer dereference; (bso#10627). + + Samba won't start on a machine configured with only IPv4; (bso#10653). + + msg_channel: Fix a 100% CPU loop; (bso#10663). + + s3: smbd: Prevent file truncation on an open that fails with share mode + violation; (bso#10671); (bnc#884056). + + s3: SMB2: Fix leak of blocking lock records in the database; (bso#10673). + + samba-tool: Add --site parameter to provision command; (bso#10674). + + smbstatus: Fix an uninitialized variable; (bso#10680). + + SMB1 blocking locks can fail notification on unlock, causing client + timeout; (bso#10684). + + s3: smbd: Locking, fix off-by one calculation in brl_pending_overlap(); + (bso#10685). + + 'RW2' smbtorture test fails when -N <numprocs> is set to 2 due to the + invalid status check in the second client; (bso#10687). + + wbcCredentialCache fails if challenge_blob is not first; (bso#10692). + + Backport ldb-1.1.17 + changes from master; (bso#10693). + + Fix SEGV from improperly formed SUBSTRING/PRESENCE filter; (bso#10693). + + ldb: Add a env variable to disable RTLD_DEEPBIND; (bso#10693). + + ldb: Do not build libldb-cmdline when using system ldb; (bso#10693). + + ldb: Fix 1138330 Dereference null return value, fix CIDs 241329, 240798, + 1034791, 1034792 1034910, 1034910); (bso#10693). + + ldb: make the successful ldb_transaction_start() message clearer; + (bso#10693). + + ldb:pyldb: Add some more helper functions for LdbDn; (bso#10693). + + ldb: Use of NULL pointer bugfix; (bso#10693). + + lib/ldb: Fix compiler warnings; (bso#10693). + + pyldb: Decrement ref counters on py_results and quiet warnings; + (bso#10693). + + s4-openldap: Remove use of talloc_reference in ldb_map_outbound.c; + (bso#10693). + + dsdb: Return NO_SUCH_OBJECT if a basedn is a deleted object; (bso#10694). + + s4:dsdb/extended_dn_in: Don't force DSDB_SEARCH_SHOW_RECYCLED; (bso#10694). + + Backport autobuild/selftest fixes from master; (bso#10696). + + Backport drs-crackname fixes from master; (bso#10698). + + smbd: Avoid double-free in get_print_db_byname; (bso#10699). + + Backport access check related fixes from master; (bso#10700). + + Backport provision fixes from master; (bso#10703). + + s3:smb2_read: let smb2_sendfile_send_data() behave like send_file_readX(); + (bso#10706). + + s3: Fix missing braces in nfs4_acls.c. + +------------------------------------------------------------------- Old: ---- samba-4.1.9.tar.asc samba-4.1.9.tar.gz New: ---- samba-4.1.10.tar.asc samba-4.1.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.Z63boc/_old 2014-07-29 21:21:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Z63boc/_new 2014-07-29 21:21:48.000000000 +0200 @@ -121,7 +121,7 @@ BuildRequires: systemd BuildRequires: systemd-devel %endif -%define samba_ver 4.1.9 +%define samba_ver 4.1.10 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz @@ -148,11 +148,11 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3263 +%define SOURCE_TIMESTAMP 3266 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.1.9 +Version: 4.1.10 Release: 0 Url: http://www.samba.org/ Provides: samba-gplv3 = %{version} @@ -2010,7 +2010,6 @@ %{_libdir}/samba/libidmap.so %{_libdir}/samba/libinterfaces.so %{_libdir}/samba/libkrb5samba.so -%{_libdir}/samba/libldb-cmdline.so %{_libdir}/samba/libldbsamba.so %{_libdir}/samba/liblibcli_lsa3.so %{_libdir}/samba/liblibcli_netlogon3.so ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/13d840ad2ff0db7320e0cbef86cd47872493292c new/patches/samba.org/13d840ad2ff0db7320e0cbef86cd47872493292c --- old/patches/samba.org/13d840ad2ff0db7320e0cbef86cd47872493292c 2014-06-03 21:37:47.000000000 +0200 +++ new/patches/samba.org/13d840ad2ff0db7320e0cbef86cd47872493292c 2014-07-28 12:24:29.000000000 +0200 @@ -99,7 +99,7 @@ index d3cd33e..506d6d1 100644 --- source3/smbd/server.c +++ source3/smbd/server.c -@@ -1064,6 +1064,8 @@ extern void build_options(bool screen); +@@ -1068,6 +1068,8 @@ extern void build_options(bool screen); .cancel_pending_lock_requests_by_fid = smbd_cancel_pending_lock_requests_by_fid, .send_stat_cache_delete_message = smbd_send_stat_cache_delete_message, .change_to_root_user = smbd_change_to_root_user, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f new/patches/samba.org/1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f --- old/patches/samba.org/1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f 2014-06-25 14:49:28.000000000 +0200 +++ new/patches/samba.org/1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -From 906812aad2d1fec04076259f1d5332220b95221a Mon Sep 17 00:00:00 2001 -From: Volker Lendecke <vl(a)samba.org> -Date: Wed, 25 Jun 2014 08:36:47 +0000 -Subject: [PATCH 2/2] smbd: Remove 2 indentation levels - -Signed-off-by: Volker Lendecke <vl(a)samba.org> -Reviewed-by: David Disseldorp <ddiss(a)samba.org> -(cherry picked from commit 1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f) ---- - source3/smbd/open.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -Index: source3/smbd/open.c -=================================================================== ---- source3/smbd/open.c.orig -+++ source3/smbd/open.c -@@ -2651,17 +2651,17 @@ static NTSTATUS open_file_ntcreate(conne - } - - /* Should we atomically (to the client at least) truncate ? */ -- if (!new_file_created) { -- if (flags2 & O_TRUNC) { -- if (!S_ISFIFO(fsp->fsp_name->st.st_ex_mode)) { -- int ret = vfs_set_filelen(fsp, 0); -- if (ret != 0) { -- status = map_nt_error_from_unix(errno); -- TALLOC_FREE(lck); -- fd_close(fsp); -- return status; -- } -- } -+ if ((!new_file_created) && -+ (flags2 & O_TRUNC) && -+ (!S_ISFIFO(fsp->fsp_name->st.st_ex_mode))) { -+ int ret; -+ -+ ret = vfs_set_filelen(fsp, 0); -+ if (ret != 0) { -+ status = map_nt_error_from_unix(errno); -+ TALLOC_FREE(lck); -+ fd_close(fsp); -+ return status; - } - } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/31b3427a417217e5e869baafdf63e633efc39d12 new/patches/samba.org/31b3427a417217e5e869baafdf63e633efc39d12 --- old/patches/samba.org/31b3427a417217e5e869baafdf63e633efc39d12 2014-06-25 14:49:28.000000000 +0200 +++ new/patches/samba.org/31b3427a417217e5e869baafdf63e633efc39d12 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -From d038b70b159fd133060ead0bed8d70b654594b03 Mon Sep 17 00:00:00 2001 -From: Jeremy Allison <jra(a)samba.org> -Date: Tue, 24 Jun 2014 14:19:30 -0700 -Subject: [PATCH 1/2] s3: smbd - Prevent file truncation on an open that fails - with share mode violation. - -Fix from Volker, really - just tidied up a little. -The S_ISFIFO check may not be strictly neccessary, -but doesn't hurt (might make the code a bit more complex -than it needs to be). - -Fixes bug #10671 - Samba file corruption as a result of failed lock check. - -https://bugzilla.samba.org/show_bug.cgi?id=10671 - -Signed-off-by: Jeremy Allison <jra(a)samba.org> -Reviewed-by: Volker Lendecke <vl(a)samba.org> -Reviewed-by: David Disseldorp <ddiss(a)samba.org> -(cherry picked from commit 31b3427a417217e5e869baafdf63e633efc39d12) -[ddiss(a)samba.org: 4.1 backport] ---- - source3/smbd/open.c | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -Index: source3/smbd/open.c -=================================================================== ---- source3/smbd/open.c.orig -+++ source3/smbd/open.c -@@ -840,8 +840,11 @@ static NTSTATUS open_file(files_struct * - } - } - -- /* Actually do the open */ -- status = fd_open_atomic(conn, fsp, local_flags, -+ /* -+ * Actually do the open - if O_TRUNC is needed handle it -+ * below under the share mode lock. -+ */ -+ status = fd_open_atomic(conn, fsp, local_flags & ~O_TRUNC, - unx_mode, p_file_created); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(3,("Error opening file %s (%s) (local_flags=%d) " -@@ -2647,6 +2650,21 @@ static NTSTATUS open_file_ntcreate(conne - return status; - } - -+ /* Should we atomically (to the client at least) truncate ? */ -+ if (!new_file_created) { -+ if (flags2 & O_TRUNC) { -+ if (!S_ISFIFO(fsp->fsp_name->st.st_ex_mode)) { -+ int ret = vfs_set_filelen(fsp, 0); -+ if (ret != 0) { -+ status = map_nt_error_from_unix(errno); -+ TALLOC_FREE(lck); -+ fd_close(fsp); -+ return status; -+ } -+ } -+ } -+ } -+ - grant_fsp_oplock_type(fsp, - oplock_request, - got_level2_oplock, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/9a3d4d484e0868d9174f37a8dfd9efd4e77c044d new/patches/samba.org/9a3d4d484e0868d9174f37a8dfd9efd4e77c044d --- old/patches/samba.org/9a3d4d484e0868d9174f37a8dfd9efd4e77c044d 2014-06-03 21:37:47.000000000 +0200 +++ new/patches/samba.org/9a3d4d484e0868d9174f37a8dfd9efd4e77c044d 2014-07-28 12:23:20.000000000 +0200 @@ -25,7 +25,7 @@ #include "passdb/lookup_sid.h" #include "auth.h" #include "serverid.h" -@@ -4018,6 +4039,17 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, +@@ -4036,6 +4057,17 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2014-07-08 14:51:46.000000000 +0200 +++ new/patches/series 2014-07-28 12:30:09.000000000 +0200 @@ -77,8 +77,6 @@ samba.org/57a4319baaee011f2604eadeac655ff1c84d4312 -p0 # bnc 866927 samba.org/4f9dd94819b5cebe53bbc34d69df408f2eb1e800 -p0 # bnc 866927 samba.org/c8519003a34dc7db44854a3d844d1c7432d52a78 -p0 # bso 10624 -samba.org/31b3427a417217e5e869baafdf63e633efc39d12 -p0 # bso 10671, bnc 884056 -samba.org/1dc5c20c8f7d8aa96fa0601bf5bf6dc69fb79d9f -p0 # bso 10671, bnc 884056 samba.org/55c279f0c4cc915d2cd7bb07ce0628fe42700890 -p0 # bnc 865627 samba.org/fix_pc_dependencies.diff -p0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/0005-torture-add-mgmt-test-suite.patch new/patches/suse/0005-torture-add-mgmt-test-suite.patch --- old/patches/suse/0005-torture-add-mgmt-test-suite.patch 2014-04-30 15:48:20.000000000 +0200 +++ new/patches/suse/0005-torture-add-mgmt-test-suite.patch 2014-07-28 12:34:23.000000000 +0200 @@ -19,7 +19,7 @@ index 54b7456..f2673a4 100644 --- selftest/knownfail +++ selftest/knownfail -@@ -219,6 +219,7 @@ +@@ -220,6 +220,7 @@ ^samba3.rpc.spoolss.printer.addprinterex.driver_info_winreg # knownfail or flapping? ^samba3.rpc.spoolss.printer.*.publish_toggle$.*$$ # needs spoolss AD member env ^samba3.rpc.spoolss.printserver.*.add_processor$.*$$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/0021-fsrvp-add-fss_agent-RPC-server.patch new/patches/suse/0021-fsrvp-add-fss_agent-RPC-server.patch --- old/patches/suse/0021-fsrvp-add-fss_agent-RPC-server.patch 2014-06-03 21:37:47.000000000 +0200 +++ new/patches/suse/0021-fsrvp-add-fss_agent-RPC-server.patch 2014-07-28 12:35:38.000000000 +0200 @@ -2078,7 +2078,7 @@ #ifdef WITH_DFS extern int dcelogin_atmost_once; #endif /* WITH_DFS */ -@@ -1505,6 +1508,10 @@ extern void build_options(bool screen); +@@ -1509,6 +1512,10 @@ extern void build_options(bool screen); start_lsasd(ev_ctx, msg_ctx); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/0033-selftest-run-the-FSRVP-test-suite-against-s3.patch new/patches/suse/0033-selftest-run-the-FSRVP-test-suite-against-s3.patch --- old/patches/suse/0033-selftest-run-the-FSRVP-test-suite-against-s3.patch 2014-04-30 15:48:20.000000000 +0200 +++ new/patches/suse/0033-selftest-run-the-FSRVP-test-suite-against-s3.patch 2014-07-28 12:36:30.000000000 +0200 @@ -13,7 +13,7 @@ index f2673a4..79b4fd0 100644 --- selftest/knownfail +++ selftest/knownfail -@@ -220,6 +220,7 @@ +@@ -221,6 +221,7 @@ ^samba3.rpc.spoolss.printer.*.publish_toggle$.*$$ # needs spoolss AD member env ^samba3.rpc.spoolss.printserver.*.add_processor$.*$$ ^samba4.rpc.srv_mgmt # needs svcctl named pipe ++++++ samba-4.1.9.tar.gz -> samba-4.1.10.tar.gz ++++++ /work/SRC/openSUSE:Factory/samba/samba-4.1.9.tar.gz /work/SRC/openSUSE:Factory/.samba.new/samba-4.1.10.tar.gz differ: char 5, line 1 ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2014-07-08 14:51:55.000000000 +0200 +++ new/vendor-files/tools/package-data 2014-07-28 13:02:49.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="3263" +SAMBA_PACKAGE_SVN_VERSION="3266" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2014-07-29 21:21:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2014-07-26 12:19:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2014-07-29 21:21:40.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Jul 28 10:08:15 UTC 2014 - werner(a)suse.de + +- Add patch shut-up-rpmlint-on-var-log-journal.patch to avoid + rpmlink warning +- Add upstream patches + 0001-bus-proxyd-fix-incorrect-comparison.patch + 0002-shell-completion-prevent-mangling-unit-names.patch + 0003-Always-check-asprintf-return-code.patch + 0004-bash-completion-use-list-unit-files-to-get-all-units.patch + 0005-core-only-set-the-kernel-s-timezone-when-the-RTC-run.patch + 0006-parse_boolean-require-exact-matches.patch + 0007-drop_duplicates-copy-full-BindMount-struct.patch + 0008-shell-completion-prevent-mangling-unit-names-bash.patch + 0009-journald-always-add-syslog-facility-for-messages-com.patch + +------------------------------------------------------------------- systemd.changes: same change New: ---- 0001-bus-proxyd-fix-incorrect-comparison.patch 0002-shell-completion-prevent-mangling-unit-names.patch 0003-Always-check-asprintf-return-code.patch 0004-bash-completion-use-list-unit-files-to-get-all-units.patch 0005-core-only-set-the-kernel-s-timezone-when-the-RTC-run.patch 0006-parse_boolean-require-exact-matches.patch 0007-drop_duplicates-copy-full-BindMount-struct.patch 0008-shell-completion-prevent-mangling-unit-names-bash.patch 0009-journald-always-add-syslog-facility-for-messages-com.patch shut-up-rpmlint-on-var-log-journal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.yT0nHs/_old 2014-07-29 21:21:44.000000000 +0200 +++ /var/tmp/diff_new_pack.yT0nHs/_new 2014-07-29 21:21:44.000000000 +0200 @@ -31,11 +31,12 @@ %else %define has_efi 0 %endif -%bcond_with permission %if 0%{?suse_version} > 1315 +%bcond_without permission %bcond_without blkrrpart %bcond_without udevsettle %else +%bcond_with permission %bcond_with blkrrpart %bcond_with udevsettle %endif @@ -714,6 +715,8 @@ Patch343: 0003-core-nicer-message-when-inotify-watches-are-exhauste.patch # PATCH-FIX-UPSTREAM Fix patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch Patch344: 0001-detect-virt-Fix-Xen-domU-discovery.patch +# PATCH-FIX-SUSE Shut up rpmlint warning +Patch345: shut-up-rpmlint-on-var-log-journal.patch # PATCH-FIX-UPSTREAM added at 2014/07/21 Patch346: 0002-Be-more-verbose-when-bind-or-listen-fails.patch # PATCH-FIX-UPSTREAM added at 2014/07/21 @@ -728,6 +731,24 @@ Patch351: 0003-systemd-use-pager-for-test-and-help.patch # PATCH-FIX-SUSE Patch352: set-and-use-default-logconsole.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch353: 0001-bus-proxyd-fix-incorrect-comparison.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch354: 0002-shell-completion-prevent-mangling-unit-names.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch355: 0003-Always-check-asprintf-return-code.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch356: 0004-bash-completion-use-list-unit-files-to-get-all-units.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch357: 0005-core-only-set-the-kernel-s-timezone-when-the-RTC-run.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch358: 0006-parse_boolean-require-exact-matches.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch359: 0007-drop_duplicates-copy-full-BindMount-struct.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch360: 0008-shell-completion-prevent-mangling-unit-names-bash.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch361: 0009-journald-always-add-syslog-facility-for-messages-com.patch # UDEV PATCHES # ============ @@ -1346,6 +1367,7 @@ %patch342 -p0 %patch343 -p0 %patch344 -p0 +%patch345 -p1 %patch346 -p0 %patch347 -p0 %patch348 -p0 @@ -1353,6 +1375,15 @@ %patch350 -p0 %patch351 -p0 %patch352 -p0 +%patch353 -p0 +%patch354 -p0 +%patch355 -p0 +%patch356 -p0 +%patch357 -p0 +%patch358 -p0 +%patch359 -p0 +%patch360 -p0 +%patch361 -p0 # udev patches %patch1001 -p1 @@ -1688,7 +1719,7 @@ ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one -mkdir -p %{buildroot}%{_localstatedir}/log/journal +mkdir -p %{buildroot}%{_localstatedir}/log/journal/ # Make sure directories in /var exist mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump @@ -1804,17 +1835,6 @@ ln -sf ../systemd-update-utmp-runlevel.service %{buildroot}%{_prefix}/lib/systemd/system/${runlevel}.target.wants/ done -# Add permission files for logger -%if %{with permission} -mkdir -p %{buildroot}%{_sysconfdir}/permissions.d -cat > %{buildroot}%{_sysconfdir}/permissions.d/systemd-logger <<-'EOF' - %{_localstatedir}/log/journal/ root:systemd-journal 2755 -EOF -cat > %{buildroot}%{_sysconfdir}/permissions.d/systemd-logger.paranoid <<-'EOF' - %{_localstatedir}/log/journal/ root:systemd-journal 2755 -EOF -%endif - %find_lang systemd %pre @@ -1988,7 +2008,7 @@ %if %{with permission} %verifyscript logger -%verify_permissions -e %{_localstatedir}/log/journal +%verify_permissions -e %{_localstatedir}/log/journal/ %endif %pre logger @@ -1997,7 +2017,7 @@ %post logger %if %{with permission} -%set_permissions %{_localstatedir}/log/journal +%set_permissions %{_localstatedir}/log/journal/ %endif getent group wheel && setfacl -Rnm g:wheel:rx,d:g:wheel:rx %{_localstatedir}/log/journal/ > /dev/null 2>&1 || : getent group adm && setfacl -Rnm g:adm:rx,d:g:adm:rx %{_localstatedir}/log/journal/ > /dev/null 2>&1 || : @@ -2016,7 +2036,7 @@ %postun -n nss-myhostname -p /sbin/ldconfig %pre journal-gateway -getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || : +getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal/ -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || : getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || : %service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service exit 0 @@ -2400,11 +2420,7 @@ %files logger %defattr(-,root,root) -%if %{with permission} -%config %{_sysconfdir}/permissions.d/systemd-logger -%config %{_sysconfdir}/permissions.d/systemd-logger.paranoid -%endif -%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal +%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ %{_localstatedir}/log/README /etc/init.d/systemd-journald ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.yT0nHs/_old 2014-07-29 21:21:44.000000000 +0200 +++ /var/tmp/diff_new_pack.yT0nHs/_new 2014-07-29 21:21:44.000000000 +0200 @@ -29,11 +29,12 @@ %else %define has_efi 0 %endif -%bcond_with permission %if 0%{?suse_version} > 1315 +%bcond_without permission %bcond_without blkrrpart %bcond_without udevsettle %else +%bcond_with permission %bcond_with blkrrpart %bcond_with udevsettle %endif @@ -709,6 +710,8 @@ Patch343: 0003-core-nicer-message-when-inotify-watches-are-exhauste.patch # PATCH-FIX-UPSTREAM Fix patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch Patch344: 0001-detect-virt-Fix-Xen-domU-discovery.patch +# PATCH-FIX-SUSE Shut up rpmlint warning +Patch345: shut-up-rpmlint-on-var-log-journal.patch # PATCH-FIX-UPSTREAM added at 2014/07/21 Patch346: 0002-Be-more-verbose-when-bind-or-listen-fails.patch # PATCH-FIX-UPSTREAM added at 2014/07/21 @@ -723,6 +726,24 @@ Patch351: 0003-systemd-use-pager-for-test-and-help.patch # PATCH-FIX-SUSE Patch352: set-and-use-default-logconsole.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch353: 0001-bus-proxyd-fix-incorrect-comparison.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch354: 0002-shell-completion-prevent-mangling-unit-names.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch355: 0003-Always-check-asprintf-return-code.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch356: 0004-bash-completion-use-list-unit-files-to-get-all-units.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch357: 0005-core-only-set-the-kernel-s-timezone-when-the-RTC-run.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch358: 0006-parse_boolean-require-exact-matches.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch359: 0007-drop_duplicates-copy-full-BindMount-struct.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch360: 0008-shell-completion-prevent-mangling-unit-names-bash.patch +# PATCH-FIX-UPSTREAM added at 2014/07/28 +Patch361: 0009-journald-always-add-syslog-facility-for-messages-com.patch # UDEV PATCHES # ============ @@ -1341,6 +1362,7 @@ %patch342 -p0 %patch343 -p0 %patch344 -p0 +%patch345 -p1 %patch346 -p0 %patch347 -p0 %patch348 -p0 @@ -1348,6 +1370,15 @@ %patch350 -p0 %patch351 -p0 %patch352 -p0 +%patch353 -p0 +%patch354 -p0 +%patch355 -p0 +%patch356 -p0 +%patch357 -p0 +%patch358 -p0 +%patch359 -p0 +%patch360 -p0 +%patch361 -p0 # udev patches %patch1001 -p1 @@ -1683,7 +1714,7 @@ ln -s /usr/lib/udev %{buildroot}/lib/udev # Create the /var/log/journal directory to change the volatile journal to a persistent one -mkdir -p %{buildroot}%{_localstatedir}/log/journal +mkdir -p %{buildroot}%{_localstatedir}/log/journal/ # Make sure directories in /var exist mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump @@ -1799,17 +1830,6 @@ ln -sf ../systemd-update-utmp-runlevel.service %{buildroot}%{_prefix}/lib/systemd/system/${runlevel}.target.wants/ done -# Add permission files for logger -%if %{with permission} -mkdir -p %{buildroot}%{_sysconfdir}/permissions.d -cat > %{buildroot}%{_sysconfdir}/permissions.d/systemd-logger <<-'EOF' - %{_localstatedir}/log/journal/ root:systemd-journal 2755 -EOF -cat > %{buildroot}%{_sysconfdir}/permissions.d/systemd-logger.paranoid <<-'EOF' - %{_localstatedir}/log/journal/ root:systemd-journal 2755 -EOF -%endif - %find_lang systemd %pre @@ -1983,7 +2003,7 @@ %if %{with permission} %verifyscript logger -%verify_permissions -e %{_localstatedir}/log/journal +%verify_permissions -e %{_localstatedir}/log/journal/ %endif %pre logger @@ -1992,7 +2012,7 @@ %post logger %if %{with permission} -%set_permissions %{_localstatedir}/log/journal +%set_permissions %{_localstatedir}/log/journal/ %endif getent group wheel && setfacl -Rnm g:wheel:rx,d:g:wheel:rx %{_localstatedir}/log/journal/ > /dev/null 2>&1 || : getent group adm && setfacl -Rnm g:adm:rx,d:g:adm:rx %{_localstatedir}/log/journal/ > /dev/null 2>&1 || : @@ -2011,7 +2031,7 @@ %postun -n nss-myhostname -p /sbin/ldconfig %pre journal-gateway -getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || : +getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal/ -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || : getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || : %service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service exit 0 @@ -2395,11 +2415,7 @@ %files logger %defattr(-,root,root) -%if %{with permission} -%config %{_sysconfdir}/permissions.d/systemd-logger -%config %{_sysconfdir}/permissions.d/systemd-logger.paranoid -%endif -%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal +%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ %{_localstatedir}/log/README /etc/init.d/systemd-journald ++++++ 0001-bus-proxyd-fix-incorrect-comparison.patch ++++++ Based on e05aa2e02ba35d8b3741dddb79af3c802308414b Mon Sep 17 00:00:00 2001 From: Lukas Nykryn <lnykryn(a)redhat.com> Date: Fri, 25 Jul 2014 10:25:06 +0200 Subject: [PATCH] bus-proxyd: fix incorrect comparison We should be interested in k variable. --- src/bus-proxyd/bus-proxyd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- src/bus-proxyd/bus-proxyd.c +++ src/bus-proxyd/bus-proxyd.c 2014-07-28 09:37:29.274735818 +0000 @@ -698,7 +698,7 @@ int main(int argc, char *argv[]) { k = sd_bus_send(a, m, NULL); if (k < 0) { - if (r == -ECONNRESET) + if (k == -ECONNRESET) r = 0; else { r = k; ++++++ 0002-shell-completion-prevent-mangling-unit-names.patch ++++++ Based on 6d314eca15f6cbda38d82774b210f784d3d4f52a Mon Sep 17 00:00:00 2001 From: Eric Cook <llua(a)gmx.com> Date: Sat, 26 Jul 2014 11:15:52 -0400 Subject: [PATCH] shell-completion: prevent mangling unit names Units with literal hex '\xFF' in their names has to be read and printed properly. dev-disk-byx2dlabel-root.device != dev-disk-by\x2dlabel-root.device --- shell-completion/zsh/_systemctl.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git shell-completion/zsh/_systemctl.in shell-completion/zsh/_systemctl.in index d364d17..e681ec6 100644 --- shell-completion/zsh/_systemctl +++ shell-completion/zsh/_systemctl @@ -100,7 +100,7 @@ _systemctl_all_units() if ( [[ ${+_sys_all_units} -eq 0 ]] || _cache_invalid SYS_ALL_UNITS ) && ! _retrieve_cache SYS_ALL_UNITS; then - _sys_all_units=( $(__systemctl list-units --all | { while read a b; do echo " $a"; done; }) ) + _sys_all_units=( $(__systemctl list-units --all | { while read -r a b; do echo -E - " $a"; done; }) ) _store_cache SYS_ALL_UNITS _sys_all_units fi } @@ -113,7 +113,7 @@ _systemctl_really_all_units() if ( [[ ${+_sys_really_all_units} -eq 0 ]] || _cache_invalid SYS_REALLY_ALL_UNITS ) && ! _retrieve_cache SYS_REALLY_ALL_UNITS; then - all_unit_files=( $(__systemctl list-unit-files | { while read a b; do echo " $a"; done; }) ) + all_unit_files=( $(__systemctl list-unit-files | { while read -r a b; do echo -E - " $a"; done; }) ) _systemctl_all_units really_all_units=($_sys_all_units $all_unit_files) _sys_really_all_units=(${(u)really_all_units}) @@ -138,12 +138,12 @@ _filter_units_by_property() { done } -_systemctl_active_units() {_sys_active_units=( $(__systemctl list-units | { while read a b; do echo " $a"; done; }) )} -_systemctl_inactive_units(){_sys_inactive_units=($(__systemctl list-units --all | { while read a b c d; do [[ $c == "inactive" || $c == "failed" ]] && echo " $a"; done; }) )} -_systemctl_failed_units() {_sys_failed_units=( $(__systemctl list-units --failed | { while read a b; do echo " $a"; done; }) )} -_systemctl_enabled_units() {_sys_enabled_units=( $(__systemctl list-unit-files | { while read a b; do [[ $b == "enabled" ]] && echo " $a"; done; }) )} -_systemctl_disabled_units(){_sys_disabled_units=($(__systemctl list-unit-files | { while read a b; do [[ $b == "disabled" ]] && echo " $a"; done; }) )} -_systemctl_masked_units() {_sys_masked_units=( $(__systemctl list-unit-files | { while read a b; do [[ $b == "masked" ]] && echo " $a"; done; }) )} +_systemctl_active_units() {_sys_active_units=( $(__systemctl list-units | { while read -r a b; do echo -E - " $a"; done; }) )} +_systemctl_inactive_units(){_sys_inactive_units=($(__systemctl list-units --all | { while read -r a b c d; do [[ $c == "inactive" || $c == "failed" ]] && echo -E - " $a"; done; }) )} +_systemctl_failed_units() {_sys_failed_units=( $(__systemctl list-units --failed | { while read -r a b; do echo -E - " $a"; done; }) )} +_systemctl_enabled_units() {_sys_enabled_units=( $(__systemctl list-unit-files | { while read -r a b; do [[ $b == "enabled" ]] && echo -E - " $a"; done; }) )} +_systemctl_disabled_units(){_sys_disabled_units=($(__systemctl list-unit-files | { while read -r a b; do [[ $b == "disabled" ]] && echo -E - " $a"; done; }) )} +_systemctl_masked_units() {_sys_masked_units=( $(__systemctl list-unit-files | { while read -r a b; do [[ $b == "masked" ]] && echo -E - " $a"; done; }) )} # Completion functions for ALL_UNITS for fun in is-active is-failed is-enabled status show cat mask preset help list-dependencies ; do @@ -219,8 +219,8 @@ for fun in restart reload-or-restart ; do { _systemctl_all_units compadd "$@" - $( _filter_units_by_property CanStart yes \ - ${_sys_all_units[*]} | while read line; do \ - [[ "$line" =~ \.device$ ]] || echo " $line"; \ + ${_sys_all_units[*]} | while read -r line; do \ + [[ "$line" =~ \.device$ ]] || echo -E - " $line"; \ done ) } done -- 1.7.9.2 ++++++ 0003-Always-check-asprintf-return-code.patch ++++++ Based on 7de80bfe2e61d5818601ccfddbadad3b7703ed70 Mon Sep 17 00:00:00 2001 From: Karel Zak <kzak(a)redhat.com> Date: Fri, 25 Jul 2014 15:38:31 +0200 Subject: [PATCH] Always check asprintf return code There is a small number of the places in sources where we don't check asprintf() return code and assume that after error the function returns NULL pointer via the first argument. That's wrong, after error the content of pointer is undefined. --- src/core/unit-printf.c | 8 ++++---- src/cryptsetup/cryptsetup.c | 11 ++++++++--- src/journal/journalctl.c | 16 +++++++++++----- src/run/run.c | 20 ++++++++++---------- src/shared/install.c | 15 +++++++++------ src/systemctl/systemctl.c | 18 +++++++++--------- src/tty-ask-password-agent/tty-ask-password-agent.c | 5 +++-- 7 files changed, 54 insertions(+), 39 deletions(-) --- src/core/unit-printf.c +++ src/core/unit-printf.c 2014-07-28 09:42:20.726235696 +0000 @@ -182,7 +182,7 @@ static int specifier_user_name(char spec char *printed = NULL; Unit *u = userdata; ExecContext *c; - int r; + int r = 0; assert(u); @@ -208,7 +208,7 @@ static int specifier_user_name(char spec if (r < 0) return -ENODATA; - asprintf(&printed, "%lu", (unsigned long) uid); + r = asprintf(&printed, "%lu", (unsigned long) uid); } } @@ -231,10 +231,10 @@ static int specifier_user_name(char spec if (specifier == 'u') printed = strdup(username); else - asprintf(&printed, "%lu", (unsigned long) uid); + r = asprintf(&printed, "%lu", (unsigned long) uid); } - if (!printed) + if (r < 0 || !printed) return -ENOMEM; *ret = printed; --- src/cryptsetup/cryptsetup.c +++ src/cryptsetup/cryptsetup.c 2014-07-28 00:00:00.000000000 +0000 @@ -535,13 +535,18 @@ int main(int argc, char *argv[]) { description = NULL; } + k = 0; if (mount_point && description) - asprintf(&name_buffer, "%s (%s) on %s", description, argv[2], mount_point); + k = asprintf(&name_buffer, "%s (%s) on %s", description, argv[2], mount_point); else if (mount_point) - asprintf(&name_buffer, "%s on %s", argv[2], mount_point); + k = asprintf(&name_buffer, "%s on %s", argv[2], mount_point); else if (description) - asprintf(&name_buffer, "%s (%s)", description, argv[2]); + k = asprintf(&name_buffer, "%s (%s)", description, argv[2]); + if (k < 0) { + log_oom(); + goto finish; + } name = name_buffer ? name_buffer : argv[2]; k = crypt_init(&cd, argv[3]); --- src/journal/journalctl.c +++ src/journal/journalctl.c 2014-07-28 00:00:00.000000000 +0000 @@ -746,11 +746,17 @@ static int add_matches(sd_journal *j, ch } } else t = strappend("_EXE=", path); - } else if (S_ISCHR(st.st_mode)) - asprintf(&t, "_KERNEL_DEVICE=c%u:%u", major(st.st_rdev), minor(st.st_rdev)); - else if (S_ISBLK(st.st_mode)) - asprintf(&t, "_KERNEL_DEVICE=b%u:%u", major(st.st_rdev), minor(st.st_rdev)); - else { + } else if (S_ISCHR(st.st_mode)) { + if (asprintf(&t, "_KERNEL_DEVICE=c%u:%u", + major(st.st_rdev), + minor(st.st_rdev)) < 0) + return -ENOMEM; + } else if (S_ISBLK(st.st_mode)) { + if (asprintf(&t, "_KERNEL_DEVICE=b%u:%u", + major(st.st_rdev), + minor(st.st_rdev)) < 0) + return -ENOMEM; + } else { log_error("File is neither a device node, nor regular file, nor executable: %s", *i); return -EINVAL; } --- src/run/run.c +++ src/run/run.c 2014-07-28 09:46:36.846235596 +0000 @@ -309,12 +309,12 @@ static int start_transient_service( _cleanup_free_ char *name = NULL; int r; - if (arg_unit) + if (arg_unit) { name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".service"); - else - asprintf(&name, "run-%lu.service", (unsigned long) getpid()); - if (!name) - return -ENOMEM; + if (!name) + return log_oom(); + } else if (asprintf(&name, "run-%lu.service", (unsigned long) getpid()) < 0) + return log_oom(); r = message_start_transient_unit_new(bus, name, &m); if (r < 0) @@ -436,12 +436,12 @@ static int start_transient_scope( assert(bus); - if (arg_unit) + if (arg_unit) { name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".scope"); - else - asprintf(&name, "run-%lu.scope", (unsigned long) getpid()); - if (!name) - return -ENOMEM; + if (!name) + return log_oom(); + } else if (asprintf(&name, "run-%lu.scope", (unsigned long) getpid()) < 0) + return log_oom(); r = message_start_transient_unit_new(bus, name, &m); if (r < 0) --- src/shared/install.c +++ src/shared/install.c 2014-07-28 00:00:00.000000000 +0000 @@ -72,13 +72,16 @@ static int get_config_path(UnitFileScope case UNIT_FILE_SYSTEM: - if (root_dir && runtime) - asprintf(&p, "%s/run/systemd/system", root_dir); - else if (runtime) + if (root_dir && runtime) { + if (asprintf(&p, "%s/run/systemd/system", root_dir) < 0) + return -ENOMEM; + } else if (runtime) p = strdup("/run/systemd/system"); - else if (root_dir) - asprintf(&p, "%s/%s", root_dir, SYSTEM_CONFIG_UNIT_PATH); - else + else if (root_dir) { + if (asprintf(&p, "%s/%s", root_dir, + SYSTEM_CONFIG_UNIT_PATH) < 0) + return -ENOMEM; + } else p = strdup(SYSTEM_CONFIG_UNIT_PATH); break; --- src/systemctl/systemctl.c +++ src/systemctl/systemctl.c 2014-07-28 09:51:40.894735541 +0000 @@ -4639,11 +4639,11 @@ static int enable_sysv_units(const char STRV_FOREACH(k, paths.unit_path) { if (!isempty(arg_root)) - asprintf(&p, "%s/%s/%s", arg_root, *k, name); + j = asprintf(&p, "%s/%s/%s", arg_root, *k, name); else - asprintf(&p, "%s/%s", *k, name); + j = asprintf(&p, "%s/%s", *k, name); - if (!p) { + if (j < 0) { r = log_oom(); goto finish; } @@ -4660,10 +4660,10 @@ static int enable_sysv_units(const char continue; if (!isempty(arg_root)) - asprintf(&p, "%s/" SYSTEM_SYSVINIT_PATH "/%s", arg_root, name); + j = asprintf(&p, "%s/" SYSTEM_SYSVINIT_PATH "/%s", arg_root, name); else - asprintf(&p, SYSTEM_SYSVINIT_PATH "/%s", name); - if (!p) { + j = asprintf(&p, SYSTEM_SYSVINIT_PATH "/%s", name); + if (j < 0) { r = log_oom(); goto finish; } @@ -4676,10 +4676,10 @@ static int enable_sysv_units(const char free(p); p = NULL; if (!isempty(arg_root)) - asprintf(&p, "%s/" SYSTEM_SYSVINIT_PATH "/boot.%s", arg_root, name); + j = asprintf(&p, "%s/" SYSTEM_SYSVINIT_PATH "/boot.%s", arg_root, name); else - asprintf(&p, SYSTEM_SYSVINIT_PATH "/boot.%s", name); - if (!p) { + j = asprintf(&p, SYSTEM_SYSVINIT_PATH "/boot.%s", name); + if (j < 0) { r = log_oom(); goto finish; } --- src/tty-ask-password-agent/tty-ask-password-agent.c +++ src/tty-ask-password-agent/tty-ask-password-agent.c 2014-07-28 00:00:00.000000000 +0000 @@ -102,8 +102,9 @@ static int ask_password_plymouth( if (accept_cached) { packet = strdup("c"); n = 1; - } else - asprintf(&packet, "*\002%c%s%n", (int) (strlen(message) + 1), message, &n); + } else if (asprintf(&packet, "*\002%c%s%n", (int) (strlen(message) + 1), + message, &n) < 0) + packet = NULL; if (!packet) { r = -ENOMEM; ++++++ 0004-bash-completion-use-list-unit-files-to-get-all-units.patch ++++++ Based on c6a373a26348544d944b08bf0c5dea4f72f6980b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek(a)in.waw.pl> Date: Sat, 26 Jul 2014 20:11:58 -0400 Subject: [PATCH] bash-completion: use list-unit-files to get "all" units I think that it is better to return good results slightly more slowly, than partial quickly. Also reading from disk seems fast enough. Even the delay on first try with completely cold cache is acceptable. This is just for bash, 'cause zsh was already doing this. https://bugzilla.redhat.com/show_bug.cgi?id=790768 --- shell-completion/bash/systemctl.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git shell-completion/bash/systemctl.in shell-completion/bash/systemctl.in index c5950cc..69ef04b 100644 --- shell-completion/bash/systemctl +++ shell-completion/bash/systemctl @@ -51,11 +51,13 @@ __filter_units_by_property () { done } -__get_all_units () { __systemctl $1 list-units --all \ +__get_all_units () { { __systemctl $1 list-unit-files; __systemctl $1 list-units --all; } \ | { while read -r a b; do echo " $a"; done; }; } __get_active_units () { __systemctl $1 list-units \ | { while read -r a b; do echo " $a"; done; }; } -__get_startable_units () { __systemctl $1 list-units --all -t service,timer,socket,mount,automount,path,snapshot,swap \ +__get_startable_units () { { + __systemctl $1 list-units --all -t service,timer,socket,mount,automount,path,snapshot,swap + __systemctl $1 list-unit-files -t service,timer,socket,mount,automount,path,snapshot,swap; } \ | { while read -r a b c d; do [[ $c == "inactive" || $c == "failed" ]] && echo " $a"; done; }; } __get_failed_units () { __systemctl $1 list-units \ | { while read -r a b c d; do [[ $c == "failed" ]] && echo " $a"; done; }; } -- 1.7.9.2 ++++++ 0005-core-only-set-the-kernel-s-timezone-when-the-RTC-run.patch ++++++ Based on c264aeab4b0e7b69f469e12e78d4a48b3ed7a66e Mon Sep 17 00:00:00 2001 From: Kay Sievers <kay(a)vrfy.org> Date: Sun, 27 Jul 2014 00:11:08 +0200 Subject: [PATCH] core: only set the kernel's timezone when the RTC runs in local time We can not reliably manage any notion of local time. Every daylight saving time change or time zone change by traveling will make the time jump, and the local time might jump backwards which creates unsolvable problems with file timestamps. We will no longer tell the kernel our local time zone and leave everything set to UTC. This will effectively turn FAT timestamps into UTC timestamps. If and only if the machine is configured to read the RTC in local time mode, the kernel's time zone will be configured, but systemd-timesysnc will disable the kernel's system time to RTC syncing. In this mode, the RTC will not be managed, and external tools like Windows bootups are expected to manage the RTC's time. https://bugs.freedesktop.org/show_bug.cgi?id=81538 --- src/core/main.c | 23 +++++++++++++++-------- src/shared/hwclock.c | 15 ++++++++------- src/shared/hwclock.h | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) --- src/core/main.c +++ src/core/main.c 2014-07-28 09:59:35.778235585 +0000 @@ -1349,7 +1349,14 @@ int main(int argc, char *argv[]) { if (hwclock_is_localtime() > 0) { int min; - /* The first-time call to settimeofday() does a time warp in the kernel */ + /* + * The very first call of settimeofday() also does a time warp in the kernel. + * + * In the rtc-in-local time mode, we set the kernel's timezone, and rely on + * external tools to take care of maintaining the RTC and do all adjustments. + * This matches the behavior of Windows, which leaves the RTC alone if the + * registry tells that the RTC runs in UTC. + */ r = hwclock_set_timezone(&min); if (r < 0) log_error("Failed to apply local time delta, ignoring: %s", strerror(-r)); @@ -1357,19 +1364,19 @@ int main(int argc, char *argv[]) { log_info("RTC configured in localtime, applying delta of %i minutes to system time.", min); } else if (!in_initrd()) { /* - * Do dummy first-time call to seal the kernel's time warp magic + * Do a dummy very first call to seal the kernel's time warp magic. * * Do not call this this from inside the initrd. The initrd might not * carry /etc/adjtime with LOCAL, but the real system could be set up * that way. In such case, we need to delay the time-warp or the sealing * until we reach the real system. + * + * Do no set the kernel's timezone. The concept of local time cannot + * be supported reliably, the time will jump or be incorrect at every daylight + * saving time change. All kernel local time concepts will be treated + * as UTC that way. */ - hwclock_reset_timezone(); - - /* Tell the kernel our timezone */ - r = hwclock_set_timezone(NULL); - if (r < 0) - log_error("Failed to set the kernel's timezone, ignoring: %s", strerror(-r)); + hwclock_reset_timewarp(); } } --- src/shared/hwclock.c +++ src/shared/hwclock.c 2014-07-28 09:59:12.914235566 +0000 @@ -124,9 +124,10 @@ int hwclock_set_timezone(int *min) { tz.tz_dsttime = 0; /* DST_NONE*/ /* - * If the hardware clock does not run in UTC, but in local time: - * The very first time we set the kernel's timezone, it will warp - * the clock so that it runs in UTC instead of local time. + * If the RTC does not run in UTC but in local time, the very first + * call to settimeofday() will set the kernel's timezone and will warp the + * system clock, so that it runs in UTC instead of the local time we + * have read from the RTC. */ if (settimeofday(tv_null, &tz) < 0) return -errno; @@ -135,7 +136,7 @@ int hwclock_set_timezone(int *min) { return 0; } -int hwclock_reset_timezone(void) { +int hwclock_reset_timewarp(void) { const struct timeval *tv_null = NULL; struct timezone tz; @@ -143,9 +144,9 @@ int hwclock_reset_timezone(void) { tz.tz_dsttime = 0; /* DST_NONE*/ /* - * The very first time we set the kernel's timezone, it will warp - * the clock. Do a dummy call here, so the time warping is sealed - * and we set only the timezone with next call. + * The very first call to settimeofday() does time warp magic. Do a + * dummy call here, so the time warping is sealed and all later calls + * behave as expected. */ if (settimeofday(tv_null, &tz) < 0) return -errno; --- src/shared/hwclock.h +++ src/shared/hwclock.h 2014-07-28 09:59:25.034736002 +0000 @@ -23,6 +23,6 @@ int hwclock_is_localtime(void); int hwclock_set_timezone(int *min); -int hwclock_reset_timezone(void); +int hwclock_reset_timewarp(void); int hwclock_get_time(struct tm *tm); int hwclock_set_time(const struct tm *tm); ++++++ 0006-parse_boolean-require-exact-matches.patch ++++++ >From 0f625d0b87139fc18cd565c9b6da05c53a0eb7ab Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt <ansgar(a)debian.org> Date: Sun, 27 Jul 2014 15:19:00 +0200 Subject: [PATCH] parse_boolean: require exact matches Require exact matches in all cases instead of treating strings starting with 't' ('f') as true (false). This is required for config_parse_protect_system to parse ProtectSystem=full correctly: it uses parse_boolean and only tries a more specific parsing function if that did not return a valid result. Thus "full" was treated as "false" before. --- src/shared/util.c | 4 ++-- src/test/test-util.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git src/shared/util.c src/shared/util.c index 4fda31c..49c17ef 100644 --- src/shared/util.c +++ src/shared/util.c @@ -231,9 +231,9 @@ int unlink_noerrno(const char *path) { int parse_boolean(const char *v) { assert(v); - if (streq(v, "1") || v[0] == 'y' || v[0] == 'Y' || v[0] == 't' || v[0] == 'T' || strcaseeq(v, "on")) + if (streq(v, "1") || strcaseeq(v, "yes") || strcaseeq(v, "y") || strcaseeq(v, "true") || strcaseeq(v, "t") || strcaseeq(v, "on")) return 1; - else if (streq(v, "0") || v[0] == 'n' || v[0] == 'N' || v[0] == 'f' || v[0] == 'F' || strcaseeq(v, "off")) + else if (streq(v, "0") || strcaseeq(v, "no") || strcaseeq(v, "n") || strcaseeq(v, "false") || strcaseeq(v, "f") || strcaseeq(v, "off")) return 0; return -EINVAL; diff --git src/test/test-util.c src/test/test-util.c index ed91a67..9a28ef9 100644 --- src/test/test-util.c +++ src/test/test-util.c @@ -129,6 +129,7 @@ static void test_parse_boolean(void) { assert_se(parse_boolean("garbage") < 0); assert_se(parse_boolean("") < 0); + assert_se(parse_boolean("full") < 0); } static void test_parse_pid(void) { -- 1.7.9.2 ++++++ 0007-drop_duplicates-copy-full-BindMount-struct.patch ++++++ >From e2d7c1a0758ce80d7cb439745deefefdffd67655 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt <ansgar(a)debian.org> Date: Sun, 27 Jul 2014 16:32:13 +0200 Subject: [PATCH] drop_duplicates: copy full BindMount struct At least t->ignore = f->ignore; is missing here. Just copy the full struct to be sure. --- src/core/namespace.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git src/core/namespace.c src/core/namespace.c index 5466b7b..fe95377 100644 --- src/core/namespace.c +++ src/core/namespace.c @@ -124,8 +124,7 @@ static void drop_duplicates(BindMount *m, unsigned *n) { if (previous && path_equal(f->path, previous->path)) continue; - t->path = f->path; - t->mode = f->mode; + *t = *f; previous = t; -- 1.7.9.2 ++++++ 0008-shell-completion-prevent-mangling-unit-names-bash.patch ++++++ Based on c317a1a19cd9584e07ee43f1b6fafc26c2c75cca Mon Sep 17 00:00:00 2001 From: Eric Cook <llua(a)gmx.com> Date: Sun, 27 Jul 2014 15:07:03 -0400 Subject: [PATCH] shell-completion: prevent mangling unit names (bash) This fixes the issue noted by Zbigniew in most cases. if a unit's name is enclosed in single quotes completion still will not happen after the first `\'. https://bugs.freedesktop.org/show_bug.cgi?id=78388 --- shell-completion/bash/systemctl.in | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git shell-completion/bash/systemctl.in shell-completion/bash/systemctl.in index 69ef04b..64b15df 100644 --- shell-completion/bash/systemctl +++ shell-completion/bash/systemctl @@ -158,20 +158,25 @@ _systemctl () { elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then comps=$( __get_all_units $mode ) + compopt -o filenames elif __contains_word "$verb" ${VERBS[ENABLED_UNITS]}; then comps=$( __get_enabled_units $mode ) + compopt -o filenames elif __contains_word "$verb" ${VERBS[DISABLED_UNITS]}; then comps=$( __get_disabled_units $mode ) + compopt -o filenames elif __contains_word "$verb" ${VERBS[REENABLABLE_UNITS]}; then comps=$( __get_disabled_units $mode; __get_enabled_units $mode ) + compopt -o filenames elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then comps=$( __filter_units_by_property $mode CanStart yes \ $( __get_startable_units $mode)) + compopt -o filenames elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then comps=$( __filter_units_by_property $mode CanStart yes \ @@ -179,24 +184,30 @@ _systemctl () { | while read -r line; do \ [[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || echo " $line"; \ done )) + compopt -o filenames elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then comps=$( __filter_units_by_property $mode CanStop yes \ $( __get_active_units $mode ) ) + compopt -o filenames elif __contains_word "$verb" ${VERBS[RELOADABLE_UNITS]}; then comps=$( __filter_units_by_property $mode CanReload yes \ $( __get_active_units $mode ) ) + compopt -o filenames elif __contains_word "$verb" ${VERBS[ISOLATABLE_UNITS]}; then comps=$( __filter_units_by_property $mode AllowIsolate yes \ $( __get_all_units $mode ) ) + compopt -o filenames elif __contains_word "$verb" ${VERBS[FAILED_UNITS]}; then comps=$( __get_failed_units $mode ) + compopt -o filenames elif __contains_word "$verb" ${VERBS[MASKED_UNITS]}; then comps=$( __get_masked_units $mode ) + compopt -o filenames elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[NAME]}; then comps='' @@ -221,7 +232,7 @@ _systemctl () { | { while read -r a b; do echo " $a"; done; } ) fi - COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) + COMPREPLY=( $(compgen -o filenames -W '$comps' -- "$cur") ) return 0 } -- 1.7.9.2 ++++++ 0009-journald-always-add-syslog-facility-for-messages-com.patch ++++++ >From 36dd072cdf03dcac0fcd2d6b42f261444dc7ac88 Mon Sep 17 00:00:00 2001 From: Michal Sekletar <msekleta(a)redhat.com> Date: Fri, 25 Jul 2014 14:38:22 +0200 Subject: [PATCH] journald: always add syslog facility for messages coming from kmsg Set SYSLOG_FACILITY field for kernel log messages too. Setting only SYSLOG_IDENTIFIER="kernel" is not sufficient and tools reading journal maybe confused by missing SYSLOG_FACILITY field for kernel log messages. --- src/journal/journald-kmsg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git src/journal/journald-kmsg.c src/journal/journald-kmsg.c index 12992e7..bb62a76 100644 --- src/journal/journald-kmsg.c +++ src/journal/journald-kmsg.c @@ -274,6 +274,9 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) { if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0) IOVEC_SET_STRING(iovec[n++], syslog_priority); + if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0) + IOVEC_SET_STRING(iovec[n++], syslog_facility); + if ((priority & LOG_FACMASK) == LOG_KERN) IOVEC_SET_STRING(iovec[n++], "SYSLOG_IDENTIFIER=kernel"); else { @@ -295,9 +298,6 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) { if (syslog_pid) IOVEC_SET_STRING(iovec[n++], syslog_pid); } - - if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0) - IOVEC_SET_STRING(iovec[n++], syslog_facility); } message = cunescape_length_with_prefix(p, pl, "MESSAGE="); -- 1.7.9.2 ++++++ shut-up-rpmlint-on-var-log-journal.patch ++++++ --- systemd-210/Makefile.am +++ systemd-210/Makefile.am 2014-07-28 09:05:41.002735451 +0000 @@ -3242,11 +3242,11 @@ noinst_LTLIBRARIES += \ libsystemd-journal-core.la journal-install-hook: - -$(MKDIR_P) $(DESTDIR)/var/log/journal - -chown 0:0 $(DESTDIR)/var/log/journal - -chmod 755 $(DESTDIR)/var/log/journal - -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/ - -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/ + -$(MKDIR_P) $(DESTDIR)/var/log/journal/ + -@echo chown 0:0 $(DESTDIR)/var/log/journal/ + -chmod 755 $(DESTDIR)/var/log/journal/ + -@echo setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/ + -@echo setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/ journal-uninstall-hook: -rmdir $(DESTDIR)/var/log/journal/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rygel for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '14

29 Jul '14

Hello community, here is the log from the commit of package rygel for openSUSE:Factory checked in at 2014-07-29 16:48:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rygel (Old) and /work/SRC/openSUSE:Factory/.rygel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rygel" Changes: -------- --- /work/SRC/openSUSE:Factory/rygel/rygel.changes 2014-07-17 17:31:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rygel.new/rygel.changes 2014-07-29 16:49:18.000000000 +0200 @@ -1,0 +2,31 @@ +Sat Jul 26 10:10:45 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.22.3: + + Remove odd build flags. + + Work-around an issue with valadoc and code samples. + + Server: + - Fix UPnP error codes on object creation. + - Set HTTP version as late as possible. + - Prevent a critical on upload. + - Avoid a potential crash by null dereference. + + Renderer: + - Set Next* values in GetMediaInfo(). + - Rely on libsoap to handle proxies properly. + - Fix an issue about non-existing timeout ids. + - Work-around failing HEAD requests. + - Set proper UPnP error if instance ids are missing on + Prev/Next. + - Send the current byte position. + + Basic diagnostics: Fix use of repitition parameter in NSLookup. + + GStreamer Renderer: + - Fix duration for and position. + - Parse duration from meta-data. + - Remove "TRANSITIONING" state when going to "STOPPED" or + "PAUSED_PLAYBACK". + + GStreamer Media Engine: Prevent a critical after streaming + ends. + + Media Export: + - Prevent a warning on upload. + - Fix album art for m4a media. + +------------------------------------------------------------------- Old: ---- rygel-0.22.2.tar.xz New: ---- rygel-0.22.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rygel.spec ++++++ --- /var/tmp/diff_new_pack.bbz8tJ/_old 2014-07-29 16:49:19.000000000 +0200 +++ /var/tmp/diff_new_pack.bbz8tJ/_new 2014-07-29 16:49:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: rygel -Version: 0.22.2 +Version: 0.22.3 Release: 0 Summary: Home Media Solution for GNOME based on UPnP/DLNA License: LGPL-2.0+ ++++++ rygel-0.22.2.tar.xz -> rygel-0.22.3.tar.xz ++++++ ++++ 15764 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