March 2017 - openSUSE Commits - openSUSE Mailing Lists

commit xscreensaver for openSUSE:Factory
by root＠hilbertn.suse.de 01 Mar '17

01 Mar '17

Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2017-03-01 23:40:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xscreensaver" Wed Mar 1 23:40:59 2017 rev:53 rq:460725 version:5.36 Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2015-11-12 19:39:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver.changes 2017-03-01 23:41:10.606094303 +0100 @@ -1,0 +2,28 @@ +Mon Feb 27 04:32:05 UTC 2017 - sfalken(a)opensuse.org + +- Added new hacks to xscreensaver-data-extra.list +- Rebased patches: + * xscreensaver-disable-upgrade-nagging-message.patch + * xscreensaver-slideshow-dri-detect.patch +- Update to 5.36: + * New hacks, `discoball', `cubetwist', `cubestack', `splodesic' + and `hexstrut'. + * OSX: loading image files works in `dymaxionmap', `glplanet', + `lavalite', `pulsar', `gleidescope' and `extrusion'. + * Several new programs in `m6502'. + * `rotzoomer -mode circle'. + * Better titles in `photopile'. +- Update to 5.35: + * New hacks, `dymaxionmap', `unicrud', `energystream', `raverhoop' + and `hydrostat'. + * Added Windows 10 to `bsod'. + * X11: ignore WM_USER_TIME property changes with days-old timestamps. + Thanks, KDE. + * MacOS, iOS: Better fonts in `BSOD' and `memscroller'. + * MacOS 10.8 or later and iOS 6.0 or later are now required, since + Xcode 6 can no longer build executables that work on older OSes. + * Many, many Android improvements. + * iOS: Fixed rotation to work with the new iOS 8+ API. + * X11: `pong' is now playable. + +------------------------------------------------------------------- Old: ---- xscreensaver-5.34.tar.gz New: ---- xscreensaver-5.36.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.Y9pyCH/_old 2017-03-01 23:41:11.681942581 +0100 +++ /var/tmp/diff_new_pack.Y9pyCH/_new 2017-03-01 23:41:11.685942017 +0100 @@ -1,7 +1,7 @@ # # spec file for package xscreensaver # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xscreensaver -Version: 5.34 +Version: 5.36 Release: 0 Summary: A screen saver and locker for the X Window System License: BSD-3-Clause and GPL-2.0+ @@ -125,11 +125,11 @@ %patch20 %patch21 # FIXME: Test, whether this patch is still needed: -%patch24 +%patch24 -p1 %patch29 %patch32 %patch42 -%patch43 +%patch43 -p1 # KDE, GNOME and MATE have there own screensavers: echo 'NotShowIn=KDE;GNOME;MATE;' >> driver/screensaver-properties.desktop.in cp -f %{SOURCE4} xscreensaver-desktops-generate @@ -234,7 +234,7 @@ %{_datadir}/X11/app-defaults/XScreenSaver %config %{_sysconfdir}/pam.d/xscreensaver %dir %{_sysconfdir}/xscreensaver/ -%{_sysconfdir}/xscreensaver/README +%config %{_sysconfdir}/xscreensaver/README %files data -f %{name}-data.lst %defattr(-,root,root) ++++++ xscreensaver-5.34.tar.gz -> xscreensaver-5.36.tar.gz ++++++ /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver-5.34.tar.gz /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver-5.36.tar.gz differ: char 5, line 1 ++++++ xscreensaver-data-extra.list ++++++ --- /var/tmp/diff_new_pack.Y9pyCH/_old 2017-03-01 23:41:11.753932429 +0100 +++ /var/tmp/diff_new_pack.Y9pyCH/_new 2017-03-01 23:41:11.757931865 +0100 @@ -39,7 +39,9 @@ crystal cube21 cubenetic +cubestack cubestorm +cubetwist cubicgrid cwaves cynosure @@ -49,9 +51,12 @@ deluxe demon discrete +discoball distort drift +dymaxionmap endgame +energystream engine epicycle eruption @@ -88,8 +93,10 @@ halo helix hexadrop +hexstrut hilbert hopalong +hydrostat hypertorus hypnowheel ifs @@ -147,6 +154,7 @@ qix quasicrystal queens +raverhoop rd-bomb ripples rocks @@ -164,6 +172,7 @@ sonar speedmine spheremonics +splodesic spotlight sproingies squiral @@ -185,6 +194,7 @@ truchet twang unknownpleasures +unicrud vermiculate vidwhacker voronoi ++++++ xscreensaver-disable-upgrade-nagging-message.patch ++++++ --- /var/tmp/diff_new_pack.Y9pyCH/_old 2017-03-01 23:41:11.785927916 +0100 +++ /var/tmp/diff_new_pack.Y9pyCH/_new 2017-03-01 23:41:11.789927353 +0100 @@ -1,41 +1,42 @@ -Index: driver/prefs.c +Index: xscreensaver-5.36/driver/prefs.c =================================================================== ---- driver/prefs.c.orig -+++ driver/prefs.c -@@ -1706,35 +1706,5 @@ senescent_p (void) - - jwz, 2014 +--- xscreensaver-5.36.orig/driver/prefs.c ++++ xscreensaver-5.36/driver/prefs.c +@@ -1735,36 +1735,5 @@ decrepit_p (void) + upgrading it again -- which would be the worst possible outcome for + everyone involved, most especially the users. */ -- time_t now = time ((time_t *) 0); /* N */ -- struct tm *tm = localtime (&now); /* o */ -- const char *s = screensaver_id; /* */ -- char mon[4], year[5]; /* d */ -- int m, y, months; /* o */ -- s = strchr (s, ' '); if (!s) abort(); s++; /* n */ -- s = strchr (s, '('); if (!s) abort(); s++; /* ' */ -- s = strchr (s, '-'); if (!s) abort(); s++; /* t */ -- strncpy (mon, s, 3); /* */ -- mon[3] = 0; /* d */ -- s = strchr (s, '-'); if (!s) abort(); s++; /* o */ -- strncpy (year, s, 4); /* */ -- year[4] = 0; /* i */ -- y = atoi (year); /* t */ -- if (!strcmp(mon, "Jan")) m = 0; /* , */ -- else if (!strcmp(mon, "Feb")) m = 1; /* */ -- else if (!strcmp(mon, "Mar")) m = 2; /* s */ -- else if (!strcmp(mon, "Apr")) m = 3; /* t */ -- else if (!strcmp(mon, "May")) m = 4; /* o */ -- else if (!strcmp(mon, "Jun")) m = 5; /* p */ -- else if (!strcmp(mon, "Jul")) m = 6; /* , */ -- else if (!strcmp(mon, "Aug")) m = 7; /* */ -- else if (!strcmp(mon, "Sep")) m = 8; /* s */ -- else if (!strcmp(mon, "Oct")) m = 9; /* t */ +- +- time_t now = time ((time_t *) 0); /* */ +- struct tm *tm = localtime (&now); /* d */ +- const char *s = screensaver_id; /* o */ +- char mon[4], year[5]; /* n */ +- int m, y, months; /* ' */ +- s = strchr (s, ' '); if (!s) abort(); s++; /* t */ +- s = strchr (s, '('); if (!s) abort(); s++; /* */ +- s = strchr (s, '-'); if (!s) abort(); s++; /* d */ +- strncpy (mon, s, 3); /* o */ +- mon[3] = 0; /* */ +- s = strchr (s, '-'); if (!s) abort(); s++; /* i */ +- strncpy (year, s, 4); /* t */ +- year[4] = 0; /* , */ +- y = atoi (year); /* */ +- if (!strcmp(mon, "Jan")) m = 0; /* s */ +- else if (!strcmp(mon, "Feb")) m = 1; /* t */ +- else if (!strcmp(mon, "Mar")) m = 2; /* o */ +- else if (!strcmp(mon, "Apr")) m = 3; /* p */ +- else if (!strcmp(mon, "May")) m = 4; /* , */ +- else if (!strcmp(mon, "Jun")) m = 5; /* */ +- else if (!strcmp(mon, "Jul")) m = 6; /* s */ +- else if (!strcmp(mon, "Aug")) m = 7; /* t */ +- else if (!strcmp(mon, "Sep")) m = 8; /* a */ +- else if (!strcmp(mon, "Oct")) m = 9; /* a */ - else if (!strcmp(mon, "Nov")) m = 10; /* a */ -- else if (!strcmp(mon, "Dec")) m = 11; /* a */ -- else abort(); /* a */ +- else if (!strcmp(mon, "Dec")) m = 11; /* h */ +- else abort(); /* h */ - months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - /* h */ -- (y * 12 + m)); /* h */ -- /* h */ -- return (months > 18); /* p */ -+ return False; +- (y * 12 + m)); /* p */ +- /* . */ +- return (months >= 17); /* */ ++return False; } ++++++ xscreensaver-slideshow-dri-detect.patch ++++++ --- /var/tmp/diff_new_pack.Y9pyCH/_old 2017-03-01 23:41:11.821922841 +0100 +++ /var/tmp/diff_new_pack.Y9pyCH/_new 2017-03-01 23:41:11.821922841 +0100 @@ -1,8 +1,8 @@ -Index: hacks/glx/glslideshow.c +Index: xscreensaver-5.36/hacks/glx/glslideshow.c =================================================================== ---- hacks/glx/glslideshow.c.orig -+++ hacks/glx/glslideshow.c -@@ -989,6 +989,29 @@ sanity_check (ModeInfo *mi) +--- xscreensaver-5.36.orig/hacks/glx/glslideshow.c ++++ xscreensaver-5.36/hacks/glx/glslideshow.c +@@ -992,7 +992,29 @@ sanity_check (ModeInfo *mi) else if (fps_cutoff > 30) fps_cutoff = 30; } @@ -14,25 +14,25 @@ + + zoom = 100; + fade_seconds = 0; -+ + + sanity_check (mi); + + for (i = 0; i < ss->nsprites; i++) -+ { -+ sprite *sp = ss->sprites[i]; -+ randomize_sprite (mi, sp); -+ sp->state = FULL; -+ } ++ { ++ sprite *sp = ss->sprites[i]; ++ randomize_sprite (mi, sp); ++ sp->state = FULL; ++ } + -+ ss->redisplay_needed_p = True; ++ss->redisplay_needed_p = True; + -+ /* Need this in case zoom changed. */ -+ reshape_slideshow (mi, mi->xgwa.width, mi->xgwa.height); ++/* Need this in case zoom changed. */ ++reshape_slideshow (mi, mi->xgwa.width, mi->xgwa.height); +} - static void check_fps (ModeInfo *mi) -@@ -998,7 +1021,6 @@ check_fps (ModeInfo *mi) + { +@@ -1001,7 +1023,6 @@ check_fps (ModeInfo *mi) slideshow_state *ss = &sss[MI_SCREEN(mi)]; double start_time, end_time, wall_elapsed, frame_duration, fps; @@ -40,7 +40,7 @@ start_time = ss->now; end_time = double_time(); -@@ -1029,22 +1051,7 @@ check_fps (ModeInfo *mi) +@@ -1032,22 +1053,7 @@ check_fps (ModeInfo *mi) fprintf (stderr, "%s: only %.1f fps! Turning off pan/fade to compensate...\n", blurb(), fps); @@ -60,21 +60,20 @@ - - /* Need this in case zoom changed. */ - reshape_slideshow (mi, mi->xgwa.width, mi->xgwa.height); -+ low_fps_mode (mi); - #endif /* HAVE_COCOA */ ++low_fps_mode (mi); + #endif /* HAVE_JWXYZ */ } -@@ -1084,7 +1091,13 @@ init_slideshow (ModeInfo *mi) +@@ -1087,7 +1093,12 @@ init_slideshow (ModeInfo *mi) ss = &sss[screen]; if ((ss->glx_context = init_GL(mi)) != NULL) { - reshape_slideshow (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); -+ -+ if (glXIsDirect (MI_DISPLAY(mi), *ss->glx_context) == True) { -+ reshape_slideshow (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); -+ } else { -+ low_fps_mode (mi); -+ } ++ if (glXIsDirect (MI_DISPLAY(mi), *ss->glx_context) == True) { ++ reshape_slideshow (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); ++ } else { ++ low_fps_mode (mi); ++ } + } else { MI_CLEARWINDOW(mi);

1 0

commit pciutils for openSUSE:Factory
by root＠hilbertn.suse.de 01 Mar '17

01 Mar '17

Hello community, here is the log from the commit of package pciutils for openSUSE:Factory checked in at 2017-03-01 23:40:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pciutils (Old) and /work/SRC/openSUSE:Factory/.pciutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pciutils" Wed Mar 1 23:40:45 2017 rev:57 rq:460693 version:3.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/pciutils/pciutils.changes 2016-05-26 23:54:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pciutils.new/pciutils.changes 2017-03-01 23:40:47.077412447 +0100 @@ -1,0 +2,22 @@ +Mon Feb 27 12:07:44 UTC 2017 - mpluskal(a)suse.com + +- Update to version 3.5.4: + * Previous version broke compilation on systems, for which + lib/types.h did not provide a 64-bit integer type. It is + provided everywhere now. +- Changes for version 3.5.3: + * When lspci looks for Linux kernel modules, it uses the default + path to module directory provided by libkmod. Previously, + it tried to construct the path explicitly, which need not + work on all systems. + * Improved formatting of memory and I/O ranges behind a bridge. + * PCIe link capabilities now display GEN4 speed (16GT/s). + * PCIe device capabilities now show bits related to atomic + operations. +- Changes for version 3.5.2: + * The L1 power management capability is now decoded more + thoroughly. Thanks to Rajat Jain for the patch. + * The table of configuration registers used by setpci + had a bug in the definition of SUBSYSTEM_VENDOR_ID. + +------------------------------------------------------------------- Old: ---- pciutils-3.5.1.tar.xz New: ---- pciutils-3.5.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils.spec ++++++ --- /var/tmp/diff_new_pack.MuGaHr/_old 2017-03-01 23:40:47.925292874 +0100 +++ /var/tmp/diff_new_pack.MuGaHr/_new 2017-03-01 23:40:47.925292874 +0100 @@ -1,7 +1,7 @@ # # spec file for package pciutils # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define lname libpci3 Name: pciutils -Version: 3.5.1 +Version: 3.5.4 Release: 0 Summary: PCI utilities for the Linux Kernel License: GPL-2.0+ @@ -27,14 +27,13 @@ Source: ftp://ftp.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.xz Source2: baselibs.conf Patch0: pciutils-3.2.0_update-dist.patch -Patch1: %{name}-3.1.9_pkgconfig.patch +Patch1: pciutils-3.1.9_pkgconfig.patch Patch2: pciutils-ocloexec.patch Patch3: pciutils-endianh.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(zlib) Requires: pciutils-ids -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description lspci: This program displays detailed information about all PCI busses @@ -71,7 +70,7 @@ %patch3 -p1 %build -make %{?_smp_mflags} OPT="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS) -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes" +make %{?_smp_mflags} OPT="%{optflags}" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes" %install make install PREFIX=%{buildroot}%{_prefix} SBINDIR=%{buildroot}/sbin \ @@ -89,8 +88,13 @@ %files %defattr(-, root, root) %doc README COPYING -%{_mandir}/man?/* -/sbin/* +/sbin/lspci +/sbin/setpci +/sbin/update-pciids +%{_mandir}/man7/pcilib.7%{ext_man} +%{_mandir}/man8/lspci.8%{ext_man} +%{_mandir}/man8/setpci.8%{ext_man} +%{_mandir}/man8/update-pciids.8%{ext_man} %files -n %{lname} %defattr(-,root,root) ++++++ pciutils-3.5.1.tar.xz -> pciutils-3.5.4.tar.xz ++++++ ++++ 3875 lines of diff (skipped)

1 0

commit virtualbox for openSUSE:Factory
by root＠hilbertn.suse.de 01 Mar '17

01 Mar '17

Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2017-03-01 23:40:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Wed Mar 1 23:40:04 2017 rev:129 rq:461358 version:5.1.14 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2017-02-10 09:44:59.960040107 +0100 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2017-03-01 23:40:08.506851865 +0100 @@ -1,0 +2,28 @@ +Tue Feb 28 21:06:30 UTC 2017 - dimstar(a)opensuse.org + +- Do not proivde libGL.so.1 and libEGL.so.1 symbols into the rpm + database. + +------------------------------------------------------------------- +Sun Feb 26 20:17:02 UTC 2017 - Larry.Finger(a)lwfinger.net + +- The fix for 3D acceleration only works for Gmome desktops. KDE desktops fail. Accordingly, + 3D acceleration must still be disabled "out-of-the-box". File /etc/init.d/vboxadd contains + comments on the modifications needed to turn 3D acceleration on, thus Gnome users may turn + it on selectively. + +------------------------------------------------------------------- +Fri Feb 24 03:34:35 UTC 2017 - Larry.Finger(a)lwfinger.net + +- Fix 3D acceleration as reported in bsc #1024934. The steps needed are as follows: + - Remove file "vbox_prevent_wrong_SONAME.patch" - the original SONAME values are needed for + libGL.so.1 and libEGL.so.1 to be replaced by VBoxOGL.so and VBoxEGL.so, respectively. + - Package VBoxEGL.so + +------------------------------------------------------------------- +Thu Feb 23 12:37:09 CET 2017 - kukuk(a)suse.de + +- Require insserv and fillup by the packages who call it in the + pre/post install sections + +------------------------------------------------------------------- Old: ---- vbox_prevent_wrong_SONAME.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.GVPtTB/_old 2017-03-01 23:40:13.130199859 +0100 +++ /var/tmp/diff_new_pack.GVPtTB/_new 2017-03-01 23:40:13.138198730 +0100 @@ -16,6 +16,9 @@ # +# Do not provide libGL.so symbols - they are owned by Mesa already and this could potentially confuse rpm/zypp +%global __provides_exclude ^libE?GL.so.1.*$ + %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir %{_sysconfdir}/udev/rules.d Name: virtualbox @@ -83,8 +86,6 @@ Patch108: virtualbox-snpritnf-buffer-overflow.patch # Patch to add code to explain USB Passthru Patch109: vbox-usb-warning.diff -# Prevent Guest Additions from creating wrong SONAME -Patch111: vbox_prevent_wrong_SONAME.patch # Fix change in kernel API for ttm_bo_move_memcpy() Patch112: modify_for_4_8_bo_move.patch # Remove all mention of _smp_mflags @@ -164,6 +165,8 @@ Requires(post): sysvinit(syslog) Requires(pre): permissions Requires(pre): pwdutils +Requires(pre): %insserv_prereq +Requires(pre): %fillup_prereq Recommends: %{name}-gui = %{version} #rename from ose version: Provides: %{name}-ose = %{version} @@ -209,6 +212,7 @@ Group: System/Emulators/PC Requires: %{name} = %{version} Provides: %{name}-gui = %{version} +Requires(pre): %insserv_prereq %description websrv websrv GUI part for %{name}. @@ -254,6 +258,7 @@ #rename from "ose" version: Provides: %{name}-ose-guest-tools = %{version} Obsoletes: %{name}-ose-guest-tools < %{version} +Requires(pre): %insserv_prereq %description guest-tools VirtualBox guest addition tools. @@ -329,7 +334,6 @@ %patch107 -p1 %patch108 -p1 %patch109 -p1 -%patch111 -p1 %patch112 -p1 %patch113 -p1 %patch116 -p1 @@ -504,6 +508,9 @@ # VBoxOGL* libs for guest-x11 subpackage install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \ %{buildroot}%{_libdir} +# VBoxEGL* libs for guest-x11 subpackage +install -m 755 out/linux.*/release/bin/additions/VBoxEGL*.so \ + %{buildroot}%{_libdir} # make link for dri lib ln -s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so # install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows) @@ -756,6 +763,7 @@ %{_vbox_instdir}/VBoxSharedCrOpenGL.so %{_vbox_instdir}/VBoxSharedFolders.so %{_vbox_instdir}/VBoxVMM.so +#%{_vbox_instdir}/VBoxVNC.so %{_vbox_instdir}/VBoxXPCOMC.so %{_vbox_instdir}/VBoxXPCOM.so %{_vbox_instdir}/VBoxDD2RC.rc @@ -819,6 +827,7 @@ %dir %{_libdir}/dri/ %{_bindir}/VBoxClient %{_libdir}/VBoxOGL*.so +%{_libdir}/VBoxEGL*.so %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %{_libdir}/dri/vboxvideo_dri.so %{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh ++++++ vbox-vboxadd-init-script.diff ++++++ --- /var/tmp/diff_new_pack.GVPtTB/_old 2017-03-01 23:40:13.282178426 +0100 +++ /var/tmp/diff_new_pack.GVPtTB/_new 2017-03-01 23:40:13.286177862 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-5.1.14/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-5.1.14/src/VBox/Additions/linux/installer/vboxadd.sh @@ -23,9 +23,12 @@ # Provides: vboxadd # Required-Start: @@ -73,7 +73,7 @@ fail "modprobe vboxguest failed" } } -@@ -217,7 +200,7 @@ start() +@@ -217,14 +200,14 @@ start() } # Put the X.Org driver in place. This is harmless if it is not needed. @@ -82,7 +82,32 @@ # Install the guest OpenGL drivers. For now we don't support # multi-architecture installations rm -f /etc/ld.so.conf.d/00vboxvideo.conf -@@ -378,7 +361,7 @@ extra_setup() + if /usr/bin/VBoxClient --check3d 2>/dev/null; then + mkdir -p /var/lib/VBoxGuestAdditions/lib +- ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1 +- ln -sf "${INSTALL_DIR}/lib/VBoxEGL.so" /var/lib/VBoxGuestAdditions/lib/libEGL.so.1 ++ ln -sf "/usr/lib64/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1 ++ ln -sf "/usr/lib64/VBoxEGL.so" /var/lib/VBoxGuestAdditions/lib/libEGL.so.1 + # SELinux for the OpenGL libraries, so that gdm can load them during the + # acceleration support check. This prevents an "Oh no, something has gone + # wrong!" error when starting EL7 guests. +@@ -237,6 +220,15 @@ start() + chcon -h -t lib_t "/var/lib/VBoxGuestAdditions/lib/libEGL.so.1" + fi + echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf ++ # The above code will enable 3D acceleration for Gnome VM desktops. For Plasma 5 (KDE) ++ # VM's almost everything breaks. For that reason, acceleration MUST be disabled here. ++ # Gnome users that want this feature should delete the two 'rm' commands that follow. ++ # You will need to repeat this modification EVERY time the VirtualBox package is ++ # reinstalled ++ # Any KDE user that deletes the two 'rm' commands MUST know how to recover your sustem ++ # from a mode 3 boot. YOU HAVE BEEN WARNED. ++ rm /var/lib/VBoxGuestAdditions/lib/* ++ rm /etc/ld.so.conf.d/00vboxvideo.conf + fi + ldconfig + +@@ -382,7 +374,7 @@ extra_setup() ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin # And an rc file to re-build the kernel modules and re-set-up the X server. ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd @@ -91,7 +116,7 @@ # And a post-installation script for rebuilding modules when a new kernel # is installed. mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d -@@ -411,49 +394,13 @@ EOF +@@ -415,49 +407,13 @@ EOF # setup_script setup() { @@ -143,7 +168,7 @@ # Delete old versions of VBox modules. cleanup_modules depmod -@@ -464,12 +411,12 @@ cleanup() +@@ -468,12 +424,12 @@ cleanup() done # Clean-up X11-related bits

1 0

commit open-lldp for openSUSE:Factory
by root＠hilbertn.suse.de 01 Mar '17

01 Mar '17

Hello community, here is the log from the commit of package open-lldp for openSUSE:Factory checked in at 2017-03-01 23:39:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-lldp (Old) and /work/SRC/openSUSE:Factory/.open-lldp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-lldp" Wed Mar 1 23:39:53 2017 rev:8 rq:460918 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/open-lldp/open-lldp.changes 2015-04-12 00:08:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.open-lldp.new/open-lldp.changes 2017-03-01 23:39:55.064747537 +0100 @@ -1,0 +2,37 @@ +Tue Feb 28 11:08:53 UTC 2017 - dimstar(a)opensuse.org + +- Don't use full URL as source, as the tarball does not exist at + that location. + +------------------------------------------------------------------- +Sat Feb 18 05:34:33 UTC 2017 - kukuk(a)suse.com + +- Remove obsolete insserv calls + +------------------------------------------------------------------- +Mon Aug 3 10:24:33 CEST 2015 - hare(a)suse.de + +- Update to v1.0.1 (FATE#318849) + * vpd22 updates + * Include vpdtool + * Support for OUI infrastructure in vpd22 + * Support for OUI infrastructure in vpdtool + * Support for Cisco-specific OUI extensions in vpd22 + * Add vpdtool manpage + * Add open-lldp-1.0.1.tar.gz + * Remove open-lldp-0.9.46.tar.gz + * Patches merged with upstream + * Remove 0001-lldpad-print-verbose-error-messages.patch + * Remove 0002-Move-to-libnl3.patch +- Update to latest git version + * Automake fixes + * Fix DCBX event generation from lldpad + * Make TTL TLV configurable + * Update open-lldp-git-update.patch.bz2 +- Correctly process return value in get_perm_hwaddr (bsc#929171) + * Add 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch +- lldpad: Only set Tx adminStatus if interface is not managed + (bsc#929171) + * Add 0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch + +------------------------------------------------------------------- Old: ---- 0001-lldpad-print-verbose-error-messages.patch 0002-Move-to-libnl3.patch open-lldp-0.9.46.tar.gz New: ---- 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch 0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch open-lldp-1.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-lldp.spec ++++++ --- /var/tmp/diff_new_pack.xn2TDU/_old 2017-03-01 23:39:55.676661242 +0100 +++ /var/tmp/diff_new_pack.xn2TDU/_new 2017-03-01 23:39:55.680660678 +0100 @@ -1,7 +1,7 @@ # # spec file for package open-lldp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Summary: Link Layer Discovery Protocol (LLDP) Agent License: GPL-2.0 Group: System/Daemons -Version: 0.9.46 +Version: 1.0.1 Release: 0 BuildRequires: bison BuildRequires: flex @@ -31,10 +31,11 @@ BuildRequires: pkgconfig BuildRequires: readline-devel Url: http://open-lldp.org/ -Source: http://ftp-osl.osuosl.org/pub/%{name}/%{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.gz +#Source: http://ftp-osl.osuosl.org/pub/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-git-update.patch.bz2 -Patch1: 0001-lldpad-print-verbose-error-messages.patch -Patch2: 0002-Move-to-libnl3.patch +Patch1: 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch +Patch2: 0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch Patch3: open-lldp-gcc5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: dcbd = %{version} @@ -95,7 +96,7 @@ ln -s service %{buildroot}%{_sbindir}/rclldpad %post -%{fillup_and_insserv -n -i lldpad} +%{fillup_only -n -i lldpad} %service_add_post lldpad.service %pre @@ -105,7 +106,6 @@ %service_del_preun lldpad.service %postun -%{insserv_cleanup lldpad} %service_del_postun lldpad.service %post -n %libname -p /sbin/ldconfig @@ -118,6 +118,7 @@ %dir /var/lib/lldpad %{_unitdir}/* %{_sbindir}/* +%{_mandir}/man3/* %{_mandir}/man8/* %config /etc/bash_completion.d/* ++++++ 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch ++++++ >From 795b363c15d145e8cad21e8ba11d817efc329bf7 Mon Sep 17 00:00:00 2001 From: Johannes Thumshirn <jthumshirn(a)suse.de> Date: Tue, 19 May 2015 15:34:46 +0200 Subject: l2_linux_packet: correctly process return value of get_perm_hwaddr On success get_perm_hwaddr() returns the number of bytes read from the netlink socket. However, l2_packet_init() only checks for 0 as a successful return value. Adopt get_perm_hwaddr() to return 0 on success. Reference: bsc#929171 Signed-off-by: Johannes Thumshirn <jthumshirn(a)suse.de> --- lldp_rtnl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lldp_rtnl.c b/lldp_rtnl.c index 33b4d19..8d4f0cc 100644 --- a/lldp_rtnl.c +++ b/lldp_rtnl.c @@ -322,6 +322,8 @@ int get_perm_hwaddr(const char *ifname, u8 *buf_perm, u8 *buf_san) memcpy(buf_perm, RTA_DATA(rta), ETH_ALEN); memcpy(buf_san, RTA_DATA(rta) + ETH_ALEN, ETH_ALEN); + + rc = 0; out: close(s); out_nosock: -- 1.8.4.5 ++++++ 0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch ++++++ >From 9b4bcd1631cdd8dd4fd9421c3a2fd662fb9f3478 Mon Sep 17 00:00:00 2001 From: Johannes Thumshirn <jthumshirn(a)suse.de> Date: Wed, 20 May 2015 15:16:36 +0200 Subject: lldpad: Only set Tx adminStatus if interface is not managed Only set the adminStatus of an interface to Tx if its DCB status is not managed by the LLDD itself. Reference: bsc#929171 Signed-off-by: Johannes Thumshirn <jthumshirn(a)suse.de> --- lldp_8021qaz.c | 4 ++++ lldp_dcbx.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c index 094676d..a26422e 100644 --- a/lldp_8021qaz.c +++ b/lldp_8021qaz.c @@ -1973,13 +1973,17 @@ int ieee8021qaz_rchange(struct port *port, struct lldp_agent *agent, * if current configuration is RXOnly and * not persistant (i.e. default) */ + __u8 dcbx = 0; int adminstatus; + + (void) get_dcbx_hw(qaz_tlvs->ifname, &dcbx); if (qaz_tlvs->ieee8021qazdu && get_config_setting(qaz_tlvs->ifname, agent->type, ARG_ADMINSTATUS, &adminstatus, CONFIG_TYPE_INT) && + !(dcbx & DCB_CAP_DCBX_LLD_MANAGED) && get_lldp_agent_admin(qaz_tlvs->ifname, agent->type) == enabledRxOnly) { diff --git a/lldp_dcbx.c b/lldp_dcbx.c index 9999e33..026ed83 100644 --- a/lldp_dcbx.c +++ b/lldp_dcbx.c @@ -354,7 +354,7 @@ struct packed_tlv* dcbx_gettlv(struct port *port, struct lldp_agent *agent) if (agent->type != NEAREST_BRIDGE) return NULL; - if (!check_port_dcb_mode(port->ifname)) + if (!check_port_dcb_mode(port->ifname)) return NULL; tlvs = dcbx_data(port->ifname); -- 1.8.4.5 ++++++ open-lldp-0.9.46.tar.gz -> open-lldp-1.0.1.tar.gz ++++++ ++++ 45046 lines of diff (skipped) ++++++ open-lldp-git-update.patch.bz2 ++++++ ++++ 50634 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/open-lldp/open-lldp-git-update.patch.bz2 ++++ and /work/SRC/openSUSE:Factory/.open-lldp.new/open-lldp-git-update.patch.bz2

1 0

commit samba for openSUSE:Factory
by root＠hilbertn.suse.de 01 Mar '17

01 Mar '17

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2017-03-01 23:39:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "samba" Wed Mar 1 23:39:44 2017 rev:208 rq:460728 version:4.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2017-02-10 09:44:38.535075109 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2017-03-01 23:39:45.646075803 +0100 @@ -1,0 +2,7 @@ +Mon Feb 27 15:30:21 UTC 2017 - dimstar(a)opensuse.org + +- Change insserv_prereq requires to requires(pre): this is + factually seen not a runtime requirement of samba, but of the + rpm scriptlets. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.2ksuUs/_old 2017-03-01 23:39:46.717924646 +0100 +++ /var/tmp/diff_new_pack.2ksuUs/_new 2017-03-01 23:39:46.721924082 +0100 @@ -263,7 +263,7 @@ Obsoletes: samba-gplv3-client < %{version} Obsoletes: samba-client-gplv2 < %{version} %if 0%{?suse_version} > 0 -Requires: %{?insserv_prereq} +Requires(pre): %{?insserv_prereq} %endif Requires: /sbin/chkconfig Requires: /sbin/ldconfig @@ -417,7 +417,7 @@ Recommends: /usr/sbin/nscd %endif %if 0%{?suse_version} > 0 -Requires: %{?insserv_prereq} +Requires(pre): %{?insserv_prereq} %endif Requires: /sbin/ldconfig Requires: /usr/sbin/groupadd

1 0

commit numad for openSUSE:Factory
by root＠hilbertn.suse.de 01 Mar '17

01 Mar '17

Hello community, here is the log from the commit of package numad for openSUSE:Factory checked in at 2017-03-01 23:39:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/numad (Old) and /work/SRC/openSUSE:Factory/.numad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "numad" Wed Mar 1 23:39:33 2017 rev:4 rq:460720 version:0.5.20130522 Changes: -------- --- /work/SRC/openSUSE:Factory/numad/numad.changes 2013-06-18 10:34:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.numad.new/numad.changes 2017-03-01 23:39:34.611631931 +0100 @@ -1,0 +2,5 @@ +Mon Feb 20 09:52:57 CET 2017 - kukuk(a)suse.de + +- Don't call insserv if we use systemd + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ numad.spec ++++++ --- /var/tmp/diff_new_pack.uD9znF/_old 2017-03-01 23:39:35.191550149 +0100 +++ /var/tmp/diff_new_pack.uD9znF/_new 2017-03-01 23:39:35.191550149 +0100 @@ -1,7 +1,7 @@ # # spec file for package numad # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -99,9 +99,10 @@ %endif %preun -%stop_on_removal numad %if 0%{?has_systemd} %service_del_preun numad.service +%else +%stop_on_removal numad %endif %post @@ -110,10 +111,11 @@ %endif %postun -%restart_on_update numad -%insserv_cleanup %if 0%{?has_systemd} %service_del_postun numad.service +%else +%restart_on_update numad +%insserv_cleanup %endif %changelog

1 0

commit avahi for openSUSE:Factory
by root＠hilbertn.suse.de 01 Mar '17

01 Mar '17

Hello community, here is the log from the commit of package avahi for openSUSE:Factory checked in at 2017-03-01 23:39:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avahi (Old) and /work/SRC/openSUSE:Factory/.avahi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "avahi" Wed Mar 1 23:39:23 2017 rev:117 rq:458734 version:0.6.32 Changes: -------- avahi-mono.changes: same change avahi-qt4.changes: same change --- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2016-07-21 07:52:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi.changes 2017-03-01 23:39:24.912999676 +0100 @@ -1,0 +2,11 @@ +Wed Feb 15 17:58:46 UTC 2017 - dimstar(a)opensuse.org + +- Drop %insserv_cleanup scriptlets: it's been a while that avahi + did not install any sysV init scripts anymore. +- Simplify avahi_spec-prepare.sh: OBS is well able to handle macros + in package names by now. +- Drop conditions to only handle systemd services on openSUSE > + 12.1; it's been long that we did not ship the sysv scripts + anymore and openSUSE 12.1 is long EOL. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.vFvMuW/_old 2017-03-01 23:39:26.128828214 +0100 +++ /var/tmp/diff_new_pack.vFvMuW/_new 2017-03-01 23:39:26.128828214 +0100 @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -119,9 +119,7 @@ BuildRequires: graphviz BuildRequires: python-gdbm BuildRequires: zlib-devel -%if %suse_version >= 1210 BuildRequires: pkgconfig(systemd) -%endif # For python bindings and utilities: #BuildRequires: dbus-1-python #Requires: dbus-1 @@ -235,9 +233,9 @@ %package -n libdns_sd Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Group: System/Libraries # mDNSResponder-lib used unversioned soname. # Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): +Group: System/Libraries %ifarch ia64 x86_64 ppc64 s390x Provides: libdns_sd.so()(64bit) %else @@ -272,8 +270,8 @@ %package -n libhowl0 Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Group: System/Libraries # Old name used for <= 10.3: +Group: System/Libraries Provides: avahi-compat-howl = %{version} Obsoletes: avahi-compat-howl < %{version} @@ -321,8 +319,8 @@ %package autoipd Summary: IPv4LL Service for Zeroconf and Bonjour -Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. +Group: Productivity/Networking/Other Provides: avahi:%{_sbindir}/avahi-autoipd # Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 @@ -359,8 +357,8 @@ %package -n libavahi-devel Summary: Include Files and Libraries Mandatory for Development -Group: Development/Libraries/C and C++ # +Group: Development/Libraries/C and C++ Requires: %{_name} = %{version} Requires: dbus-1-devel Requires: glibc-devel @@ -467,8 +465,8 @@ %package -n libavahi-glib1 Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: System/Libraries # Old name used for <= 10.3: +Group: System/Libraries Provides: avahi-glib = %{version} Obsoletes: avahi-glib < %{version} @@ -624,8 +622,8 @@ %package -n libavahi-qt3-1 Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: System/GUI/KDE # Old name used for <= 10.3: +Group: System/GUI/KDE Provides: avahi-qt3 = %{version} Obsoletes: avahi-qt3 < %{version} @@ -673,8 +671,8 @@ %package -n libavahi-qt4-1 Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: System/GUI/KDE # Old name used for <= 10.3: +Group: System/GUI/KDE Provides: avahi-qt4 = %{version} Obsoletes: avahi-qt4 < %{version} @@ -965,9 +963,7 @@ %pre %{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || : -%if %suse_version >= 1210 %service_add_pre avahi-dnsconfd.service avahi-daemon.service -%endif # bnc#853845,bnc#851953: do not start by default under # sysconfig as this breaks vlan,bridge,bonding setups # in pre to revert old default setting from template. @@ -983,18 +979,12 @@ %post %{fillup_only -n avahi} %{fillup_only -ns security checksig} -%if %suse_version >= 1210 %service_add_post avahi-dnsconfd.service avahi-daemon.service -%endif %preun -%if %suse_version >= 1210 %service_del_preun avahi-dnsconfd.service avahi-daemon.service -%endif %postun -%insserv_cleanup -%if %suse_version >= 1210 %service_del_postun avahi-dnsconfd.service avahi-daemon.service %pre autoipd @@ -1005,7 +995,6 @@ %{fillup_only -ns avahi autoipd} # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11. chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd -%endif %post -n libavahi-client3 -p /sbin/ldconfig @@ -1026,12 +1015,6 @@ %post -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig - -%preun -n python-avahi -%insserv_cleanup - -%postun -n python-avahi -%insserv_cleanup %endif %if %build_glib2 avahi-mono.spec: same change ++++++ avahi-qt4.spec ++++++ --- /var/tmp/diff_new_pack.vFvMuW/_old 2017-03-01 23:39:26.188819754 +0100 +++ /var/tmp/diff_new_pack.vFvMuW/_new 2017-03-01 23:39:26.192819190 +0100 @@ -1,7 +1,7 @@ # # spec file for package avahi-qt4 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -119,9 +119,7 @@ BuildRequires: graphviz BuildRequires: python-gdbm BuildRequires: zlib-devel -%if %suse_version >= 1210 BuildRequires: pkgconfig(systemd) -%endif # For python bindings and utilities: #BuildRequires: dbus-1-python #Requires: dbus-1 @@ -237,9 +235,9 @@ %package -n libdns_sd Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Group: System/Libraries # mDNSResponder-lib used unversioned soname. # Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): +Group: System/Libraries %ifarch ia64 x86_64 ppc64 s390x Provides: libdns_sd.so()(64bit) %else @@ -274,8 +272,8 @@ %package -n libhowl0 Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Group: System/Libraries # Old name used for <= 10.3: +Group: System/Libraries Provides: avahi-compat-howl = %{version} Obsoletes: avahi-compat-howl < %{version} @@ -323,8 +321,8 @@ %package autoipd Summary: IPv4LL Service for Zeroconf and Bonjour -Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. +Group: Productivity/Networking/Other Provides: avahi:%{_sbindir}/avahi-autoipd # Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 @@ -361,8 +359,8 @@ %package -n libavahi-devel Summary: Include Files and Libraries Mandatory for Development -Group: Development/Libraries/C and C++ # +Group: Development/Libraries/C and C++ Requires: %{_name} = %{version} Requires: dbus-1-devel Requires: glibc-devel @@ -469,8 +467,8 @@ %package -n libavahi-glib1 Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: System/Libraries # Old name used for <= 10.3: +Group: System/Libraries Provides: avahi-glib = %{version} Obsoletes: avahi-glib < %{version} @@ -626,8 +624,8 @@ %package -n libavahi-qt3-1 Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: System/GUI/KDE # Old name used for <= 10.3: +Group: System/GUI/KDE Provides: avahi-qt3 = %{version} Obsoletes: avahi-qt3 < %{version} @@ -675,8 +673,8 @@ %package -n libavahi-qt4-1 Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: System/GUI/KDE # Old name used for <= 10.3: +Group: System/GUI/KDE Provides: avahi-qt4 = %{version} Obsoletes: avahi-qt4 < %{version} @@ -967,9 +965,7 @@ %pre %{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || : -%if %suse_version >= 1210 %service_add_pre avahi-dnsconfd.service avahi-daemon.service -%endif # bnc#853845,bnc#851953: do not start by default under # sysconfig as this breaks vlan,bridge,bonding setups # in pre to revert old default setting from template. @@ -985,18 +981,12 @@ %post %{fillup_only -n avahi} %{fillup_only -ns security checksig} -%if %suse_version >= 1210 %service_add_post avahi-dnsconfd.service avahi-daemon.service -%endif %preun -%if %suse_version >= 1210 %service_del_preun avahi-dnsconfd.service avahi-daemon.service -%endif %postun -%insserv_cleanup -%if %suse_version >= 1210 %service_del_postun avahi-dnsconfd.service avahi-daemon.service %pre autoipd @@ -1007,7 +997,6 @@ %{fillup_only -ns avahi autoipd} # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11. chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd -%endif %post -n libavahi-client3 -p /sbin/ldconfig @@ -1028,12 +1017,6 @@ %post -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig - -%preun -n python-avahi -%insserv_cleanup - -%postun -n python-avahi -%insserv_cleanup %endif %if %build_glib2 ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.vFvMuW/_old 2017-03-01 23:39:26.220815242 +0100 +++ /var/tmp/diff_new_pack.vFvMuW/_new 2017-03-01 23:39:26.220815242 +0100 @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -121,9 +121,7 @@ BuildRequires: graphviz BuildRequires: python-gdbm BuildRequires: zlib-devel -%if %suse_version >= 1210 BuildRequires: pkgconfig(systemd) -%endif # For python bindings and utilities: #BuildRequires: dbus-1-python #Requires: dbus-1 @@ -237,9 +235,9 @@ %package -n libdns_sd Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Group: System/Libraries # mDNSResponder-lib used unversioned soname. # Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): +Group: System/Libraries %ifarch ia64 x86_64 ppc64 s390x Provides: libdns_sd.so()(64bit) %else @@ -274,8 +272,8 @@ %package -n libhowl0 Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour -Group: System/Libraries # Old name used for <= 10.3: +Group: System/Libraries Provides: avahi-compat-howl = %{version} Obsoletes: avahi-compat-howl < %{version} @@ -323,8 +321,8 @@ %package autoipd Summary: IPv4LL Service for Zeroconf and Bonjour -Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. +Group: Productivity/Networking/Other Provides: avahi:%{_sbindir}/avahi-autoipd # Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 @@ -361,8 +359,8 @@ %package -n libavahi-devel Summary: Include Files and Libraries Mandatory for Development -Group: Development/Libraries/C and C++ # +Group: Development/Libraries/C and C++ Requires: %{_name} = %{version} Requires: dbus-1-devel Requires: glibc-devel @@ -469,8 +467,8 @@ %package -n libavahi-glib1 Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: System/Libraries # Old name used for <= 10.3: +Group: System/Libraries Provides: avahi-glib = %{version} Obsoletes: avahi-glib < %{version} @@ -626,8 +624,8 @@ %package -n libavahi-qt3-1 Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: System/GUI/KDE # Old name used for <= 10.3: +Group: System/GUI/KDE Provides: avahi-qt3 = %{version} Obsoletes: avahi-qt3 < %{version} @@ -675,8 +673,8 @@ %package -n libavahi-qt4-1 Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: System/GUI/KDE # Old name used for <= 10.3: +Group: System/GUI/KDE Provides: avahi-qt4 = %{version} Obsoletes: avahi-qt4 < %{version} @@ -967,9 +965,7 @@ %pre %{_sbindir}/groupadd -r avahi 2> /dev/null || : %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi 2> /dev/null || : -%if %suse_version >= 1210 %service_add_pre avahi-dnsconfd.service avahi-daemon.service -%endif # bnc#853845,bnc#851953: do not start by default under # sysconfig as this breaks vlan,bridge,bonding setups # in pre to revert old default setting from template. @@ -985,18 +981,12 @@ %post %{fillup_only -n avahi} %{fillup_only -ns security checksig} -%if %suse_version >= 1210 %service_add_post avahi-dnsconfd.service avahi-daemon.service -%endif %preun -%if %suse_version >= 1210 %service_del_preun avahi-dnsconfd.service avahi-daemon.service -%endif %postun -%insserv_cleanup -%if %suse_version >= 1210 %service_del_postun avahi-dnsconfd.service avahi-daemon.service %pre autoipd @@ -1007,7 +997,6 @@ %{fillup_only -ns avahi autoipd} # Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11. chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd -%endif %post -n libavahi-client3 -p /sbin/ldconfig @@ -1028,12 +1017,6 @@ %post -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig - -%preun -n python-avahi -%insserv_cleanup - -%postun -n python-avahi -%insserv_cleanup %endif %if %build_glib2 ++++++ avahi_spec-prepare.sh ++++++ --- /var/tmp/diff_new_pack.vFvMuW/_old 2017-03-01 23:39:26.432785349 +0100 +++ /var/tmp/diff_new_pack.vFvMuW/_new 2017-03-01 23:39:26.432785349 +0100 @@ -13,30 +13,6 @@ exit fi -for PKGNAME in avahi-client avahi-common avahi-core avahi-ui avahi-glib avahi-gobject avahi-qt4 ; do - # Packages with name ending by number needs separator - if test x`echo $PKGNAME | sed "s/.*[0-9]$//"` = x ; then - SEPARATOR=- - else - SEPARATOR= - fi - sed -i " - 1,/%changelog/ { - # Copy ${PKGNAME//-/_}_soname to hold space - /^%define ${PKGNAME//-/_}_soname / { - h; - s/^%define ${PKGNAME//-/_}_soname //; - x; - }; - - # Update ${PKGNAME}_soname everywhere - /$PKGNAME$SEPARATOR[0-9][0-9]*$[[:space:]].*\|$\$/ { - G; - s/$PKGNAME$SEPARATOR[0-9][0-9]*$[[:space:]].*\|$\n$.*$/$PKGNAME$SEPARATOR\2\1/; - }; - };" $1/$ORIG_SPEC.spec -done - # Edit file to fit -mono build needs: sed ' s/spec file for package avahi/spec file for package avahi-mono/;

1 0

commit util-linux for openSUSE:Factory
by root＠hilbertn.suse.de 01 Mar '17

01 Mar '17

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2017-03-01 23:39:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "util-linux" Wed Mar 1 23:39:12 2017 rev:216 rq:457450 version:2.29.1 Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/python-libmount.changes 2017-01-15 10:56:25.434424155 +0100 +++ /work/SRC/openSUSE:Factory/.util-linux.new/python-libmount.changes 2017-03-01 23:39:13.706580054 +0100 @@ -1,0 +2,44 @@ +Fri Feb 10 10:40:23 UTC 2017 - fbui(a)suse.com + +- presets are managed by the branding presets package (bsc#1012850) + + The default activation state is defined by the branding preset + package. + + This also get rid of the only use of the rpm preset macros so we can + kill them. + +------------------------------------------------------------------- +Wed Feb 8 18:16:22 CET 2017 - sbrabec(a)suse.com + +- Merge SLE12 SP3 changes to make the package compatible with + Tumbleweed, SLE12 SP3 and Leap 42.3. +- Drop patch tests-script-race-on-force-only.patch from SLE12 SP3 + and Leap 42.3. Upstream has a different workaround. + https://github.com/karelzak/util-linux/issues/296 +- INCOMPATIBLE CHANGE for SLE12 SP3 and Leap 42.3: + losetup -L changes its meaning from SLE12 SP1&SP2 specific + --logical-blocksize to the upstream --nooverlap). + --logical-blocksize can be used only with long option. +- Include SLE12 + Leap 42 exclusive feature, implemented by + hare(a)suse.de: + * losetup: Add support for setting logical blocksizes + (bsc#931634, FATE#319010) + + util-linux-losetup-Add-support-for-setting-logical-blocksize.patch + +------------------------------------------------------------------- +Tue Feb 7 20:07:55 CET 2017 - sbrabec(a)suse.com + +- Update to version 2.29.1: + * lscpu: add aarch64 specific names + * lubmount: Disable disable ro/rw mtab checks (bsc#1012632) + * More details at: + https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29.1-ReleaseNotes + +------------------------------------------------------------------- +Tue Feb 7 18:31:04 CET 2017 - sbrabec(a)suse.com + +- Replace raw initscript by a systemd service doing the same thing. + Based on previous work of fcrozat(a)suse.com (FATE#321122). + +------------------------------------------------------------------- util-linux-systemd.changes: same change util-linux.changes: same change Old: ---- raw.init util-linux-2.29.tar.sign util-linux-2.29.tar.xz New: ---- raw.service util-linux-2.29.1.tar.sign util-linux-2.29.1.tar.xz util-linux-losetup-Add-support-for-setting-logical-blocksize.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-libmount.spec ++++++ --- /var/tmp/diff_new_pack.6w7rsQ/_old 2017-03-01 23:39:15.182371932 +0100 +++ /var/tmp/diff_new_pack.6w7rsQ/_new 2017-03-01 23:39:15.186371368 +0100 @@ -16,7 +16,11 @@ # +%if 0%{?suse_version} >= 1330 %bcond_without enable_last +%else +%bcond_with enable_last +%endif Name: python-libmount %define _name util-linux @@ -112,7 +116,7 @@ %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.29 +Version: 2.29.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -123,7 +127,7 @@ Url: https://www.kernel.org/pub/linux/utils/util-linux/ Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.t… Source1: util-linux-rpmlintrc -Source4: raw.init +Source4: raw.service Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf @@ -150,7 +154,9 @@ ## util-linux patches ## # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path -Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +# PATCH-FEATURE-SLE util-linux-losetup-Add-support-for-setting-logical-blocksize.patch bsc931634 FATE319010 hare(a)suse.de -- Add support for setting logical blocksizes. +Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -159,7 +165,6 @@ # bnc#651598: Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions -PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} Provides: eject = 2.1.0-166.8 Provides: login = 4.0-33.7 @@ -174,6 +179,8 @@ Conflicts: sysvinit-tools < 2.88+-87 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). Conflicts: bash-completion <= 2.1-13.1 +# The preset is provided by the presets branding package since 0.4 (bsc#1012850) +Conflicts: systemd-presets-branding < 0.4 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -189,6 +196,13 @@ Recommends: adjtimex Recommends: time Recommends: which +# +%if 0%{?suse_version} < 1330 +# Using Conflicts as util-linux-losetup-Add-support-for-setting-logical-blocksize +# now uses bit 5 of lo_flags with meaning LO_FLAGS_BLOCKSIZE bsc#966891 +# +Conflicts: kernel < 4.4 +%endif %else %if %build_python_libmount %else @@ -383,7 +397,11 @@ %endif %prep %setup -q -n %{_name}-%{version} -b 40 -%patch4 -p1 +%patch0 -p1 +%if 0%{?suse_version} < 1330 +# logical block size support in loop does not exist in Tumbleweed and upstream kernel yet +%patch1 -p1 +%endif # # setctsid cp -p %{S:22} %{S:23} . @@ -599,7 +617,7 @@ %install %if %build_util_linux -mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} +mkdir -p %{buildroot}{%{_sysconfdir}/{pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote @@ -608,7 +626,6 @@ install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} @@ -672,8 +689,8 @@ chmod 755 %{buildroot}%{_sbindir}/flushb # Install scripts to configure raw devices at boot time install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw -install -m 755 $RPM_SOURCE_DIR/raw.init %{buildroot}%{_initddir}/raw -ln -sf ../..%{_sysconfdir}/init.d/raw %{buildroot}%{_sbindir}/rcraw +install -m 644 $RPM_SOURCE_DIR/raw.service %{buildroot}%{_unitdir} +ln -sf service %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ @@ -732,14 +749,11 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid mkdir -p %{buildroot}/run/uuidd -mkdir -p %{buildroot}/usr/lib/systemd/system-preset ln -s %{_bindir}/logger %{buildroot}/bin # clock.txt from uuidd is a ghost file touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim -# Use socket activated uuidd by default. -echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/systemd/system-preset/50-uuidd.preset %if !%build_util_linux %make_install %endif @@ -748,8 +762,11 @@ %fdupes -s %{buildroot}%{_prefix} %if %build_util_linux +%pre +%{service_add_pre raw.service} + %post -%{fillup_and_insserv raw} +%{service_add_post raw.service} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -775,8 +792,11 @@ sed -i 's:code=:codepage=:' etc/fstab fi +%preun +%{service_del_preun raw.service} + %postun -%{insserv_cleanup} +%{service_del_postun raw.service} %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -825,7 +845,6 @@ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : %{service_add_pre uuidd.socket uuidd.service} -%{?systemd_preset_pre} %post -n uuidd %{service_add_post uuidd.socket uuidd.service} @@ -836,8 +855,6 @@ %postun -n uuidd %{service_del_postun uuidd.socket uuidd.service} -%posttrans -p /bin/bash -n uuidd -%{?systemd_preset_posttrans} %endif %if %build_util_linux @@ -860,7 +877,7 @@ %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%config %attr(744,root,root) %{_sysconfdir}/init.d/raw +%{_unitdir}/raw.service %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf @@ -1115,6 +1132,8 @@ %dir %{_datadir}/getopt %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh +# These directories should be owned by bash-completion. But we don't want to +# install them on build, so own these two directories: %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/* @@ -1251,6 +1270,15 @@ /bin/logger %{_bindir}/logger %{_bindir}/lslogins +#BEGIN bootstrap_hack +%if 0%{?suse_version} < 1330 +# Build images of some products use util-linux that does not come from this +# spec and does not own bash-completion dir. So we have to own own these two +# directories in util-linux-systemd as well: +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%endif +#END bootstrap_hack %{_datadir}/bash-completion/completions/logger %{_datadir}/bash-completion/completions/lslogins %{_mandir}/man1/logger.1.gz @@ -1270,7 +1298,6 @@ %{_sbindir}/rcuuidd %{_unitdir}/uuidd.service %{_unitdir}/uuidd.socket -/usr/lib/systemd/system-preset/50-uuidd.preset %endif %if %build_python_libmount ++++++ util-linux-systemd.spec ++++++ --- /var/tmp/diff_new_pack.6w7rsQ/_old 2017-03-01 23:39:15.238364036 +0100 +++ /var/tmp/diff_new_pack.6w7rsQ/_new 2017-03-01 23:39:15.242363472 +0100 @@ -16,7 +16,11 @@ # +%if 0%{?suse_version} >= 1330 %bcond_without enable_last +%else +%bcond_with enable_last +%endif Name: util-linux-systemd %define _name util-linux @@ -112,7 +116,7 @@ %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.29 +Version: 2.29.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -123,7 +127,7 @@ Url: https://www.kernel.org/pub/linux/utils/util-linux/ Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.t… Source1: util-linux-rpmlintrc -Source4: raw.init +Source4: raw.service Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf @@ -150,7 +154,9 @@ ## util-linux patches ## # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path -Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +# PATCH-FEATURE-SLE util-linux-losetup-Add-support-for-setting-logical-blocksize.patch bsc931634 FATE319010 hare(a)suse.de -- Add support for setting logical blocksizes. +Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -159,7 +165,6 @@ # bnc#651598: Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions -PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} Provides: eject = 2.1.0-166.8 Provides: login = 4.0-33.7 @@ -174,6 +179,8 @@ Conflicts: sysvinit-tools < 2.88+-87 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). Conflicts: bash-completion <= 2.1-13.1 +# The preset is provided by the presets branding package since 0.4 (bsc#1012850) +Conflicts: systemd-presets-branding < 0.4 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -189,6 +196,13 @@ Recommends: adjtimex Recommends: time Recommends: which +# +%if 0%{?suse_version} < 1330 +# Using Conflicts as util-linux-losetup-Add-support-for-setting-logical-blocksize +# now uses bit 5 of lo_flags with meaning LO_FLAGS_BLOCKSIZE bsc#966891 +# +Conflicts: kernel < 4.4 +%endif %else %if %build_python_libmount %else @@ -383,7 +397,11 @@ %endif %prep %setup -q -n %{_name}-%{version} -b 40 -%patch4 -p1 +%patch0 -p1 +%if 0%{?suse_version} < 1330 +# logical block size support in loop does not exist in Tumbleweed and upstream kernel yet +%patch1 -p1 +%endif # # setctsid cp -p %{S:22} %{S:23} . @@ -599,7 +617,7 @@ %install %if %build_util_linux -mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} +mkdir -p %{buildroot}{%{_sysconfdir}/{pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote @@ -608,7 +626,6 @@ install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} @@ -672,8 +689,8 @@ chmod 755 %{buildroot}%{_sbindir}/flushb # Install scripts to configure raw devices at boot time install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw -install -m 755 $RPM_SOURCE_DIR/raw.init %{buildroot}%{_initddir}/raw -ln -sf ../..%{_sysconfdir}/init.d/raw %{buildroot}%{_sbindir}/rcraw +install -m 644 $RPM_SOURCE_DIR/raw.service %{buildroot}%{_unitdir} +ln -sf service %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ @@ -732,14 +749,11 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid mkdir -p %{buildroot}/run/uuidd -mkdir -p %{buildroot}/usr/lib/systemd/system-preset ln -s %{_bindir}/logger %{buildroot}/bin # clock.txt from uuidd is a ghost file touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim -# Use socket activated uuidd by default. -echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/systemd/system-preset/50-uuidd.preset %if !%build_util_linux %make_install %endif @@ -748,8 +762,11 @@ %fdupes -s %{buildroot}%{_prefix} %if %build_util_linux +%pre +%{service_add_pre raw.service} + %post -%{fillup_and_insserv raw} +%{service_add_post raw.service} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -775,8 +792,11 @@ sed -i 's:code=:codepage=:' etc/fstab fi +%preun +%{service_del_preun raw.service} + %postun -%{insserv_cleanup} +%{service_del_postun raw.service} %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -825,7 +845,6 @@ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : %{service_add_pre uuidd.socket uuidd.service} -%{?systemd_preset_pre} %post -n uuidd %{service_add_post uuidd.socket uuidd.service} @@ -836,8 +855,6 @@ %postun -n uuidd %{service_del_postun uuidd.socket uuidd.service} -%posttrans -p /bin/bash -n uuidd -%{?systemd_preset_posttrans} %endif %if %build_util_linux @@ -860,7 +877,7 @@ %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%config %attr(744,root,root) %{_sysconfdir}/init.d/raw +%{_unitdir}/raw.service %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf @@ -1115,6 +1132,8 @@ %dir %{_datadir}/getopt %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh +# These directories should be owned by bash-completion. But we don't want to +# install them on build, so own these two directories: %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/* @@ -1251,6 +1270,15 @@ /bin/logger %{_bindir}/logger %{_bindir}/lslogins +#BEGIN bootstrap_hack +%if 0%{?suse_version} < 1330 +# Build images of some products use util-linux that does not come from this +# spec and does not own bash-completion dir. So we have to own own these two +# directories in util-linux-systemd as well: +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%endif +#END bootstrap_hack %{_datadir}/bash-completion/completions/logger %{_datadir}/bash-completion/completions/lslogins %{_mandir}/man1/logger.1.gz @@ -1270,7 +1298,6 @@ %{_sbindir}/rcuuidd %{_unitdir}/uuidd.service %{_unitdir}/uuidd.socket -/usr/lib/systemd/system-preset/50-uuidd.preset %endif %if %build_python_libmount ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.6w7rsQ/_old 2017-03-01 23:39:15.274358960 +0100 +++ /var/tmp/diff_new_pack.6w7rsQ/_new 2017-03-01 23:39:15.278358395 +0100 @@ -16,7 +16,11 @@ # +%if 0%{?suse_version} >= 1330 %bcond_without enable_last +%else +%bcond_with enable_last +%endif Name: util-linux %define _name util-linux @@ -112,7 +116,7 @@ %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.29 +Version: 2.29.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -123,7 +127,7 @@ Url: https://www.kernel.org/pub/linux/utils/util-linux/ Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.t… Source1: util-linux-rpmlintrc -Source4: raw.init +Source4: raw.service Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf @@ -150,7 +154,9 @@ ## util-linux patches ## # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path -Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +# PATCH-FEATURE-SLE util-linux-losetup-Add-support-for-setting-logical-blocksize.patch bsc931634 FATE319010 hare(a)suse.de -- Add support for setting logical blocksizes. +Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -159,7 +165,6 @@ # bnc#651598: Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions -PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} Provides: eject = 2.1.0-166.8 Provides: login = 4.0-33.7 @@ -174,6 +179,8 @@ Conflicts: sysvinit-tools < 2.88+-87 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). Conflicts: bash-completion <= 2.1-13.1 +# The preset is provided by the presets branding package since 0.4 (bsc#1012850) +Conflicts: systemd-presets-branding < 0.4 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -189,6 +196,13 @@ Recommends: adjtimex Recommends: time Recommends: which +# +%if 0%{?suse_version} < 1330 +# Using Conflicts as util-linux-losetup-Add-support-for-setting-logical-blocksize +# now uses bit 5 of lo_flags with meaning LO_FLAGS_BLOCKSIZE bsc#966891 +# +Conflicts: kernel < 4.4 +%endif %else %if %build_python_libmount %else @@ -383,7 +397,11 @@ %endif %prep %setup -q -n %{_name}-%{version} -b 40 -%patch4 -p1 +%patch0 -p1 +%if 0%{?suse_version} < 1330 +# logical block size support in loop does not exist in Tumbleweed and upstream kernel yet +%patch1 -p1 +%endif # # setctsid cp -p %{S:22} %{S:23} . @@ -599,7 +617,7 @@ %install %if %build_util_linux -mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} +mkdir -p %{buildroot}{%{_sysconfdir}/{pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote @@ -608,7 +626,6 @@ install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} @@ -672,8 +689,8 @@ chmod 755 %{buildroot}%{_sbindir}/flushb # Install scripts to configure raw devices at boot time install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw -install -m 755 $RPM_SOURCE_DIR/raw.init %{buildroot}%{_initddir}/raw -ln -sf ../..%{_sysconfdir}/init.d/raw %{buildroot}%{_sbindir}/rcraw +install -m 644 $RPM_SOURCE_DIR/raw.service %{buildroot}%{_unitdir} +ln -sf service %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ @@ -732,14 +749,11 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid mkdir -p %{buildroot}/run/uuidd -mkdir -p %{buildroot}/usr/lib/systemd/system-preset ln -s %{_bindir}/logger %{buildroot}/bin # clock.txt from uuidd is a ghost file touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim -# Use socket activated uuidd by default. -echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/systemd/system-preset/50-uuidd.preset %if !%build_util_linux %make_install %endif @@ -748,8 +762,11 @@ %fdupes -s %{buildroot}%{_prefix} %if %build_util_linux +%pre +%{service_add_pre raw.service} + %post -%{fillup_and_insserv raw} +%{service_add_post raw.service} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -775,8 +792,11 @@ sed -i 's:code=:codepage=:' etc/fstab fi +%preun +%{service_del_preun raw.service} + %postun -%{insserv_cleanup} +%{service_del_postun raw.service} %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -825,7 +845,6 @@ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : %{service_add_pre uuidd.socket uuidd.service} -%{?systemd_preset_pre} %post -n uuidd %{service_add_post uuidd.socket uuidd.service} @@ -836,8 +855,6 @@ %postun -n uuidd %{service_del_postun uuidd.socket uuidd.service} -%posttrans -p /bin/bash -n uuidd -%{?systemd_preset_posttrans} %endif %if %build_util_linux @@ -860,7 +877,7 @@ %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%config %attr(744,root,root) %{_sysconfdir}/init.d/raw +%{_unitdir}/raw.service %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf @@ -1115,6 +1132,8 @@ %dir %{_datadir}/getopt %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh +# These directories should be owned by bash-completion. But we don't want to +# install them on build, so own these two directories: %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/* @@ -1251,6 +1270,15 @@ /bin/logger %{_bindir}/logger %{_bindir}/lslogins +#BEGIN bootstrap_hack +%if 0%{?suse_version} < 1330 +# Build images of some products use util-linux that does not come from this +# spec and does not own bash-completion dir. So we have to own own these two +# directories in util-linux-systemd as well: +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%endif +#END bootstrap_hack %{_datadir}/bash-completion/completions/logger %{_datadir}/bash-completion/completions/lslogins %{_mandir}/man1/logger.1.gz @@ -1270,7 +1298,6 @@ %{_sbindir}/rcuuidd %{_unitdir}/uuidd.service %{_unitdir}/uuidd.socket -/usr/lib/systemd/system-preset/50-uuidd.preset %endif %if %build_python_libmount ++++++ etc.raw ++++++ --- /var/tmp/diff_new_pack.6w7rsQ/_old 2017-03-01 23:39:15.450334143 +0100 +++ /var/tmp/diff_new_pack.6w7rsQ/_new 2017-03-01 23:39:15.450334143 +0100 @@ -4,12 +4,12 @@ # to block devices # # The format of this file is: -# raw<N>:<blockdev> +# raw<N>:<blockdev> # # example: # --------- -# raw1:hdb1 +# raw1:sdb1 # -# this means: bind /dev/raw/raw1 to /dev/hdb1 +# this means: bind /dev/raw/raw1 to /dev/sdb1 # # ... ++++++ raw.service ++++++ [Unit] Description=raw devices After=local-fs.target remote-fs.target [Service] Type=oneshot ExecStart=/bin/sh -c "\ /sbin/modprobe raw;\ /sbin/udevadm settle;\ for i in `grep -v ^# /etc/raw`; do\ rawdev=`echo $i | cut -f1 -d:`;\ rawbind=`echo $i | cut -f2- -d:`;\ /usr/sbin/raw /dev/raw/$rawdev /dev/$rawbind;\ done" [Install] WantedBy=multi-user.target ++++++ util-linux-2.29.tar.xz -> util-linux-2.29.1.tar.xz ++++++ ++++ 73427 lines of diff (skipped) ++++++ util-linux-losetup-Add-support-for-setting-logical-blocksize.patch ++++++ Index: util-linux-2.29/include/loopdev.h =================================================================== --- util-linux-2.29.orig/include/loopdev.h +++ util-linux-2.29/include/loopdev.h @@ -41,6 +41,7 @@ enum { LO_FLAGS_AUTOCLEAR = 4, /* kernel >= 2.6.25 */ LO_FLAGS_PARTSCAN = 8, /* kernel >= 3.2 */ LO_FLAGS_DIRECT_IO = 16, /* kernel >= 4.2 */ + LO_FLAGS_BLOCKSIZE = 32, /* Tentative */ }; #define LO_NAME_SIZE 64 @@ -120,7 +121,8 @@ enum { LOOPDEV_FL_NOIOCTL = (1 << 6), LOOPDEV_FL_DEVSUBDIR = (1 << 7), LOOPDEV_FL_CONTROL = (1 << 8), /* system with /dev/loop-control */ - LOOPDEV_FL_SIZELIMIT = (1 << 9) + LOOPDEV_FL_SIZELIMIT = (1 << 9), + LOOPDEV_FL_BLOCKSIZE = (1 << 10) }; /* @@ -173,6 +175,7 @@ int loopcxt_set_offset(struct loopdev_cx int loopcxt_set_sizelimit(struct loopdev_cxt *lc, uint64_t sizelimit); int loopcxt_set_flags(struct loopdev_cxt *lc, uint32_t flags); int loopcxt_set_backing_file(struct loopdev_cxt *lc, const char *filename); +int loopcxt_set_blocksize(struct loopdev_cxt *lc, uint64_t blocksize); extern char *loopcxt_get_backing_file(struct loopdev_cxt *lc); extern int loopcxt_get_backing_devno(struct loopdev_cxt *lc, dev_t *devno); Index: util-linux-2.29/lib/loopdev.c =================================================================== --- util-linux-2.29.orig/lib/loopdev.c +++ util-linux-2.29/lib/loopdev.c @@ -1115,6 +1115,26 @@ int loopcxt_set_backing_file(struct loop } /* + * @lc: context + * @blocksize: logical blocksize for the device + * + * The setting is removed by loopcxt_set_device() loopcxt_next()! + * + * Returns: 0 on success, <0 on error. + */ +int loopcxt_set_blocksize(struct loopdev_cxt *lc, uint64_t blocksize) +{ + if (!lc) + return -EINVAL; + + lc->info.lo_init[0] = blocksize; + lc->info.lo_flags |= LO_FLAGS_BLOCKSIZE; + + DBG(CXT, ul_debugobj(lc, "set blocksize=%llu", (long long unsigned int)lc->info.lo_init[0])); + return 0; +} + +/* * In kernels prior to v3.9, if the offset or sizelimit options * are used, the block device's size won't be synced automatically. * blockdev --getsize64 and filesystems will use the backing Index: util-linux-2.29/sys-utils/losetup.c =================================================================== --- util-linux-2.29.orig/sys-utils/losetup.c +++ util-linux-2.29/sys-utils/losetup.c @@ -398,6 +398,7 @@ static void usage(FILE *out) fputs(_(" -o, --offset <num> start at offset <num> into file\n"), out); fputs(_(" --sizelimit <num> device is limited to <num> bytes of the file\n"), out); + fputs(_(" -L, --logical-blocksize <size> set the logical block size to <size>\n"), out); fputs(_(" -P, --partscan create a partitioned loop device\n"), out); fputs(_(" -r, --read-only set up a read-only loop device\n"), out); fputs(_(" --direct-io[=<on|off>] open backing file with O_DIRECT\n"), out); @@ -447,7 +448,8 @@ static void warn_size(const char *filena static int create_loop(struct loopdev_cxt *lc, int nooverlap, int lo_flags, int flags, - const char *file, uint64_t offset, uint64_t sizelimit) + const char *file, uint64_t offset, uint64_t sizelimit, + uint64_t blocksize) { int hasdev = loopcxt_has_device(lc); int rc = 0; @@ -533,6 +535,8 @@ static int create_loop(struct loopdev_cx loopcxt_set_offset(lc, offset); if (flags & LOOPDEV_FL_SIZELIMIT) loopcxt_set_sizelimit(lc, sizelimit); + if (flags & LOOPDEV_FL_BLOCKSIZE) + loopcxt_set_blocksize(lc, blocksize); if (lo_flags) loopcxt_set_flags(lc, lo_flags); if ((rc = loopcxt_set_backing_file(lc, file))) { @@ -561,7 +565,7 @@ int main(int argc, char **argv) struct loopdev_cxt lc; int act = 0, flags = 0, no_overlap = 0, c; char *file = NULL; - uint64_t offset = 0, sizelimit = 0; + uint64_t offset = 0, sizelimit = 0, blocksize = 0; int res = 0, showdev = 0, lo_flags = 0; char *outarg = NULL; int list = 0; @@ -571,7 +575,8 @@ int main(int argc, char **argv) OPT_SIZELIMIT = CHAR_MAX + 1, OPT_SHOW, OPT_RAW, - OPT_DIO + OPT_DIO, + OPT_BLOCKSIZE }; static const struct option longopts[] = { { "all", 0, 0, 'a' }, @@ -584,6 +589,7 @@ int main(int argc, char **argv) { "associated", 1, 0, 'j' }, { "json", 0, 0, 'J' }, { "list", 0, 0, 'l' }, + { "logical-blocksize", 1, 0, 'L' }, { "noheadings", 0, 0, 'n' }, { "offset", 1, 0, 'o' }, { "output", 1, 0, 'O' }, @@ -657,6 +663,10 @@ int main(int argc, char **argv) act = A_SHOW; file = optarg; break; + case OPT_BLOCKSIZE: + blocksize = strtosize_or_err(optarg, _("failed to parse logical block size")); + flags |= LOOPDEV_FL_BLOCKSIZE; + break; case 'l': list = 1; break; @@ -789,7 +799,8 @@ int main(int argc, char **argv) switch (act) { case A_CREATE: - res = create_loop(&lc, no_overlap, lo_flags, flags, file, offset, sizelimit); + res = create_loop(&lc, no_overlap, lo_flags, flags, file, offset, + sizelimit, blocksize); if (res == 0) { if (showdev) printf("%s\n", loopcxt_get_device(&lc));

1 0