Hello community,

here is the log from the commit of package busybox for openSUSE:Factory checked 
in at 2020-05-09 19:47:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/busybox (Old)
 and      /work/SRC/openSUSE:Factory/.busybox.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "busybox"

Sat May  9 19:47:51 2020 rev:56 rq:794857 version:1.31.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/busybox/busybox.changes  2020-02-25 
16:01:36.631985303 +0100
+++ /work/SRC/openSUSE:Factory/.busybox.new.2738/busybox.changes        
2020-05-09 19:47:52.604261152 +0200
@@ -1,0 +2,16 @@
+Fri Apr 17 09:46:21 UTC 2020 - Thorsten Kukuk <[email protected]>
+
+- Re-add modutils
+
+-------------------------------------------------------------------
+Sat Mar 21 11:18:54 UTC 2020 - Thorsten Kukuk <[email protected]>
+
+- Set last ID to 65533, else nobody cannot be created
+
+-------------------------------------------------------------------
+Fri Mar 13 20:04:25 UTC 2020 - Thorsten Kukuk <[email protected]>
+
+- Merge config of default, -container and -static to be able to
+  drop -container variant
+
+-------------------------------------------------------------------

Old:
----
  busybox-container.config

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ busybox.spec ++++++
--- /var/tmp/diff_new_pack.WL971i/_old  2020-05-09 19:47:54.680265609 +0200
+++ /var/tmp/diff_new_pack.WL971i/_new  2020-05-09 19:47:54.684265617 +0200
@@ -27,15 +27,13 @@
 Source1:        BusyBox.1
 Source2:        busybox.config
 Source3:        busybox-static.config
-Source4:        busybox-container.config
-Source5:        man.conf
+Source4:        man.conf
 # Upstream patches
 Patch0:         busybox-no-stime.patch
 # other patches
 Patch100:       busybox.install.patch
 Provides:       useradd_or_adduser_dep
 BuildRequires:  glibc-devel-static
-BuildRequires:  libtirpc-devel
 
 %description
 BusyBox combines tiny versions of many common UNIX utilities into a
@@ -55,15 +53,6 @@
 BusyBox combines tiny versions of many common UNIX utilities into a
 single executable.
 
-%package container
-Summary:        A version of Busybox configured for containers
-Group:          System/Base
-Provides:       useradd_or_adduser_dep
-
-%description container
-This is a small BusyBox version which contains only the tools which
-makes sense in a container.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -79,13 +68,6 @@
 export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc"
 export CC="gcc"
 export HOSTCC=gcc
-cp -a %{SOURCE4} .config
-make %{?_smp_mflags} -e oldconfig
-make -e %{?_smp_mflags}
-mv busybox busybox-container
-make busybox.links
-mv busybox.links busybox-container.links
-sed -e 's|busybox.links|busybox-container.links|g' -e 
's|/usr/bin/busybox|/usr/bin/busybox-container|g' applets/install.sh > 
busybox-container.install
 cp -a %{SOURCE3} .config
 make %{?_smp_mflags} -e oldconfig
 make -e %{?_smp_mflags}
@@ -100,20 +82,18 @@
 install -d %{buildroot}/%{_bindir}
 install -d %{buildroot}/%{_datadir}/busybox
 install -m 0644 busybox.links %{buildroot}%{_datadir}/busybox
-install -m 0644 busybox-container.links %{buildroot}%{_datadir}/busybox
 install applets/install.sh %{buildroot}%{_bindir}/busybox.install
-install busybox-container.install 
%{buildroot}%{_bindir}/busybox-container.install
 install -m 0755 busybox %{buildroot}%{_bindir}
 install -m 0755 busybox-static %{buildroot}%{_bindir}
-install -m 0755 busybox-container %{buildroot}%{_bindir}
 install -d %{buildroot}%{_sysconfdir}
-install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/
+install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/
 install -d %{buildroot}%{_mandir}/man1
 install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1
 
 %files
 %license LICENSE
 %doc docs/mdev.txt
+%config %{_sysconfdir}/man.conf
 %doc %{_mandir}/man1/BusyBox.1.gz
 %{_bindir}/busybox
 %{_bindir}/busybox.install
@@ -124,11 +104,4 @@
 %license LICENSE
 %{_bindir}/busybox-static
 
-%files container
-%license LICENSE
-%{_sysconfdir}/man.conf
-%{_bindir}/busybox-container
-%{_bindir}/busybox-container.install
-%{_datadir}/busybox/busybox-container.links
-
 %changelog

++++++ busybox-static.config ++++++
++++ 930 lines (skipped)
++++ between busybox-static.config
++++ and /work/SRC/openSUSE:Factory/.busybox.new.2738/busybox-static.config

++++++ busybox.config ++++++
++++ 940 lines (skipped)
++++ between busybox.config
++++ and /work/SRC/openSUSE:Factory/.busybox.new.2738/busybox.config


Reply via email to