commit aaa_base for openSUSE:Factory
Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2019-05-03 22:06:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base" Fri May 3 22:06:18 2019 rev:453 rq:697510 version:84.87+git20190418.d83e9d6 Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2019-04-22 12:22:12.372831387 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new.5148/aaa_base.changes 2019-05-03 22:06:20.230794724 +0200 @@ -1,0 +2,31 @@ +Thu Apr 18 14:25:19 UTC 2019 - kukuk@suse.com + +- Update to version 84.87+git20190418.d83e9d6: + * convert_sysctl isn't needed anymore + +------------------------------------------------------------------- +Thu Apr 18 14:13:03 UTC 2019 - kukuk@suse.com + +- Update to version 84.87+git20190418.f488c70: + * Remove sysconfig/sysctl to sysctl.conf merge, there is no active + distribution anymore from which we support an update with this. + +------------------------------------------------------------------- +Thu Apr 18 13:11:28 UTC 2019 - kukuk@suse.com + +- Update to version 84.87+git20190418.155e7f0: + * Remove sysconfig/cron to tmpfiles, we don't support upgrade from + such old distributions to Factory anymore. + * /etc/sysconfig/boot and /etc/sysconfig/shutdown don't exist anymore, + no need to remove single variables from it. + * Remove obsolete code for /etc/psdevtab and YaST + +------------------------------------------------------------------- +Thu Apr 18 11:00:00 CEST 2019 - kukuk@suse.de + +- Remove over 12 year old compat provides +- Remove BuildRequires for net-tools, the code was removed and this + package does not contain the wanted tool anymore +- Replace net-tools with successors in Recommends + +------------------------------------------------------------------- Old: ---- aaa_base-84.87+git20190418.a543e8e.tar.xz New: ---- aaa_base-84.87+git20190418.d83e9d6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.zZbAYz/_old 2019-05-03 22:06:20.862795846 +0200 +++ /var/tmp/diff_new_pack.zZbAYz/_new 2019-05-03 22:06:20.866795853 +0200 @@ -23,18 +23,11 @@ %endif Name: aaa_base -Version: 84.87+git20190418.a543e8e +Version: 84.87+git20190418.d83e9d6 Release: 0 Url: https://github.com/openSUSE/aaa_base -Provides: aaa_skel = %{version}-%{release} -Provides: bin -Provides: bootutls -Provides: etc -Provides: skeleng -Provides: skelger -Obsoletes: aaa_skel < %{version} -# do not require systemd - aaa_base is in the build environment and we don't want -# to pull in tons of dependencies +# do not require systemd - aaa_base is in the build environment and we don't +# want to pull in tons of dependencies Conflicts: sysvinit-init Requires: /bin/login Requires: /bin/mktemp @@ -44,10 +37,7 @@ Requires: cpio Requires: distribution-release Requires: filesystem -# for symlink check to /bin/hostname -BuildRequires: net-tools -BuildRequires: xz -Recommends: logrotate netcfg udev net-tools aaa_base-extras +Recommends: logrotate netcfg udev iputils iproute2 aaa_base-extras PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date Requires(post): fillup Summary: openSUSE Base Package @@ -173,7 +163,7 @@ %files %defattr(-,root,root) %license COPYING -%config(noreplace) %ghost /etc/sysctl.conf +%config(noreplace) /etc/sysctl.conf %config /etc/bash.bashrc %config /etc/csh.cshrc %config /etc/csh.login @@ -216,8 +206,6 @@ /usr/bin/rpmlocate /usr/bin/safe-rm /usr/bin/safe-rmdir -%dir /usr/lib/base-scripts -/usr/lib/base-scripts/convert_sysctl /usr/lib/restricted/bin/hostname /usr/sbin/sysconf_addword /usr/share/man/man1/smart_agetty.1* @@ -245,6 +233,7 @@ /etc/profile.d/ls.tcsh /etc/profile.d/ls.bash /etc/profile.d/ls.zsh +%dir /usr/lib/base-scripts /usr/lib/base-scripts/backup-rpmdb /usr/lib/base-scripts/backup-sysconfig /usr/lib/base-scripts/check-battery ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.zZbAYz/_old 2019-05-03 22:06:20.906795924 +0200 +++ /var/tmp/diff_new_pack.zZbAYz/_new 2019-05-03 22:06:20.910795931 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">a543e8e7db2a84ba56a6864d640ee68518cb116c</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">d83e9d67c6cf097f2e21460a4163766ab8322a77</param></service></servicedata> \ No newline at end of file ++++++ aaa_base-84.87+git20190418.a543e8e.tar.xz -> aaa_base-84.87+git20190418.d83e9d6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20190418.a543e8e/aaa_base.post new/aaa_base-84.87+git20190418.d83e9d6/aaa_base.post --- old/aaa_base-84.87+git20190418.a543e8e/aaa_base.post 2019-04-18 09:55:14.000000000 +0200 +++ new/aaa_base-84.87+git20190418.d83e9d6/aaa_base.post 2019-04-18 16:24:31.000000000 +0200 @@ -8,88 +8,15 @@ # # Run this script in C-Locale, or some tools will fail. export LC_ALL=C -test -n "$FIRST_ARG" || FIRST_ARG=$1 -# -# to make sure, /var/lib/YaST/bin/bootsetup runs fine, delete -# /usr/lib/YaST/.configured2 -test -e /usr/lib/YaST/.configured2 && rm -f /usr/lib/YaST/.configured2 -# -# there are some installation with an etc/psdevtab, which is only readable -# for root - this slows ps for any other user. starting ps as root, creates -# it, when it doesn't exist (readable). So simply delete it. -# -test -e /etc/psdevtab && rm -f /etc/psdevtab - -if [ "$FIRST_ARG" -gt 1 ]; then - - # boot variables dropped after 13.1 - %{remove_and_set -n boot PROMPT_FOR_CONFIRM CONFIRM_PROMPT_TIMEOUT RUN_PARALLEL FLOW_CONTROL FSCK_MAX_INST KLOGCONSOLE_PARAMS ENFORCE_BLOGD} +if [ "$1" -gt 1 ]; then # clock variables dropped after 13.1 %{remove_and_set -n clock SYSTOHC FORCE_SYSTOHC BADYEAR HCTOSYS_DEVICE USE_HWCLOCK USE_ADJUST} - - # shutdown variables dropped after 13.1 - %{remove_and_set -n shutdown HALT_SOUND HALT_POWERDOWN_INSERT HALT HALT_NETWORK HALT_DISKS} - - # variables droped in 13.1 - old_cron_vars="MAX_DAYS_IN_TMP MAX_DAYS_IN_LONG_TMP TMP_DIRS_TO_CLEAR LONG_TMP_DIRS_TO_CLEAR OWNER_TO_KEEP_IN_TMP CLEAR_TMP_DIRS_AT_BOOTUP" - %{remove_and_set -n cron $old_cron_vars} - if [ "$MAX_DAYS_IN_TMP" != '0' -a "$MAX_DAYS_IN_TMP" != 'no' -o \ - "$MAX_DAYS_IN_LONG_TMP" != '0' -a "$MAX_DAYS_IN_LONG_TMP" != 'no' -o \ - "$CLEAR_TMP_DIRS_AT_BOOTUP" != 'no' ]; then - mkdir -p '/var/adm/update-messages' - msgfile='/var/adm/update-messages/%name-%version-%release-tmpdirs' - for i in $old_cron_vars; do - eval v=\$$i - [ -n "$v" -a "$v" != 'no' ] || continue - if [ ! -e "$msgfile" ]; then - cat > "$msgfile" <<-EOF - sysconfig settings for cleaning up temporary directories are no longer - supported. Some of the features are provided by systemd's tmpfile - mechanism instead. Please refer to 'man tmpfiles.d' for more - information. - - Here are the old settings for reference: - - EOF - fi - echo "$i=$v" >> "$msgfile" - done - fi fi -if ! [ -d /etc/sysconfig ] ; then - mkdir -p /etc/sysconfig -fi for i in language proxy windowmanager ; do %{fillup_only -n $i} done -if [ -e /etc/sysconfig/sysctl ]; then - echo "merging /etc/sysconfig/sysctl into /etc/sysctl.conf ..." - /usr/lib/base-scripts/convert_sysctl - mv /etc/sysconfig/sysctl /etc/sysconfig/sysctl.rpmsave -fi -test -e /etc/sysctl.conf || cat <<EOF >/etc/sysctl.conf -#### -# -# /etc/sysctl.conf is meant for local sysctl settings -# -# sysctl reads settings from the following locations: -# /boot/sysctl.conf-<kernelversion> -# /lib/sysctl.d/*.conf -# /usr/lib/sysctl.d/*.conf -# /usr/local/lib/sysctl.d/*.conf -# /etc/sysctl.d/*.conf -# /run/sysctl.d/*.conf -# /etc/sysctl.conf -# -# To disable or override a distribution provided file just place a -# file with the same name in /etc/sysctl.d/ -# -# See sysctl.conf(5), sysctl.d(5) and sysctl(8) for more information -# -#### -EOF # # create mtab if it does not exist # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20190418.a543e8e/files/etc/sysctl.conf new/aaa_base-84.87+git20190418.d83e9d6/files/etc/sysctl.conf --- old/aaa_base-84.87+git20190418.a543e8e/files/etc/sysctl.conf 2019-04-18 09:55:14.000000000 +0200 +++ new/aaa_base-84.87+git20190418.d83e9d6/files/etc/sysctl.conf 2019-04-18 16:24:31.000000000 +0200 @@ -0,0 +1,8 @@ +#### +# +# To disable or override a distribution provided file just place a +# file with the same name in /etc/sysctl.d/ +# +# See sysctl.conf(5), sysctl.d(5) and sysctl(8) for more information +# +#### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20190418.a543e8e/files/usr/lib/base-scripts/convert_sysctl new/aaa_base-84.87+git20190418.d83e9d6/files/usr/lib/base-scripts/convert_sysctl --- old/aaa_base-84.87+git20190418.a543e8e/files/usr/lib/base-scripts/convert_sysctl 2019-04-18 09:55:14.000000000 +0200 +++ new/aaa_base-84.87+git20190418.d83e9d6/files/usr/lib/base-scripts/convert_sysctl 1970-01-01 01:00:00.000000000 +0100 @@ -1,127 +0,0 @@ -#!/bin/bash -# read settings from /etc/sysconfig/sysctl and write them to -# /etc/sysctl.conf - -. /etc/sysconfig/sysctl 2>/dev/null || exit 0 - -nofile= -if [ "$1" = "--stdout" ]; then - shift - nofile=1 -fi -if [ -e "$cfg" -a ! -w "$cfg" ]; then - nofile=1 -fi - -cfg=/etc/sysctl.conf - -comment_added='' -_doset() -{ - if [ -z "$nofile" -a -z "$comment_added" ]; then - comment_added=1 - echo - echo "### converted from /etc/sysconfig/sysctl at `date -R`" - fi - echo "$1 = $2" -} - -doset() -{ - if [ -z "$nofile" ]; then - _doset "$@" >> $cfg - else - _doset "$@" - fi -} - -isset() -{ - test -z "$nofile" || return 1 - test -e /etc/sysctl.conf || return 1 - grep -q "$1" /etc/sysctl.conf || return 1 -} - -if ! isset net.ipv4.ip_dynaddr; then - if [ -n "$IP_DYNIP" -a "$IP_DYNIP" != 'no' ]; then - if [ "$IP_DYNIP" = 'yes' ]; then - IP_DYNIP=7 - fi - if [ -z "${IP_DYNIP//[0-9]/}" ]; then - doset net.ipv4.ip_dynaddr "$IP_DYNIP" - fi - fi -fi - - -if ! isset net.ipv4.tcp_syncookies; then - if [ "$IP_TCP_SYNCOOKIES" = "yes" ]; then - doset net.ipv4.tcp_syncookies 1 - fi -fi - -if ! isset net.ipv4.ip_forward; then - if [ "$IP_FORWARD" = "yes" ]; then - doset net.ipv4.ip_forward 1 - else - doset net.ipv4.ip_forward 0 - fi -fi - -if ! isset net.ipv6.conf.all.forwarding; then - if [ "$IPV6_FORWARD" = 'yes' ]; then - doset net.ipv6.conf.all.forwarding 1 - else - doset net.ipv6.conf.all.forwarding 0 - fi -fi - -if ! isset net.ipv6.conf.default.use_tempaddr; then - if [ -n "$IPV6_PRIVACY" ]; then - if [ $IPV6_PRIVACY = yes ]; then - IPV6_PRIVACY=2 - fi - if [ -z "${IPV6_PRIVACY//[0-9]/}" ]; then - doset net.ipv6.conf.default.use_tempaddr $IPV6_PRIVACY - fi - fi -fi - -if ! isset net.ipv6.conf.all.force_mld_version ; then - if [ -n "$IPV6_MLD_VERSION" -a -z "${IPV6_MLD_VERSION//[0-9]/}" ]; then - doset net.ipv6.conf.all.force_mld_version $IPV6_MLD_VERSION - fi -fi - -if ! isset kernel.sysrq; then - if [ "$ENABLE_SYSRQ" = 'yes' ]; then - ENABLE_SYSRQ=1 - elif [ "$ENABLE_SYSRQ" = 'no' -o "$ENABLE_SYSRQ" = '176' ]; then - # 176 is the distro default anyways - ENABLE_SYSRQ='' - fi - if [ -n "$ENABLE_SYSRQ" -a -z "${ENABLE_SYSRQ//[0-9]/}" ]; then - doset kernel.sysrq "$ENABLE_SYSRQ" - fi -fi - -# sparc only -if [ -e /proc/sys/kernel/stop-a ] && ! isset "kernel.stop-a"; then - if [ "$ENABLE_STOP_A" = yes ]; then - doset "kernel.stop-a" 1 - else - doset "kernel.stop-a" 0 - fi -fi - -if ! isset net.ipv4.tcp_ecn; then - if [ "$DISABLE_ECN" = 'yes' ]; then - doset net.ipv4.tcp_ecn 0 - fi -fi - -if ! isset fs.xfs.probe_dmapi; then - if [ "$DMAPI_PROBE" = 'yes' ]; then - doset fs.xfs.probe_dmapi 1 - fi -fi
participants (1)
-
root