Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2017-11-30 12:32:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Thu Nov 30 12:32:05 2017 rev:440 rq:546407 version:84.87+git20171129.a45b936 Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2017-11-25 08:40:55.162060653 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2017-11-30 12:32:06.702889945 +0100 @@ -1,0 +2,46 @@ +Wed Nov 29 11:27:37 UTC 2017 - opensuse-packag...@opensuse.org + +- Update to version 84.87+git20171129.a45b936: + * Remove RC_* variables from language sysconf template + (bsc#1069971 as well as FATE#319454) + +------------------------------------------------------------------- +Tue Nov 28 16:17:16 UTC 2017 - opensuse-packag...@opensuse.org + +- Update to version 84.87+git20171128.945b960: + * lang.(c)sh: catch if ROOT_USES_LANG becomes not set + +------------------------------------------------------------------- +Tue Nov 28 15:20:53 UTC 2017 - opensuse-packag...@opensuse.org + +- Update to version 84.87+git20171128.aa232d3: + * Add wsl specific code to profile.d/wsl.csh + * move wsl specific code from profile into profile.d/wsl.sh + * Remove obsolete "make package" + +------------------------------------------------------------------- +Tue Nov 28 11:49:03 UTC 2017 - opensuse-packag...@opensuse.org + +- Update to version 84.87+git20171128.a6752e8: + * lang.(c)sh: handle locale.conf if sysconfig does not + +------------------------------------------------------------------- +Tue Nov 28 10:54:12 UTC 2017 - wer...@suse.de + +- lang.(c)sh: handle locale.conf if sysconfig does not provide + default locale (bsc#1069971, FATE#319454) + +------------------------------------------------------------------- +Tue Nov 28 08:51:38 UTC 2017 - lnus...@suse.de + +- Update to version 84.87+git20171128.17ae554: + * Check for /proc/version before using it + * Remove legacy code for /proc/iSeries + * Move fillup-templates to /usr/share (boo#1069468) + +------------------------------------------------------------------- +Mon Nov 27 08:44:34 UTC 2017 - dims...@opensuse.org + +- Fix installation of fillup-templates. + +------------------------------------------------------------------- Old: ---- aaa_base-84.87+git20171120.d36b8b1.tar.xz New: ---- aaa_base-84.87+git20171129.a45b936.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.VMYCeX/_old 2017-11-30 12:32:07.562858672 +0100 +++ /var/tmp/diff_new_pack.VMYCeX/_new 2017-11-30 12:32:07.570858381 +0100 @@ -23,7 +23,7 @@ %endif Name: aaa_base -Version: 84.87+git20171120.d36b8b1 +Version: 84.87+git20171129.a45b936 Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -135,6 +135,22 @@ # keep as ghost for migration touch %buildroot/etc/inittab +mkdir -p %{buildroot}%{_fillupdir} +%if "%{_fillupdir}" != "/var/adm/fillup-templates" + for f in %{buildroot}/var/adm/fillup-templates/* ; do + test -e "$f" || continue + mv $f %{buildroot}%{_fillupdir}/ + done + rm -vrf %{buildroot}/var/adm/fillup-templates +%endif +%if "%{_fillupdir}" != "/usr/share/fillup-templates" + for f in %{buildroot}/usr/share/fillup-templates/* ; do + test -e "$f" || continue + mv $f %{buildroot}%{_fillupdir}/ + done + rm -vrf %{buildroot}/usr/share/fillup-templates +%endif + %pre -f aaa_base.pre %post -f aaa_base.post @@ -245,6 +261,7 @@ %files wsl %defattr(-,root,root) +%config /etc/profile.d/wsl.csh %config /etc/profile.d/wsl.sh %changelog ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VMYCeX/_old 2017-11-30 12:32:07.686854163 +0100 +++ /var/tmp/diff_new_pack.VMYCeX/_new 2017-11-30 12:32:07.686854163 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">d36b8b114ae6d2526b414aa1cbe8b44e5dfafe49</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">a45b9366c8d8aa8c616656fe8b2b6809e99104f9</param></service></servicedata> \ No newline at end of file ++++++ aaa_base-84.87+git20171120.d36b8b1.tar.xz -> aaa_base-84.87+git20171129.a45b936.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/Makefile new/aaa_base-84.87+git20171129.a45b936/Makefile --- old/aaa_base-84.87+git20171120.d36b8b1/Makefile 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/Makefile 2017-11-29 12:24:49.000000000 +0100 @@ -13,9 +13,6 @@ clean: rm -f $(sbin_PROGRAMS) -package: - obs/mkpackage - mimetypes: if test -d Apache/apache2; then (cd Apache/apache2 && osc up); else osc co Apache/apache2; fi tar --wildcards -Oxjf Apache/apache2/httpd-*.tar.bz2 '*/docs/conf/mime.types' > mime.types.apache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/etc/csh.login new/aaa_base-84.87+git20171129.a45b936/files/etc/csh.login --- old/aaa_base-84.87+git20171120.d36b8b1/files/etc/csh.login 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/etc/csh.login 2017-11-29 12:24:49.000000000 +0100 @@ -104,6 +104,8 @@ # Make path more comfortable # unset noglob +# save current path setting, we might want to restore it +set orig_path=($path) set _hpath set _spath set _upath=( /usr/local/bin /usr/bin /bin ) @@ -229,14 +231,7 @@ # overriding locale variables already present in the environment # if (! ${?CSHRCREAD} ) then - if ( -r /etc/profile.d/csh.ssh ) source /etc/profile.d/csh.ssh - if (! ${?SSH_SENDS_LOCALE} ) then - if ( -r /etc/sysconfig/language && -r /etc/profile.d/csh.utf8 ) then - set _tmp=`/bin/sh -c '. /etc/sysconfig/language; echo $AUTO_DETECT_UTF8'` - if ( ${_tmp} == "yes" ) source /etc/profile.d/csh.utf8 - unset _tmp - endif - endif + if ( -r /etc/profile.d/csh.ssh ) source /etc/profile.d/csh.ssh endif # @@ -269,6 +264,7 @@ # Restore globbing on Ctrl-C # onintr +unset orig_path unset noglob # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile new/aaa_base-84.87+git20171129.a45b936/files/etc/profile --- old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/etc/profile 2017-11-29 12:24:49.000000000 +0100 @@ -86,13 +86,6 @@ path stty sane cr0 pass8 dec path tset -I -Q fi - # on iSeries virtual console, detect screen size and terminal - if test -d /proc/iSeries -a \( "$tty" = "/dev/tty1" -o "$tty" = "/dev/console" \) ; then - LINES=24 - COLUMNS=80 - export LINES COLUMNS TERM - eval `path initviocons -q -e` - fi fi unset TERMCAP @@ -148,8 +141,6 @@ # Do NOT export UID, EUID, USER, and LOGNAME export MAIL HOST CPU HOSTNAME HOSTTYPE OSTYPE MACHTYPE -IS_WSL=`grep -i microsoft /proc/version` - # # You may use /etc/initscript, /etc/profile.local or the # ulimit package instead to set up ulimits and your PATH. @@ -164,11 +155,11 @@ # # Make path more comfortable # +# save current path setting, we might want to restore it +ORIG_PATH=$PATH +# if test -z "$PROFILEREAD" ; then - # WSL already sets PATH, shouldn't be overridden - if test "$IS_WSL" = ""; then - PATH=/usr/local/bin:/usr/bin:/bin - fi + PATH=/usr/local/bin:/usr/bin:/bin if test "$HOME" != "/" ; then for dir in $HOME/bin/$CPU $HOME/bin ; do test -d $dir && PATH=$dir:$PATH @@ -297,14 +288,7 @@ # overriding locale variables already present in the environment # if test -z "$PROFILEREAD" ; then - test -r /etc/profile.d/sh.ssh && . /etc/profile.d/sh.ssh - if test -z "$SSH_SENDS_LOCALE" ; then - if test -r /etc/sysconfig/language -a -r /etc/profile.d/sh.utf8 ; then - tmp="$(. /etc/sysconfig/language; echo $AUTO_DETECT_UTF8)" - test "$tmp" = "yes" && . /etc/profile.d/sh.utf8 - unset tmp - fi - fi + test -r /etc/profile.d/sh.ssh && . /etc/profile.d/sh.ssh fi # @@ -391,6 +375,7 @@ date fi esac +unset ORIG_PATH unset is # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile.d/lang.csh new/aaa_base-84.87+git20171129.a45b936/files/etc/profile.d/lang.csh --- old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile.d/lang.csh 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/etc/profile.d/lang.csh 2017-11-29 12:24:49.000000000 +0100 @@ -15,8 +15,14 @@ # # Already done by the GDM # +unset _save if ( ${?GDM_LANG} ) then - eval `sed -rn -e 's/^(RC_LANG)=/set _\1=/p' < /etc/sysconfig/language` + if ( -s /etc/sysconfig/language ) then + eval `sed -rn -e 's/^(RC_LANG)=/set _\1=/p' < /etc/sysconfig/language` + endif + if ( ! ${?_RC_LANG} && -s /etc/locale.conf ) then + eval `sed -rn -e 's/^(LANG)=/set _RC_\1=/p' < /etc/locale.conf` + endif if ( ${?_RC_LANG} ) then if ( "$_RC_LANG" == "$GDM_LANG" ) then unsetenv GDM_LANG @@ -25,16 +31,14 @@ endif unset _RC_LANG endif -endif - -unset _save -if ( ${?LANG} ) then - set _save=$LANG + if ( ${?LANG} ) set _save=$LANG endif # # Get the system and after that the users configuration # +set _sysconf=no +set ROOT_USES_LANG=yes if ( -s /etc/sysconfig/language ) then foreach line ("`sed -rn '/^[^#]/p' < /etc/sysconfig/language`") switch ("$line") @@ -42,12 +46,11 @@ # Allow GDM to override system settings if ( ${?GDM_LANG} ) continue eval set ${line:s/RC_//} + set _sysconf=yes breaksw case ROOT_USES_LANG*: if ( "$uid" == 0 ) then eval set $line - else - set ROOT_USES_LANG=yes endif breaksw default: @@ -56,6 +59,21 @@ end unset line endif +if ($_sysconf != yes && -s /etc/locale.conf) then + foreach line ("`sed -rn '/^[^#]/p' < /etc/locale.conf`") + switch ("$line") + case L*: + # Allow GDM to override system settings + if ( ${?GDM_LANG} ) continue + eval set ${line} + breaksw + default: + breaksw + endsw + end + unset line +endif +unset _sysconf if ( -s $HOME/.i18n ) then eval `sed -rn -e 's/^((LANG|LC_[A-Z_]+))=/set \1=/p' < $HOME/.i18n` endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile.d/lang.sh new/aaa_base-84.87+git20171129.a45b936/files/etc/profile.d/lang.sh --- old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile.d/lang.sh 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/etc/profile.d/lang.sh 2017-11-29 12:24:49.000000000 +0100 @@ -15,22 +15,28 @@ # # Already done by the GDM # +unset _save if test -n "$GDM_LANG" ; then - eval $(sed -rn -e 's/^(RC_LANG)=/_\1=/p' < /etc/sysconfig/language) + if test -s /etc/sysconfig/language ; then + eval $(sed -rn -e 's/^(RC_LANG)=/_\1=/p' < /etc/sysconfig/language) + fi + if test -z "$_RC_LANG" -a -s /etc/locale.conf ; then + eval $(sed -rn -e 's/^(LANG)=/_RC_\1=/p' < /etc/locale.conf) + fi if test "$_RC_LANG" = "$GDM_LANG" ; then unset GDM_LANG else LANG=$GDM_LANG fi unset _RC_LANG + test -n "$LANG" && _save="$LANG" fi -unset _save -test -n "$LANG" && _save="$LANG" - # # Get the system and after that the users configuration # +_sysconf=no +ROOT_USES_LANG=yes if test -s /etc/sysconfig/language ; then while read line ; do case "$line" in @@ -41,14 +47,30 @@ # Allow GDM to override system settings test -n "$GDM_LANG" && continue eval ${line#RC_} + _sysconf=yes ;; ROOT_USES_LANG*) - test "$UID" = 0 && eval $line || ROOT_USES_LANG=yes + test "$UID" = 0 && eval $line ;; esac done < /etc/sysconfig/language unset line fi +if test "$_sysconf" != yes -a -s /etc/locale.conf ; then + while read line ; do + case "$line" in + \#*|"") + continue + ;; + L*) + # Allow GDM to override system settings + test -n "$GDM_LANG" && continue + eval ${line} + esac + done < /etc/locale.conf + unset line +fi +unset _sysconf test -s $HOME/.i18n && . $HOME/.i18n test -n "$_save" && LANG="$_save" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile.d/wsl.csh new/aaa_base-84.87+git20171129.a45b936/files/etc/profile.d/wsl.csh --- old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile.d/wsl.csh 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/etc/profile.d/wsl.csh 2017-11-29 12:24:49.000000000 +0100 @@ -0,0 +1,14 @@ +# WSL does not utilitze this pam functionality currently. +set is_wsl=0 +if ( -f /proc/version ) set is_wsl=`grep -ic microsoft /proc/version` + +if ( $is_wsl == 1 ) then + if ( ${?orig_path} ) then + set -f path=($orig_path $path) + endif + if (`umask` == 0) then + set umask_login_defs=`sed -ne 's/^UMASK[[:space:]]*//p' /etc/login.defs` + if ( $umask_login_defs ) umask $umask_login_defs + unset umask_login_defs + endif +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile.d/wsl.sh new/aaa_base-84.87+git20171129.a45b936/files/etc/profile.d/wsl.sh --- old/aaa_base-84.87+git20171120.d36b8b1/files/etc/profile.d/wsl.sh 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/etc/profile.d/wsl.sh 2017-11-29 12:24:49.000000000 +0100 @@ -1,6 +1,15 @@ # WSL does not utilitze this pam functionality currently. -if test `umask` = 0000; then - UMASK_LOGIN_DEFS=`sed -ne 's/^UMASK[[:space:]]*//p' /etc/login.defs` - test "$UMASK_LOGIN_DEFS" && umask "$UMASK_LOGIN_DEFS" - unset UMASK_LOGIN_DEFS +if test -f /proc/version ; then + IS_WSL=$(grep -i microsoft /proc/version) +fi + +if test -n "$IS_WSL" ; then + if test -n "$ORIG_PATH" ; then + PATH=$ORIG_PATH:$PATH + fi + if test $(umask) = 0000; then + UMASK_LOGIN_DEFS=$(sed -ne 's/^UMASK[[:space:]]*//p' /etc/login.defs) + test "$UMASK_LOGIN_DEFS" && umask "$UMASK_LOGIN_DEFS" + unset UMASK_LOGIN_DEFS + fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.backup new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.backup --- old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.backup 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.backup 2017-11-29 12:24:49.000000000 +0100 @@ -0,0 +1,38 @@ +## Path: System/Backup +## Description: +## Type: string(/var/adm/backup/rpmdb) +## Default: /var/adm/backup/rpmdb +## Config: +# +# If you want cron.daily to backup the rpm database, specify a directory +# where the backups will be stored. (This is recommended!) The backups +# will be made every time cron.daily is called and the db has changed. +# Setting the variable to "" disables this feature. +# +RPMDB_BACKUP_DIR="/var/adm/backup/rpmdb" + +## Type: integer +## Default: 5 +# +# Here you can set the maximum number of backup files for the rpm +# database. +# +MAX_RPMDB_BACKUPS="5" + +## Type: string +## Default: /var/adm/backup/sysconfig +# +# If you want cron.daily to backup /etc/rc.config and the files in +# /etc/sysconfig, specify a directory where the backups will be stored. +# (This is recommended!) The backups will be made every time cron.daily is +# called and the the content of those files has changed. +# Setting the variable to "" disables this feature. +# +RCCONFIG_BACKUP_DIR="/var/adm/backup/sysconfig" + +## Type: integer +## Default: 5 +# +# Here you can set the maximum number of backup files for the rc.config files. +# +MAX_RCCONFIG_BACKUPS="5" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.language new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.language --- old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.language 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.language 2017-11-29 12:24:49.000000000 +0100 @@ -0,0 +1,26 @@ +## Path: System/Environment/Language +## Config: OpenOffice.org,groff,ispell,kde,kdm,profiles,susehelp,susewm,tetex,wdm +# +# For users and administrators seeking for the RC_LANG and RC_LC_* +# locale variables, please have a look at /etc/locale.conf. +# Compare with the manual pages localectl(1) and locale.conf(5) +# how to set LANG and the other locale variables with the help +# of the localectl(1) command. +# + +## Type: string(ctype) +## Default: ctype +# +# This defines if the user "root" should use the locale settings +# which are defined here. +# Value "ctype" means that root uses just LC_CTYPE. +# Value "yes" means that root uses the full settings.. +# +ROOT_USES_LANG="ctype" + +## Type: string +## Default: "" +# +# List of installed language supports, use by YaST2 +# +INSTALLED_LANGUAGES="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.news new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.news --- old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.news 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.news 2017-11-29 12:24:49.000000000 +0100 @@ -0,0 +1,15 @@ +## Path: Network/News +## Description: +## Type: string +## Default: "" +# +# Used for News-Postings. +# +ORGANIZATION="" + +## Type: string(news) +## Default: news +# +# News server. +# +NNTPSERVER="news" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.proxy new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.proxy --- old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.proxy 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.proxy 2017-11-29 12:24:49.000000000 +0100 @@ -0,0 +1,62 @@ +## Path: Network/Proxy +## Description: +## Type: yesno +## Default: no +## Config: kde,profiles +# +# Enable a generation of the proxy settings to the profile. +# This setting allows to turn the proxy on and off while +# preserving the particular proxy setup. +# +PROXY_ENABLED="no" + +## Type: string +## Default: "" +# +# Some programs (e.g. lynx, arena and wget) support proxies, if set in +# the environment. +# Example: HTTP_PROXY="http://proxy.provider.de:3128/"; +HTTP_PROXY="" + +## Type: string +## Default: "" +# +# Some programs (e.g. lynx, arena and wget) support proxies, if set in +# the environment. +# This setting is for https connections +HTTPS_PROXY="" + +## Type: string +## Default: "" +# +# Example: FTP_PROXY="http://proxy.provider.de:3128/"; +# +FTP_PROXY="" + +## Type: string +## Default: "" +# +# Example: GOPHER_PROXY="http://proxy.provider.de:3128/"; +# +GOPHER_PROXY="" + +## Type: string +## Default: "" +# +# Example: SOCKS_PROXY="socks://proxy.example.com:8080" +# +SOCKS_PROXY="" + +## Type: string +## Default: "" +# +# Example: SOCKS5_SERVER="office-proxy.example.com:8881" +# +SOCKS5_SERVER="" + +## Type: string(localhost) +## Default: localhost +# +# Example: NO_PROXY="www.me.de, .do.main, localhost" +# +NO_PROXY="localhost, 127.0.0.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.windowmanager new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.windowmanager --- old/aaa_base-84.87+git20171120.d36b8b1/files/usr/share/fillup-templates/sysconfig.windowmanager 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/usr/share/fillup-templates/sysconfig.windowmanager 2017-11-29 12:24:49.000000000 +0100 @@ -0,0 +1,21 @@ +## Path: Desktop/Window manager +## Description: +## Type: string(default,gnome,plasma5,lxde,xfce,twm,icewm,enlightenment) +## Default: default +## Config: profiles,kde,susewm +# +# Here you can set the default window manager (kde, fvwm, ...) +# changes here require at least a re-login. +# +# This value is deprecated and not read by most display managers. +# Use 'update-alternatives --config default-xsession.desktop' for configuration instead. + +DEFAULT_WM="default" + +## Type: yesno +## Default: yes +# +# install the SUSE extension for new users +# (theme and additional functions) +# +INSTALL_DESKTOP_EXTENSIONS="yes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.backup new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.backup --- old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.backup 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.backup 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -## Path: System/Backup -## Description: -## Type: string(/var/adm/backup/rpmdb) -## Default: /var/adm/backup/rpmdb -## Config: -# -# If you want cron.daily to backup the rpm database, specify a directory -# where the backups will be stored. (This is recommended!) The backups -# will be made every time cron.daily is called and the db has changed. -# Setting the variable to "" disables this feature. -# -RPMDB_BACKUP_DIR="/var/adm/backup/rpmdb" - -## Type: integer -## Default: 5 -# -# Here you can set the maximum number of backup files for the rpm -# database. -# -MAX_RPMDB_BACKUPS="5" - -## Type: string -## Default: /var/adm/backup/sysconfig -# -# If you want cron.daily to backup /etc/rc.config and the files in -# /etc/sysconfig, specify a directory where the backups will be stored. -# (This is recommended!) The backups will be made every time cron.daily is -# called and the the content of those files has changed. -# Setting the variable to "" disables this feature. -# -RCCONFIG_BACKUP_DIR="/var/adm/backup/sysconfig" - -## Type: integer -## Default: 5 -# -# Here you can set the maximum number of backup files for the rc.config files. -# -MAX_RCCONFIG_BACKUPS="5" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.language new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.language --- old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.language 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.language 1970-01-01 01:00:00.000000000 +0100 @@ -1,105 +0,0 @@ -## Path: System/Environment/Language -## Description: -## Type: string(POSIX,ca_ES.ISO-8859-1,ca_ES.UTF-8,cs_CZ.ISO-8859-2,cs_CZ.UTF-8,da_DE@euro,da_DK.ISO-8859-1,da_DK.UTF-8,de_DE@euro,de_DE.ISO-8859-1,de_DE.UTF-8,el_GR.ISO-8859-7,el_GR.UTF-8,en_GB.ISO-8859-1,en_GB.UTF-8,en_IE@euro,en_IE.ISO-8859-1,en_US.ISO-8859-1,es_ES@euro,es_ES.ISO-8859-1,es_ES.UTF-8,fr_FR@euro,fr_FR.ISO-8859-1,fr_FR.UTF-8,gl_ES@euro,gl_ES.ISO-8859-1,gl_ES.utf-8,hr_HR.ISO-8859-2,hu_HU.ISO-8859-2,hu_HU.UTF-8,it_IT@euro,it_IT.ISO-8859-1,it_IT.UTF-8,ja_JP.eucJP,ja_JP.UTF-8,lt_LT.ISO-8859-13,lt_LT.UTF-8,nl_NL@euro,nl_NL.ISO-8859-1,nl_NL.UTF-8,ru_RU.ISO-8859-5,ru_RU.KOI8-R,ru_RU.UTF-8,sk_SK.ISO-8859-2,sk_SK.UTF-8,tr_TR.ISO-8859-9,tr_TR.UTF-8,ko_KR.eucKR,ko_KR.UTF-8,zh_TW.Big5,zh_TW.UTF-8,zh_CN.GB2312,zh_CN.UTF-8) -## Default: "" -## Config: OpenOffice.org,groff,ispell,kde,kdm,profiles,susehelp,susewm,tetex,wdm -# -# -# Local users will get RC_LANG as their default language, i.e. the -# environment variable $LANG . $LANG is the default of all $LC_*-variables, -# as long as $LC_ALL is not set, which overrides all $LC_-variables. -# Root uses this variable only if ROOT_USES_LANG is set to "yes". -# -RC_LANG="" - -## Type: string -## Default: "" -# -# This variable will override all LC-variables!! -# Again, ROOT_USES_LANG must be set to "yes", if an effect on the superuser -# account is desired. -# -RC_LC_ALL="" - -## Type: string -## Default: "" -# -# This defines the locale in which messages of programs and -# libraries with i18n-support should appear if a translated -# message catalog for the library or the program is installed. -# This also provides localized yes/no answers. -# -RC_LC_MESSAGES="" - -## Type: string -## Default: "" -# -# This defines the locale for character handling and classification. -# The libc uses this value in language dependent function calls, such -# as e.g. uppercase/lowercase mapping of foreign characters. -# -RC_LC_CTYPE="" - -## Type: string -## Default: "" -# -# This defines the locale for sorting strings and characters. -# It is used by the libc to obtain the alphabetical order of characters -# (e.g. for string comparisons). -# -RC_LC_COLLATE="" - -## Type: string -## Default: "" -# -# This defines the locale for date and time output formats. -# i.e.: 06/09/1999 vs. 09.06.1999 -# -RC_LC_TIME="" - -## Type: string -## Default: "" -# -# This defines the locale for formatting and reading numbers. -# i.e.: 1,234.56 vs. 1.234,56 -# -RC_LC_NUMERIC="" - -## Type: string -## Default: "" -# -# This defines the locale for formatting and reading money values. -# -RC_LC_MONETARY="" - -## Type: string -## Default: "" -# -# This defines the locale for format of paper. -# -RC_LC_PAPER="" - -## Type: string(ctype) -## Default: ctype -# -# This defines if the user "root" should use the locale settings -# which are defined here. -# Value "ctype" means that root uses just LC_CTYPE. -# Value "yes" means that root uses the full settings.. -# -ROOT_USES_LANG="ctype" - -## Type: yesno -## Default: no -# -# Workaround for missing forward of LANG and LC variables -# of e.g. ssh login connections. -# -AUTO_DETECT_UTF8="no" - -## Type: string -## Default: "" -# -# List of installed language supports, use by YaST2 -# -INSTALLED_LANGUAGES="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.news new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.news --- old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.news 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.news 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -## Path: Network/News -## Description: -## Type: string -## Default: "" -# -# Used for News-Postings. -# -ORGANIZATION="" - -## Type: string(news) -## Default: news -# -# News server. -# -NNTPSERVER="news" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.proxy new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.proxy --- old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.proxy 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.proxy 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -## Path: Network/Proxy -## Description: -## Type: yesno -## Default: no -## Config: kde,profiles -# -# Enable a generation of the proxy settings to the profile. -# This setting allows to turn the proxy on and off while -# preserving the particular proxy setup. -# -PROXY_ENABLED="no" - -## Type: string -## Default: "" -# -# Some programs (e.g. lynx, arena and wget) support proxies, if set in -# the environment. -# Example: HTTP_PROXY="http://proxy.provider.de:3128/"; -HTTP_PROXY="" - -## Type: string -## Default: "" -# -# Some programs (e.g. lynx, arena and wget) support proxies, if set in -# the environment. -# This setting is for https connections -HTTPS_PROXY="" - -## Type: string -## Default: "" -# -# Example: FTP_PROXY="http://proxy.provider.de:3128/"; -# -FTP_PROXY="" - -## Type: string -## Default: "" -# -# Example: GOPHER_PROXY="http://proxy.provider.de:3128/"; -# -GOPHER_PROXY="" - -## Type: string -## Default: "" -# -# Example: SOCKS_PROXY="socks://proxy.example.com:8080" -# -SOCKS_PROXY="" - -## Type: string -## Default: "" -# -# Example: SOCKS5_SERVER="office-proxy.example.com:8881" -# -SOCKS5_SERVER="" - -## Type: string(localhost) -## Default: localhost -# -# Example: NO_PROXY="www.me.de, .do.main, localhost" -# -NO_PROXY="localhost, 127.0.0.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.windowmanager new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.windowmanager --- old/aaa_base-84.87+git20171120.d36b8b1/files/var/adm/fillup-templates/sysconfig.windowmanager 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/files/var/adm/fillup-templates/sysconfig.windowmanager 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -## Path: Desktop/Window manager -## Description: -## Type: string(default,gnome,plasma5,lxde,xfce,twm,icewm,enlightenment) -## Default: default -## Config: profiles,kde,susewm -# -# Here you can set the default window manager (kde, fvwm, ...) -# changes here require at least a re-login. -# -# This value is deprecated and not read by most display managers. -# Use 'update-alternatives --config default-xsession.desktop' for configuration instead. - -DEFAULT_WM="default" - -## Type: yesno -## Default: yes -# -# install the SUSE extension for new users -# (theme and additional functions) -# -INSTALL_DESKTOP_EXTENSIONS="yes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/obs/mkchanges new/aaa_base-84.87+git20171129.a45b936/obs/mkchanges --- old/aaa_base-84.87+git20171120.d36b8b1/obs/mkchanges 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/obs/mkchanges 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -#!/bin/sh -# create log suitable for c&p into rpm changes file -if [ -z "$1" ]; then - # this assumes the remote branch has the same name as ours - b=`git rev-parse --abbrev-ref HEAD` - set -- remotes/origin/$b..$b -elif [ "${1%.changes}" != "$1" ]; then - # parse time stamp of .changes file - d=`awk 'NR==2{FS=" - ";$0=$0;print $1;exit}' < $1` - set -- --since="$d" HEAD -fi -# no idea why it always prints those commit lines -git rev-list --pretty=format:"- %s" "$@" |grep -v ^commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/obs/mkpackage new/aaa_base-84.87+git20171129.a45b936/obs/mkpackage --- old/aaa_base-84.87+git20171120.d36b8b1/obs/mkpackage 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/obs/mkpackage 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -#!/bin/bash -set -e -shopt -s nullglob -name="`pwd -P`" -name=${name##*/} -name=${name%%.*} -branch=`git rev-parse --abbrev-ref HEAD` -pkgdir="$name" -[ "$branch" = "master" ] || pkgdir="$pkgdir.$branch" -src="$PWD" -if [ ! -d "$pkgdir/.osc" ]; then - echo "*** Error: please check out the package:" - echo "osc branch openSUSE:Factory $name" - echo "ln -s home\:*\:branches\:*/$name $pkgdir" - exit 1 -fi -if [ "`git --no-pager diff --name-only|wc -l`" != '0' -o "`git --no-pager diff --name-only --cached|wc -l`" != 0 ]; then - echo "*** Error: uncomitted changes" - echo "run 'git add file' to add files, 'git commit -a' to commit changes" - exit 1 -fi -cd "$pkgdir" -echo "osc up" -osc up -cd "$src" -"$src"/obs/mkchanges "$pkgdir/$name".changes | tee "$pkgdir"/.changes -#test ! -s $pkgdir/.changes || git push -for i in *.xz; do - /bin/rm -vi "$i" -done -eval `"$src"/obs/mktar` -mv "$src/$FILENAME" "$pkgdir" -cd "$pkgdir" -osc add "$FILENAME" -if [ -n "$VERSION" ]; then - read oldver < <(/usr/lib/build/spectool --tag "version" "$name".spec) - oldver="${oldver/*: /}" - while read sourcefile; do - sourcefile="${sourcefile/*: /}" - [ -n "$sourcefile" ] || continue - [ "$sourcefile" != "${sourcefile#$name-$oldver}" ] || continue - if [ -e "$sourcefile" ]; then - osc rm -f "$sourcefile" || true - fi - done < <(/usr/lib/build/spectool --tag "/source0?/" "$name".spec) - sed -i -e "0,/^Version: /{s/^\(Version: *\).*/\1$VERSION/;}" "$name".spec -fi -osc vc "$name".changes .changes && rm -f .changes -cd "$src" -if [ -n "`git rev-list remotes/origin/master..HEAD`" ]; then - pushed= - if [ "$branch" != "master" ]; then - echo "Warning: not on master branch" - fi - if read -p "push changes now? (Y/n) "; then - if [ -z "$REPLY" -o "${REPLY#y}" != "$REPLY" ]; then - git push origin $branch && pushed=1 || true - fi - fi - if [ -z "$pushed" ]; then - echo "*** Warning: changes not pushed!" - else - cd "$pkgdir" - osc ci - fi -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20171120.d36b8b1/obs/mktar new/aaa_base-84.87+git20171129.a45b936/obs/mktar --- old/aaa_base-84.87+git20171120.d36b8b1/obs/mktar 2017-11-20 10:41:37.000000000 +0100 +++ new/aaa_base-84.87+git20171129.a45b936/obs/mktar 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -#!/bin/sh -set -e -NAME=aaa_base -VERSION=13.2 -scmver=`git log -n1 --date=short --pretty=format:"git%cd.%h"|sed 's@-@@g'` -#LAST_COMMIT=(`git rev-list --timestamp HEAD^..HEAD`) -#DATE=`date +$datefmt -d "1970-01-01 00:00 UTC $LAST_COMMIT seconds"` -#scmver="$DATE" -fullver="$VERSION${scmver:++}$scmver" -pfx="$NAME${fullver:+-$fullver}" -fn="$pfx".tar.xz -if ! git config --get tar.umask >/dev/null 2>&1 ; then - git config --add tar.umask 022 -fi -git archive --prefix="$pfx"/ HEAD | xz > $fn -echo "VERSION=$fullver" -echo "FILENAME=$fn"
