May 2016 - openSUSE Commits - openSUSE Mailing Lists

commit gconfmm for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package gconfmm for openSUSE:Factory checked in at 2016-05-05 12:09:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gconfmm (Old) and /work/SRC/openSUSE:Factory/.gconfmm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gconfmm" Changes: -------- --- /work/SRC/openSUSE:Factory/gconfmm/gconfmm.changes 2016-03-29 14:28:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gconfmm.new/gconfmm.changes 2016-05-05 12:09:28.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 19 13:08:06 UTC 2016 - zaitor(a)opensuse.org + +- Stop exporting CFLAGS and CXXFLAGS, no longer needed due to + changes in libsigc++. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconfmm.spec ++++++ --- /var/tmp/diff_new_pack.zaZD2o/_old 2016-05-05 12:09:29.000000000 +0200 +++ /var/tmp/diff_new_pack.zaZD2o/_new 2016-05-05 12:09:29.000000000 +0200 @@ -59,8 +59,6 @@ %setup -q %build -export CFLAGS="%{optflags} -std=c++11" -export CXXFLAGS="%{optflags} -std=c++11" %configure \ --disable-static make %{?jobs:-j%jobs}

1 0

commit rpm for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2016-05-05 12:09:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpm" Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2016-04-05 10:40:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2016-05-05 12:09:17.000000000 +0200 @@ -1,0 +2,24 @@ +Mon May 2 13:50:24 CEST 2016 - mls(a)suse.de + +- work around bug in rpm's macro expandsion [bnc#969381] + +------------------------------------------------------------------- +Thu Apr 21 15:08:22 CEST 2016 - mls(a)suse.de + +- tweak rpm-4.12.0.1-lua-5.3.patch so that it does not need + the -p1 option +- add option to make postinstall scriptlet errors fatal + [bnc#967728] + new patch: enable-postin-scripts-error.diff +- rework nfs-blocksize-free.patch to always normalize big + blocksizes to 4096 bytes + [bnc#894610] [bnc#829717] [bnc#965322] + removed patch: nfs-blocksize-free.patch + new patch: normalize_blocksize.diff +- drop service_del_preun, service_del_postun macros, they are + provided by the systemd package +- change restart_on_update and stop_on_removal macros to use + service_del_preun and service_del_postun + [bnc#968405] [bnc#969381] + +------------------------------------------------------------------- Old: ---- nfs-blocksize-free.patch New: ---- enable-postin-scripts-error.diff normalize_blocksize.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.9rlGXv/_old 2016-05-05 12:09:19.000000000 +0200 +++ /var/tmp/diff_new_pack.9rlGXv/_new 2016-05-05 12:09:19.000000000 +0200 @@ -133,7 +133,8 @@ Patch95: fixsizeforbigendian.diff Patch96: modalias-no-kgraft.diff Patch97: rpm-4.12.0.1-lua-5.3.patch -Patch98: nfs-blocksize-free.patch +Patch98: normalize_blocksize.diff +Patch99: enable-postin-scripts-error.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -227,9 +228,7 @@ %patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 85 -%patch -P 92 -P 93 -P 94 -P 95 -P 96 -%patch97 -p1 -%patch98 -p1 +%patch -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99 %ifarch aarch64 ppc64le %patch6464 ++++++ enable-postin-scripts-error.diff ++++++ --- ./lib/psm.c.orig 2016-04-21 13:22:27.901033751 +0000 +++ ./lib/psm.c 2016-04-21 13:23:45.324742853 +0000 @@ -285,7 +285,9 @@ static rpmRC runScript(rpmts ts, rpmte t int warn_only = (stag != RPMTAG_PREIN && stag != RPMTAG_PREUN && stag != RPMTAG_PRETRANS && - stag != RPMTAG_VERIFYSCRIPT); + stag != RPMTAG_VERIFYSCRIPT && + !(stag == RPMTAG_POSTIN && + rpmExpandNumeric("%{_fail_on_postinstall_errors}"))); sfd = rpmtsNotify(ts, te, RPMCALLBACK_SCRIPT_START, stag, 0); if (sfd == NULL) --- ./macros.in.orig 2016-04-21 13:21:58.933142657 +0000 +++ ./macros.in 2016-04-21 13:22:27.902033748 +0000 @@ -1327,6 +1327,11 @@ end} %{-S:%{expand:%__scm_setup_%{-S*} %{!-v:-q}}}\ %{!-N:%autopatch %{-v} %{-p:-p%{-p*}}} +# Should errors in %post scriptlet be propagated as errors? +# +# Note: set to 1 for legacy compatibility. +%_fail_on_postinstall_errors 0 + # \endverbatim #*/ ++++++ macrosin.diff ++++++ --- /var/tmp/diff_new_pack.9rlGXv/_old 2016-05-05 12:09:19.000000000 +0200 +++ /var/tmp/diff_new_pack.9rlGXv/_new 2016-05-05 12:09:19.000000000 +0200 @@ -287,7 +287,7 @@ #------------------------------------------------------------------------------ # arch macro for all supported Sparc processors -@@ -1127,3 +1313,26 @@ end} +@@ -1127,3 +1313,24 @@ end} # \endverbatim #*/ @@ -306,8 +306,6 @@ +%{nil} + +%service_add() %{fillup_and_insserv %{1}} -+%service_del_preun() %{stop_on_removal %{1}} -+%service_del_postun() %{restart_on_update %{1}} + +%user_group_add() \ +/usr/sbin/groupadd -r %{1} 2>/dev/null || :\ ++++++ normalize_blocksize.diff ++++++ --- ./lib/transaction.c.orig 2016-04-21 12:21:53.649740302 +0000 +++ ./lib/transaction.c 2016-04-21 12:28:00.821356311 +0000 @@ -134,6 +134,13 @@ static rpmDiskSpaceInfo rpmtsCreateDSI(c dsi->iavail = !(sfb.f_ffree == 0 && sfb.f_files == 0) ? sfb.f_ffree : -1; + /* normalize block size to 4096 bytes if it is too big. */ + if (dsi->bsize > 4096) { + uint64_t old_size = dsi->bavail * dsi->bsize; + dsi->bsize = 4096; /* Assume 4k block size */ + dsi->bavail = old_size / dsi->bsize; + } + /* Find mount point belonging to this device number */ resolved_path = realpath(dirName, mntPoint); if (!resolved_path) { ++++++ rpm-4.12.0.1-lua-5.3.patch ++++++ --- /var/tmp/diff_new_pack.9rlGXv/_old 2016-05-05 12:09:19.000000000 +0200 +++ /var/tmp/diff_new_pack.9rlGXv/_new 2016-05-05 12:09:19.000000000 +0200 @@ -1,7 +1,5 @@ -Index: rpm-4.12.0.1/luaext/lposix.c -=================================================================== ---- rpm-4.12.0.1.orig/luaext/lposix.c -+++ rpm-4.12.0.1/luaext/lposix.c +--- luaext/lposix.c ++++ luaext/lposix.c @@ -361,22 +361,35 @@ static int Pfork(lua_State *L) /** for static int Pwait(lua_State *L) /** wait([pid]) */ ++++++ rpm-suse_macros ++++++ --- /var/tmp/diff_new_pack.9rlGXv/_old 2016-05-05 12:09:19.000000000 +0200 +++ /var/tmp/diff_new_pack.9rlGXv/_new 2016-05-05 12:09:19.000000000 +0200 @@ -21,36 +21,9 @@ /usr/lib/rpm/brp-suse \ %{nil} -# macro: %restart_on_update() -# Used to restart a service in postun section, if we are -# not running from YaST2 in instsys on update. -%restart_on_update() \ - test -n "$FIRST_ARG" || FIRST_ARG=$1 \ - if test "$FIRST_ARG" -ge 1 ; then \ - test -f /etc/sysconfig/services && . /etc/sysconfig/services \ - if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then \ - test -x /bin/systemctl && /bin/systemctl daemon-reload >/dev/null 2>&1 || : \ - for service in %{?*} ; do \ - test -x /bin/systemctl && /bin/systemctl try-restart $service >/dev/null 2>&1 || : \ - done \ - fi \ - fi \ - %nil +%restart_on_update() %{expand::%%service_del_postun %{?**}} +%stop_on_removal() %{expand:%%service_del_preun %{?**}} -# macro: %stop_on_removal() -# Used to stop a service in preun section, if we are -# not running from YaST2 in instsys on removal of this package. -%stop_on_removal() \ - test -n "$FIRST_ARG" || FIRST_ARG=$1 \ - if test "$FIRST_ARG" = "0" ; then \ - test -f /etc/sysconfig/services && . /etc/sysconfig/services \ - if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_STOP_ON_REMOVAL" != yes ; then \ - for service in %{?*} ; do \ - test -x /bin/systemctl && /bin/systemctl stop $service >/dev/null 2>&1 || : \ - done \ - fi \ - fi \ - %nil # macro: %configure_kernel_source # #

1 0

commit build for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2016-05-05 12:09:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "build" Changes: -------- --- /work/SRC/openSUSE:Factory/build/build.changes 2016-04-22 16:15:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2016-05-05 12:09:11.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 27 15:03:56 UTC 2016 - adrian(a)suse.de + +- fix build on armv7hl + +------------------------------------------------------------------- +Wed Apr 27 06:31:53 UTC 2016 - adrian(a)suse.de + +- run debtransform after buildtime source services +- Handle also aarch32* and armv8 cases for kvm cpu switches +- add support for LXC 1.0.8 +- added DoD for aarch64 repositories on Debian + +------------------------------------------------------------------- Old: ---- obs-build-20160331.tar.gz New: ---- obs-build-20160427.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.1DVUag/_old 2016-05-05 12:09:12.000000000 +0200 +++ /var/tmp/diff_new_pack.1DVUag/_new 2016-05-05 12:09:12.000000000 +0200 @@ -18,13 +18,13 @@ # needsbinariesforbuild -%define version_unconverted 20160331 +%define version_unconverted 20160427 Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20160331 +Version: 20160427 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.1DVUag/_old 2016-05-05 12:09:12.000000000 +0200 +++ /var/tmp/diff_new_pack.1DVUag/_new 2016-05-05 12:09:12.000000000 +0200 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20160331 +pkgver=20160427 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.1DVUag/_old 2016-05-05 12:09:12.000000000 +0200 +++ /var/tmp/diff_new_pack.1DVUag/_new 2016-05-05 12:09:12.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20160331 +Version: 20160427 Binary: build Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.1DVUag/_old 2016-05-05 12:09:12.000000000 +0200 +++ /var/tmp/diff_new_pack.1DVUag/_new 2016-05-05 12:09:12.000000000 +0200 @@ -1,4 +1,4 @@ -build (20160331) unstable; urgency=low +build (20160427) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection ++++++ obs-build-20160331.tar.gz -> obs-build-20160427.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build new/obs-build-20160427/build --- old/obs-build-20160331/build 2016-04-08 11:37:31.000000000 +0200 +++ new/obs-build-20160427/build 2016-04-27 17:03:07.000000000 +0200 @@ -1313,15 +1313,6 @@ echo "export SUSE_IGNORED_RPATHS=/etc/ld.so.conf" > "$BUILD_ROOT/etc/profile.d/buildsystem.sh" fi - # get rid of old src dir, it is no longer needed and just wastes space - test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir && rm -rf "$MYSRCDIR" - - # patch recipes - recipe_prepare - - # hmmm - chown -R "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR" - cd $BUILD_ROOT$TOPDIR/SOURCES || cleanup_and_exit 1 for i in *.obscpio ; do test -e "$i" || continue @@ -1344,6 +1335,15 @@ $BUILD_DIR/runservices --buildroot "$BUILD_ROOT" || cleanup_and_exit 1 fi + # get rid of old src dir, it is no longer needed and just wastes space + test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir && rm -rf "$MYSRCDIR" + + # patch recipes + recipe_prepare + + # hmmm + chown -R "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR" + echo ----------------------------------------------------------------- if test "$BUILD_USER" = root ; then echo ----- building $RECIPEFILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-pkg-deb new/obs-build-20160427/build-pkg-deb --- old/obs-build-20160331/build-pkg-deb 2016-04-08 11:37:31.000000000 +0200 +++ new/obs-build-20160427/build-pkg-deb 2016-04-27 17:03:07.000000000 +0200 @@ -68,8 +68,22 @@ pkg_erase_deb() { export DEBIAN_FRONTEND=noninteractive export DEBIAN_PRIORITY=critical - ( cd $BUILD_ROOT && chroot $BUILD_ROOT dpkg --purge --force all $PKG 2>&1 || touch $BUILD_ROOT/exit ) | \ - perl -ne '$|=1;/^(\(Reading database|Removing |Purging configuration files for )/||/^$/||print' + cd $BUILD_ROOT && chroot $BUILD_ROOT dpkg --purge --force all $PKG 2>&1 | { + local retry + while read line; do + case "$line" in + subprocess\ installed\ *script\ returned\ error\ exit\ status*) + chroot $BUILD_ROOT rm -f /var/lib/dpkg/info/$PKG.{pre,post}rm + retry=1 + ;; + *) echo "$line" ;; + esac + done + if test -n "$retry"; then + echo "re-try deleting $PKG without post/pre remove scripts" + chroot $BUILD_ROOT dpkg --purge --force all $PKG 2>&1 || touch $BUILD_ROOT/exit + fi + } | perl -ne '$|=1;/^(\(Reading database|Removing |Purging configuration files for )/||/^$/||print' } pkg_cumulate_deb() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm new/obs-build-20160427/build-vm --- old/obs-build-20160331/build-vm 2016-04-08 11:37:31.000000000 +0200 +++ new/obs-build-20160427/build-vm 2016-04-27 17:03:07.000000000 +0200 @@ -645,6 +645,8 @@ if test -z "$VM_KERNEL" -a -e "$BUILD_ROOT/.build.kernel.$VM_TYPE" ; then kernel="$BUILD_ROOT/.build.kernel.$VM_TYPE" hostarchfile="$BUILD_ROOT/.build.hostarch.$VM_TYPE" + elif test -n "$kernel" -a -e "$kernel" -a -e "$kernel.hostarch" ; then + hostarchfile="$kernel.hostarch" fi if test -n "$hostarchfile" -a -e "$hostarchfile"; then newhostarch=`cat "$hostarchfile"` @@ -750,7 +752,7 @@ test "$PERSONALITY" = -1 && PERSONALITY=0 # syscall failed? case $(uname -m) in ppc|ppcle|s390) PERSONALITY=8 ;; # ppc/s390 kernel never tells us if a 32bit personality is active, assume we run on 64bit - aarch64) test "$BUILD_ARCH" != "${BUILD_ARCH#armv}" && PERSONALITY=8 ;; # workaround, to be removed + aarch64) test "$BUILD_ARCH" != "${BUILD_ARCH#armv[567]}" && PERSONALITY=8 ;; # workaround, to be removed esac test "$VM_TYPE" = lxc -o "$VM_TYPE" = docker && PERSONALITY=0 echo "PERSONALITY='$PERSONALITY'" >> $BUILD_ROOT/.build/build.data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm-kvm new/obs-build-20160427/build-vm-kvm --- old/obs-build-20160331/build-vm-kvm 2016-04-08 11:37:31.000000000 +0200 +++ new/obs-build-20160427/build-vm-kvm 2016-04-27 17:03:07.000000000 +0200 @@ -85,21 +85,28 @@ aarch64) kvm_bin="/usr/bin/qemu-system-aarch64" kvm_console=ttyAMA0 - kvm_options="-enable-kvm -cpu host " - # This option only exists with QEMU 2.5 or newer - if $kvm_bin -machine 'virt,?' 2>&1 | grep -q gic-version ; then - # We want to use the host gic version in order to make use - # of all available features (e.g. more than 8 CPUs) and avoid - # the emulation overhead of vGICv2 on a GICv3 host. - kvm_options+="-M virt,gic-version=host" - else - kvm_options+="-M virt" - fi vm_kernel=/boot/Image vm_initrd=/boot/initrd - # prefer the guest kernel/initrd - test -e /boot/Image.guest && vm_kernel=/boot/Image.guest - test -e /boot/initrd.guest && vm_initrd=/boot/initrd.guest + if test "${BUILD_ARCH#aarch}" != "$BUILD_ARCH" -o "${BUILD_ARCH#armv8}" != "$BUILD_ARCH"; then + kvm_options="-enable-kvm -cpu host " + test -e /boot/Image.guest && vm_kernel=/boot/Image.guest + test -e /boot/initrd.guest && vm_initrd=/boot/initrd.guest + else + # Running an armv7 kernel on aarch64 + kvm_options="-enable-kvm -cpu host,aarch64=off " + # prefer the guest kernel/initrd + test -e /boot/Image.guest32 && vm_kernel=/boot/Image.guest32 + test -e /boot/initrd.guest32 && vm_initrd=/boot/initrd.guest32 + fi + # This option only exists with QEMU 2.5 or newer + if $kvm_bin -machine 'virt,?' 2>&1 | grep -q gic-version ; then + # We want to use the host gic version in order to make use + # of all available features (e.g. more than 8 CPUs) and avoid + # the emulation overhead of vGICv2 on a GICv3 host. + kvm_options+="-M virt,gic-version=host" + else + kvm_options+="-M virt" + fi kvm_device=virtio-blk-device ;; ppc|ppcle|ppc64|ppc64le) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm-lxc new/obs-build-20160427/build-vm-lxc --- old/obs-build-20160331/build-vm-lxc 2016-04-08 11:37:31.000000000 +0200 +++ new/obs-build-20160427/build-vm-lxc 2016-04-27 17:03:07.000000000 +0200 @@ -52,14 +52,14 @@ EOF chmod a+x "$LXCHOOK" case "$(lxc-create --version)" in - 1.0*) - lxc-create -n "$LXCID" -f "$LXCCONF" || cleanup_and_exit 1 - lxc-start -n "$LXCID" "$vm_init_script" - ;; - *) + 1.0.8|1.1.*) lxc-create -n "$LXCID" -f "$LXCCONF" -t none || cleanup_and_exit 1 lxc-start -n "$LXCID" -F "$vm_init_script" ;; + 1.0.*) + lxc-create -n "$LXCID" -f "$LXCCONF" || cleanup_and_exit 1 + lxc-start -n "$LXCID" "$vm_init_script" + ;; esac BUILDSTATUS="$?" test "$BUILDSTATUS" != 255 || BUILDSTATUS=3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm-pvm new/obs-build-20160427/build-vm-pvm --- old/obs-build-20160331/build-vm-pvm 2016-04-08 11:37:31.000000000 +0200 +++ new/obs-build-20160427/build-vm-pvm 2016-04-27 17:03:07.000000000 +0200 @@ -1,17 +1,6 @@ #PowerVM build functions -test -z "$VM_WORKER_NR" && VM_WORKER_NR=1 -lpname="worker-$VM_WORKER_NR" -lpartype="AIX/Linux" -bootloader_size="8M" -rootlv="$lpname"-root -swaplv="$lpname"-swap -master_lpar=$(cat /proc/device-tree/ibm,partition-name) -size_gb(){ - size_gb=`expr $1 / 1024` -} - -setup_bootloader(){ +pvm_setup_bootloader(){ disk=$1 parted -s $disk mklabel msdos parted -s $disk mkpart primary ext2 0 $bootloader_size @@ -21,7 +10,7 @@ bl_target=${disk}1 } -getdiskname(){ +pvm_getdiskname(){ lv=$1 if [ -z "$SKIP" ];then args=$(pvmctl scsi list -f ' ' -d VirtualDisk.udid ClientAdapter.loc_code --where VirtualDisk.name=$lv) @@ -36,46 +25,38 @@ dev=$(readlink -f $devid) fi case $lv in - *root) test -z "$SKIP" && setup_bootloader "$dev"; + *root) test -z "$SKIP" && pvm_setup_bootloader "$dev"; VM_IMAGE="${dev}2";; *swap) VM_SWAP="${dev}";; esac } -createdev() { - name=$1 - size=$2 - target=$3 - size_gb $size - test -z $3 && target=$master_lpar - is_created $name - if [ -z "$SKIP" ];then - execute lv create --name $name --size $size_gb - target=$master_lpar - fi - execute scsi create --vg name=rootvg --type lv --lpar name=$target --stor-id $name - test -z "$SKIP" && getdiskname $name -} -execute(){ + +pvm_execute(){ cmd=$@ pvmctl $cmd } -vm_kill_pvm() { - execute lpar power-off --hard -i name="$VM_NAME" -} -is_created() { +pvm_is_created() { dev=$1 $(pvmctl lv list -d LogicalVolume.name | grep -q $dev) && SKIP=1 } -vm_attach_root_pvm(){ - target=$1 - createdev $rootlv $VMDISK_ROOTSIZE $target -} -vm_attach_swap_pvm(){ - createdev $swaplv $VMDISK_SWAPSIZE $target +pvm_createdev() { + name=$1 + size=$2 + target=$3 + size_gb=`expr $size / 1024` + test -z $3 && target=$master_lpar + pvm_is_created $name + if [ -z "$SKIP" ];then + pvm_execute lv create --name $name --size $size_gb + target=$master_lpar + fi + pvm_execute scsi create --vg name=rootvg --type lv --lpar name=$target --stor-id $name + test -z "$SKIP" && pvm_getdiskname $name } -lpar_is_running(){ + +pvm_lpar_is_running(){ state=$(pvmctl lpar list -d LogicalPartition.state --where LogicalPartition.name=$lpname |awk -F "=" '{print $2}') CONSOLEPID=`pgrep -f "cat $hvcdev"` if [ "$state" = "running" ];then @@ -85,77 +66,106 @@ return 1 fi } -watch_build(){ - while lpar_is_running $lpname;do + +pvm_watch_build(){ + while pvm_lpar_is_running $lpname;do sleep 10 done } + +pvm_detachdev(){ + lv=$1 + lpar=$2 + pvm_execute scsi delete --lpar name=$lpar --type lv --stor-id $lv +} + +pvm_deletelv(){ + viosvrcmd --id 1 -c "rmbdsp -bd $1" +} + +pvm_nametoid(){ + local id + name=$1 + lparid=$(pvmctl lpar list -d LogicalPartition.id -i name=$name | awk -F "=" '{print $2}') +} + + +pvm_openconsole(){ + id=$1 + pvmutil -o create_vterm_dev --id $id + hvcsadmin -console $id + hvcdev=$(hvcsadmin -console $id|awk '{print $4}') +} + +pvm_closeconsole(){ + hvcdev=$(hvcsadmin -console $id|awk '{print $4}') + hvcsadmin -close $hvcdev + pvmutil -o delete_vterm_dev --id $1 +} + +vm_kill_pvm() { + pvm_execute lpar power-off --hard -i name="$VM_NAME" +} + vm_startup_pvm(){ cpus=$BUILD_JOBS cores=`echo 0.05 \* $cpus| bc -l` - execute lpar create --name $lpname --mem $VM_MEMSIZE --proc-unit $cores --proc $cpus --proc-type shared --sharing-mode uncapped --type $lpartype - nametoid $lpname + pvm_execute lpar create --name $lpname --mem $VM_MEMSIZE --proc-unit $cores --proc $cpus --proc-type shared --sharing-mode uncapped --type $lpartype + pvm_nametoid $lpname vm_attach_root_pvm $lpname vm_attach_swap_pvm $lpname - openconsole $lparid - execute lpar power-on -i name=$lpname - watch_build & + pvm_openconsole $lparid + pvm_execute lpar power-on -i name=$lpname + pvm_watch_build & PID=$! cat $hvcdev vm_detach_root_pvm $lpname vm_detach_swap_pvm $lpname } + vm_verify_options_pvm(){ - : + test -z "$VM_WORKER_NR" && VM_WORKER_NR=1 + lpname="worker-$VM_WORKER_NR" + lpartype="AIX/Linux" + bootloader_size="8M" + rootlv="$lpname"-root + swaplv="$lpname"-swap + master_lpar=$(cat /proc/device-tree/ibm,partition-name) } -detachdev(){ - lv=$1 - lpar=$2 - execute scsi delete --lpar name=$lpar --type lv --stor-id $lv + +vm_attach_root_pvm(){ + target=$1 + pvm_createdev $rootlv $VMDISK_ROOTSIZE $target +} + +vm_attach_swap_pvm(){ + pvm_createdev $swaplv $VMDISK_SWAPSIZE $target } vm_detach_swap_pvm(){ lpar=$1 test -z $lpar && lpar=$master_lpar - detachdev $swaplv $lpar + pvm_detachdev $swaplv $lpar } + vm_detach_root_pvm(){ lpar=$1 test -z $lpar && lpar=$master_lpar - detachdev $rootlv $lpar -} -deletelv(){ - viosvrcmd --id 1 -c "rmbdsp -bd $1" -} -openconsole(){ - id=$1 - pvmutil -o create_vterm_dev --id $id - hvcsadmin -console $id - hvcdev=$(hvcsadmin -console $id|awk '{print $4}') -} - -nametoid(){ - local id - name=$1 - lparid=$(pvmctl lpar list -d LogicalPartition.id -i name=$name | awk -F "=" '{print $2}') -} -closeconsole(){ - hvcdev=$(hvcsadmin -console $id|awk '{print $4}') - hvcsadmin -close $hvcdev - pvmutil -o delete_vterm_dev --id $1 + pvm_detachdev $rootlv $lpar } vm_cleanup_pvm(){ - nametoid $lpname + pvm_nametoid $lpname closeconsole $lparid vm_detach_root_pvm $lpname vm_detach_root_pvm vm_detach_swap_pvm $lpname vm_detach_swap_pvm - execute lpar delete -i name=$lpname - deletelv $rootlv - deletelv $swaplv + pvm_execute lpar delete -i name=$lpname + pvm_deletelv $rootlv + pvm_deletelv $swaplv } + vm_fixup_pvm(){ VM_SWAPDEV=/dev/sdb GRUBDIR=`mktemp -d /tmp/grubinstall.XXXX` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/build-vm-zvm new/obs-build-20160427/build-vm-zvm --- old/obs-build-20160331/build-vm-zvm 2016-04-08 11:37:31.000000000 +0200 +++ new/obs-build-20160427/build-vm-zvm 2016-04-27 17:03:07.000000000 +0200 @@ -39,7 +39,7 @@ cleanup_and_exit 1 } -prevent_detach() { +zvm_prevent_detach() { if test "$1" = "150" -o "$1" = "0150"; then zvm_fatal "don't detach local root" fi @@ -157,7 +157,7 @@ # 1. worker device number # 2. worker number DEVNR=$(zvm_get_local_devnr $1 $2) - prevent_detach $DEVNR + zvm_prevent_detach $DEVNR dasd_configure 0.0.0$DEVNR 0 0 if ! vmcp detach $DEVNR >& /dev/null ; then zvm_fatal "Could not locally detach disk number $1 from worker $2" @@ -209,7 +209,7 @@ done # Third, remove stale links for DEVNR in $DEVNR_ROOT $DEVNR_SWAP ; do - prevent_detach $DEVNR + zvm_prevent_detach $DEVNR if vmcp q v $DEVNR 2> /dev/null ; then vmcp detach $DEVNR fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20160331/common_functions new/obs-build-20160427/common_functions --- old/obs-build-20160331/common_functions 2016-04-08 11:37:31.000000000 +0200 +++ new/obs-build-20160427/common_functions 2016-04-27 17:03:07.000000000 +0200 @@ -22,6 +22,9 @@ build_host_arch() { : ${BUILD_HOST_ARCH:=`uname -m`} + # the linux kernel only knows armv7l, armv7hl is a userland definition + test armv7l == "$BUILD_HOST_ARCH" && BUILD_HOST_ARCH=armv7hl + BUILD_INITVM_ARCH="$BUILD_HOST_ARCH" # avoid multiple initvm.* helpers for i586 and i686 test i686 != "$BUILD_INITVM_ARCH" || BUILD_INITVM_ARCH=i586 @@ -29,7 +32,8 @@ extend_build_arch() { case $BUILD_ARCH in - aarch64|aarch64_ilp32) BUILD_ARCH="aarch64:aarch64_ilp32:armv8l" ;; + aarch64) BUILD_ARCH="aarch64:aarch64_ilp32:armv8l" ;; + aarch64_ilp32) BUILD_ARCH="aarch64_ilp32:aarch64:armv8l" ;; armv8l) BUILD_ARCH="armv8l" ;; # armv8l is aarch64 in 32bit mode. not a superset of armv7 armv7hl) BUILD_ARCH="armv7hl:armv7l:armv6hl:armv6l:armv5tel" ;; armv7l) BUILD_ARCH="armv7l:armv6l:armv5tel" ;;

1 0

commit patchinfo.4635 for openSUSE:13.1:Update
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package patchinfo.4635 for openSUSE:13.1:Update checked in at 2016-05-05 09:43:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.4635 (Old) and /work/SRC/openSUSE:13.1:Update/.patchinfo.4635.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.4635" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <category>security</category> <rating>important</rating> <packager>mkubecek</packager> <summary>Security update for libopenssl0_9_8</summary> <description> This update for libopenssl0_9_8 fixes the following issues: - CVE-2016-2105: EVP_EncodeUpdate overflow (bsc#977614) - CVE-2016-2106: EVP_EncryptUpdate overflow (bsc#977615) - CVE-2016-2108: Memory corruption in the ASN.1 encoder (bsc#977617) - CVE-2016-2109: ASN.1 BIO excessive memory allocation (bsc#976942) - CVE-2016-0702: Side channel attack on modular exponentiation "CacheBleed" (bsc#968050) - bsc#976943: Buffer overrun in ASN1_parse and updates the package to version 0.9.8zh which collects many other fixes, including security ones. </description> <issue tracker="cve" id="2015-3197"/> <issue tracker="cve" id="2016-0702"/> <issue tracker="cve" id="2016-0797"/> <issue tracker="cve" id="2016-0799"/> <issue tracker="cve" id="2016-0800"/> <issue tracker="cve" id="2016-2105"/> <issue tracker="cve" id="2016-2106"/> <issue tracker="cve" id="2016-2108"/> <issue tracker="cve" id="2016-2109"/> <issue tracker="bnc" id="968046"/> <issue tracker="bnc" id="968374"/> <issue tracker="bnc" id="968048"/> <issue tracker="bnc" id="968050"/> <issue tracker="bnc" id="963415"/> <issue tracker="bnc" id="976942"/> <issue tracker="bnc" id="976943"/> <issue tracker="bnc" id="977614"/> <issue tracker="bnc" id="977615"/> <issue tracker="bnc" id="977617"/> </patchinfo>

1 0

commit openssl for openSUSE:13.1:Update
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package openssl for openSUSE:13.1:Update checked in at 2016-05-05 09:43:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/openssl (Old) and /work/SRC/openSUSE:13.1:Update/.openssl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssl" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.UqpiZ9/_old 2016-05-05 09:43:07.000000000 +0200 +++ /var/tmp/diff_new_pack.UqpiZ9/_new 2016-05-05 09:43:07.000000000 +0200 @@ -1 +1 @@ -<link package='openssl.4606' cicount='copy' /> +<link package='openssl.4634' cicount='copy' />

1 0

commit openssl for openSUSE:13.2:Update
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package openssl for openSUSE:13.2:Update checked in at 2016-05-05 09:18:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/openssl (Old) and /work/SRC/openSUSE:13.2:Update/.openssl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssl" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.BXGEHA/_old 2016-05-05 09:18:50.000000000 +0200 +++ /var/tmp/diff_new_pack.BXGEHA/_new 2016-05-05 09:18:50.000000000 +0200 @@ -1 +1 @@ -<link package='openssl.4770' cicount='copy' /> +<link package='openssl.5042' cicount='copy' />

1 0

commit atheme for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package atheme for openSUSE:Factory checked in at 2016-05-05 08:13:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atheme (Old) and /work/SRC/openSUSE:Factory/.atheme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "atheme" Changes: -------- --- /work/SRC/openSUSE:Factory/atheme/atheme.changes 2015-04-05 02:04:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.atheme.new/atheme.changes 2016-05-05 08:13:11.000000000 +0200 @@ -1,0 +2,13 @@ +Tue May 3 10:43:10 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 7.2.6 +* avoid potential NULL dereference in language code +* Add NOPASSWORD criterion to nickserv/list helpfile +* new nickserv/list criterion VACATION +- Add 0001-Do-not-copy-more-bytes-than-were-allocated.patch + [CVE-2016-4478] +- Add 0001-chanserv-flags-make-Anope-FLAGS-compatibility-an-opt.patch + [CVE-2014-9773, boo#978170] +- Add atheme-serno.diff, a build fix + +------------------------------------------------------------------- Old: ---- atheme-services-7.2.5.tar.bz2 New: ---- 0001-Do-not-copy-more-bytes-than-were-allocated.patch 0001-chanserv-flags-make-Anope-FLAGS-compatibility-an-opt.patch atheme-7.2.6.tar.gz atheme-serno.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atheme.spec ++++++ --- /var/tmp/diff_new_pack.wJANVr/_old 2016-05-05 08:13:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wJANVr/_new 2016-05-05 08:13:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package atheme # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ Name: atheme %define lname libathemecore1 -Version: 7.2.5 +Version: 7.2.6 Release: 0 Url: http://atheme.net/ Summary: A portable, secure set of open source, modular IRC services @@ -26,10 +26,13 @@ Group: Productivity/Networking/IRC #Git-Clone: git://github.com/atheme/atheme -Source: http://atheme.net/downloads/atheme-services-%version.tar.bz2 +Source: https://github.com/atheme/atheme/archive/%name-%version.tar.gz Source9: example.conf Patch1: atheme-lockmodes.diff -Patch3: atheme-nodate.diff +Patch2: atheme-nodate.diff +Patch3: atheme-serno.diff +Patch4: 0001-Do-not-copy-more-bytes-than-were-allocated.patch +Patch5: 0001-chanserv-flags-make-Anope-FLAGS-compatibility-an-opt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cracklib-devel BuildRequires: fdupes @@ -74,16 +77,17 @@ in %lname. %prep -%setup -qn %name-services-%version -%patch -P 1 -P 3 -p1 -# use system libmowgli; ignore contrib modules +%setup -qn %name-%name-%version +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +# nudge atheme in the direction of using the system-provided libmowgli rm -Rf libmowgli-2 +# ignore contrib modules mkdir -p libmowgli-2 modules/contrib touch libmowgli-2/Makefile modules/contrib/Makefile %build %if 0%{?suse_version} >= 1210 -export RUNDIR="/run"; +export RUNDIR="/run" %endif %configure \ --sysconfdir="%_sysconfdir/%name" \ @@ -92,17 +96,16 @@ --enable-fhs-paths \ --enable-warnings \ --enable-large-net \ - --with-pcre \ - --enable-contrib + --with-pcre make %{?_smp_mflags} %install %if 0%{?suse_version} >= 1210 -export RUNDIR="/run"; +export RUNDIR="/run" %endif b="%buildroot"; -%make_install DOCDIR="%_docdir/%name"; +%make_install DOCDIR="%_docdir/%name" # additional documentation mkdir -p "$b/%_docdir/%name" @@ -131,11 +134,11 @@ %pre /usr/bin/getent group atheme >/dev/null 2>/dev/null || \ - /usr/sbin/groupadd -r atheme >/dev/null || :; + /usr/sbin/groupadd -r atheme >/dev/null || : /usr/bin/getent passwd atheme >/dev/null 2>/dev/null || \ /usr/sbin/useradd -r -g atheme -s /bin/false \ -c "Atheme IRC Services daemon" -d "%atheme_home" \ - atheme >/dev/null || :; + atheme >/dev/null || : %service_add_pre atheme.service %post ++++++ 0001-Do-not-copy-more-bytes-than-were-allocated.patch ++++++ >From 87580d767868360d2fed503980129504da84b63e Mon Sep 17 00:00:00 2001 From: Hans-Christian Esperer <hc(a)hcesperer.org> Date: Sat, 9 Jan 2016 19:58:58 +0100 Subject: [PATCH] Do not copy more bytes than were allocated --- modules/transport/xmlrpc/xmlrpclib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/transport/xmlrpc/xmlrpclib.c b/modules/transport/xmlrpc/xmlrpclib.c index b67d215..5fcde9e 100644 --- a/modules/transport/xmlrpc/xmlrpclib.c +++ b/modules/transport/xmlrpc/xmlrpclib.c @@ -777,8 +777,9 @@ void xmlrpc_char_encode(char *outbuffer, const char *s1) s->append_char(s, c); } } + s->append_char(s, 0); - memcpy(outbuffer, s->str, XMLRPC_BUFSIZE); + strncpy(outbuffer, s->str, XMLRPC_BUFSIZE); } static void xmlrpc_append_char_encode(mowgli_string_t *s, const char *s1) -- 2.6.6 ++++++ 0001-chanserv-flags-make-Anope-FLAGS-compatibility-an-opt.patch ++++++ >From c597156adc60a45b5f827793cd420945f47bc03b Mon Sep 17 00:00:00 2001 From: Max Teufel <max(a)teufelsnetz.com> Date: Sun, 6 Mar 2016 10:27:40 +0100 Subject: [PATCH] chanserv/flags: make Anope FLAGS compatibility an option Previously, ChanServ FLAGS behavior could be modified by registering or dropping the keyword nicks "LIST", "CLEAR", and "MODIFY". Now, a configuration option is available that when turned on (default), disables registration of these keyword nicks and enables this compatibility feature. When turned off, registration of these keyword nicks is possible, and compatibility to Anope's FLAGS command is disabled. Fixes atheme/atheme#397 --- modules/chanserv/flags.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/modules/chanserv/flags.c b/modules/chanserv/flags.c index 289345d..72d8fcf 100644 --- a/modules/chanserv/flags.c +++ b/modules/chanserv/flags.c @@ -17,18 +17,35 @@ DECLARE_MODULE_V1 ); static void cs_cmd_flags(sourceinfo_t *si, int parc, char *parv[]); +static void check_registration_keywords(hook_user_register_check_t *hdata); command_t cs_flags = { "FLAGS", N_("Manipulates specific permissions on a channel."), AC_NONE, 3, cs_cmd_flags, { .path = "cservice/flags" } }; +static bool anope_flags_compat = true; + void _modinit(module_t *m) { service_named_bind_command("chanserv", &cs_flags); + + add_bool_conf_item("ANOPE_FLAGS_COMPAT", &chansvs.me->conf_table, 0, &anope_flags_compat, true); + + hook_add_event("nick_can_register"); + hook_add_nick_can_register(check_registration_keywords); + + hook_add_event("user_can_register"); + hook_add_user_can_register(check_registration_keywords); } void _moddeinit(module_unload_intent_t intent) { service_named_unbind_command("chanserv", &cs_flags); + + hook_del_nick_can_register(check_registration_keywords); + + hook_del_user_can_register(check_registration_keywords); + + del_conf_item("ANOPE_FLAGS_COMPAT", &chansvs.me->conf_table); } typedef struct { @@ -150,6 +167,20 @@ static void do_list(sourceinfo_t *si, mychan_t *mc, unsigned int flags) logcommand(si, CMDLOG_GET, "FLAGS: \2%s\2", mc->name); } +static void check_registration_keywords(hook_user_register_check_t *hdata) +{ + if (hdata->approved || !anope_flags_compat) + { + return; + } + + if (!strcasecmp(hdata->account, "LIST") || !strcasecmp(hdata->account, "CLEAR") || !strcasecmp(hdata->account, "MODIFY")) + { + command_fail(hdata->si, fault_badparams, "The nick \2%s\2 is reserved and cannot be registered.", hdata->account); + hdata->approved = 1; + } +} + /* FLAGS <channel> [user] [flags] */ static void cs_cmd_flags(sourceinfo_t *si, int parc, char *parv[]) { @@ -218,14 +249,14 @@ static void cs_cmd_flags(sourceinfo_t *si, int parc, char *parv[]) * * --nenolod */ - else if (!strcasecmp(target, "LIST") && myentity_find_ext(target) == NULL) + else if (anope_flags_compat && !strcasecmp(target, "LIST") && myentity_find_ext(target) == NULL) { do_list(si, mc, 0); free(target); return; } - else if (!strcasecmp(target, "CLEAR") && myentity_find_ext(target) == NULL) + else if (anope_flags_compat && !strcasecmp(target, "CLEAR") && myentity_find_ext(target) == NULL) { free(target); @@ -251,7 +282,7 @@ static void cs_cmd_flags(sourceinfo_t *si, int parc, char *parv[]) command_success_nodata(si, _("Cleared flags in \2%s\2."), mc->name); return; } - else if (!strcasecmp(target, "MODIFY") && myentity_find_ext(target) == NULL) + else if (anope_flags_compat && !strcasecmp(target, "MODIFY") && myentity_find_ext(target) == NULL) { free(target); -- 2.6.6 ++++++ atheme-serno.diff ++++++ From: Jan Engelhardt <jengelh(a)inai.de> Date: 2016-05-04 11:21:18.899894344 +0200 References: https://github.com/atheme/atheme/issues/488 Avoid build failure because of serno.h non-existence. --- include/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: atheme-atheme-7.2.6/include/Makefile =================================================================== --- atheme-atheme-7.2.6.orig/include/Makefile +++ atheme-atheme-7.2.6/include/Makefile @@ -68,6 +68,6 @@ hooktypes.h: hooktypes.in mkhooktypes.sh serno.h: $(info Generate: $@) @revh=`git log -1 --pretty=oneline | cut -d' ' -f1 2>/dev/null` || :; \ - [ -z "$$revh" ] || echo "#define SERNO \"$$revh\"" >serno.h + echo "#define SERNO \"$$revh\"" >serno.h include ../buildsys.mk

1 0

commit fontinfo for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package fontinfo for openSUSE:Factory checked in at 2016-05-05 08:13:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontinfo (Old) and /work/SRC/openSUSE:Factory/.fontinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fontinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/fontinfo/fontinfo.changes 2015-04-12 00:10:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fontinfo.new/fontinfo.changes 2016-05-05 08:13:10.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 27 09:00:46 UTC 2016 - pgajdos(a)suse.com + +- updated to version 20160427 + * ycp: added more recent distros, remove old + +------------------------------------------------------------------- Old: ---- fontinfo-20150410.tar.bz2 New: ---- fontinfo.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontinfo.spec ++++++ --- /var/tmp/diff_new_pack.DWJ1WB/_old 2016-05-05 08:13:10.000000000 +0200 +++ /var/tmp/diff_new_pack.DWJ1WB/_new 2016-05-05 08:13:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fontinfo # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,13 +17,13 @@ Name: fontinfo -Version: 20150410 +Version: 20160427 Release: 0 Summary: Overview of Installed Fonts License: GPL-2.0+ Group: Productivity/Publishing/Other Url: https://github.com/pgajdos/fontinfo/ -Source: %{name}-%{version}.tar.bz2 +Source: %{name}.tar.bz2 # discount for THANKS.md -> thanks.txt BuildRequires: discount BuildRequires: fontconfig-devel @@ -45,7 +45,7 @@ and see differences. %prep -%setup -q +%setup -q -n %{name} %build make CFLAGS="%{optflags}" %{?_smp_mflags} ++++++ fontinfo-20150410.tar.bz2 -> fontinfo.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/COMMIT_EDITMSG new/fontinfo/.git/COMMIT_EDITMSG --- old/fontinfo-20150410/.git/COMMIT_EDITMSG 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/COMMIT_EDITMSG 2016-04-27 10:57:49.000000000 +0200 @@ -0,0 +1 @@ +ycp: add more recent distros, remove old diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/HEAD new/fontinfo/.git/HEAD --- old/fontinfo-20150410/.git/HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/HEAD 2016-04-27 10:52:57.000000000 +0200 @@ -0,0 +1 @@ +ref: refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/config new/fontinfo/.git/config --- old/fontinfo-20150410/.git/config 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/config 2016-04-27 10:52:57.000000000 +0200 @@ -0,0 +1,11 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[remote "origin"] + url = https://github.com/pgajdos/fontinfo.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/description new/fontinfo/.git/description --- old/fontinfo-20150410/.git/description 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/description 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/hooks/applypatch-msg.sample new/fontinfo/.git/hooks/applypatch-msg.sample --- old/fontinfo-20150410/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/hooks/applypatch-msg.sample 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/hooks/commit-msg.sample new/fontinfo/.git/hooks/commit-msg.sample --- old/fontinfo-20150410/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/hooks/commit-msg.sample 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^$.*>$.*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/hooks/post-update.sample new/fontinfo/.git/hooks/post-update.sample --- old/fontinfo-20150410/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/hooks/post-update.sample 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/hooks/pre-applypatch.sample new/fontinfo/.git/hooks/pre-applypatch.sample --- old/fontinfo-20150410/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/hooks/pre-applypatch.sample 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/hooks/pre-commit.sample new/fontinfo/.git/hooks/pre-commit.sample --- old/fontinfo-20150410/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/hooks/pre-commit.sample 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/hooks/pre-push.sample new/fontinfo/.git/hooks/pre-push.sample --- old/fontinfo-20150410/.git/hooks/pre-push.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/hooks/pre-push.sample 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# <local ref> <local sha1> <remote ref> <remote sha1> +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/hooks/pre-rebase.sample new/fontinfo/.git/hooks/pre-rebase.sample --- old/fontinfo-20150410/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/hooks/pre-rebase.sample 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/hooks/prepare-commit-msg.sample new/fontinfo/.git/hooks/prepare-commit-msg.sample --- old/fontinfo-20150410/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/hooks/prepare-commit-msg.sample 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^$.*>$.*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/hooks/update.sample new/fontinfo/.git/hooks/update.sample --- old/fontinfo-20150410/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/hooks/update.sample 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 <ref> <oldrev> <newrev>)" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 <ref> <oldrev> <newrev>" >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 Files old/fontinfo-20150410/.git/index and new/fontinfo/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/info/exclude new/fontinfo/.git/info/exclude --- old/fontinfo-20150410/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/info/exclude 2016-04-27 10:52:55.000000000 +0200 @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/logs/HEAD new/fontinfo/.git/logs/HEAD --- old/fontinfo-20150410/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/logs/HEAD 2016-04-27 10:57:49.000000000 +0200 @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 988d1000d9b011ee63e6e5650c79d469dd522f5a Petr Gajdos <pgajdos(a)suse.cz> 1461747177 +0200 clone: from https://github.com/pgajdos/fontinfo.git +988d1000d9b011ee63e6e5650c79d469dd522f5a ba03d1555988b18da113d505e69c796c1903c76a Petr Gajdos <pgajdos(a)suse.cz> 1461747469 +0200 commit: ycp: add more recent distros, remove old diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/logs/refs/heads/master new/fontinfo/.git/logs/refs/heads/master --- old/fontinfo-20150410/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/logs/refs/heads/master 2016-04-27 10:57:49.000000000 +0200 @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 988d1000d9b011ee63e6e5650c79d469dd522f5a Petr Gajdos <pgajdos(a)suse.cz> 1461747177 +0200 clone: from https://github.com/pgajdos/fontinfo.git +988d1000d9b011ee63e6e5650c79d469dd522f5a ba03d1555988b18da113d505e69c796c1903c76a Petr Gajdos <pgajdos(a)suse.cz> 1461747469 +0200 commit: ycp: add more recent distros, remove old diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/logs/refs/remotes/origin/HEAD new/fontinfo/.git/logs/refs/remotes/origin/HEAD --- old/fontinfo-20150410/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/logs/refs/remotes/origin/HEAD 2016-04-27 10:52:57.000000000 +0200 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 988d1000d9b011ee63e6e5650c79d469dd522f5a Petr Gajdos <pgajdos(a)suse.cz> 1461747177 +0200 clone: from https://github.com/pgajdos/fontinfo.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/logs/refs/remotes/origin/master new/fontinfo/.git/logs/refs/remotes/origin/master --- old/fontinfo-20150410/.git/logs/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/logs/refs/remotes/origin/master 2016-04-27 10:58:06.000000000 +0200 @@ -0,0 +1 @@ +988d1000d9b011ee63e6e5650c79d469dd522f5a ba03d1555988b18da113d505e69c796c1903c76a Petr Gajdos <pgajdos(a)suse.cz> 1461747486 +0200 update by push Files old/fontinfo-20150410/.git/objects/0d/e382e93704fa1466d27ab851b6150f6c03f97b and new/fontinfo/.git/objects/0d/e382e93704fa1466d27ab851b6150f6c03f97b differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/objects/ba/03d1555988b18da113d505e69c796c1903c76a new/fontinfo/.git/objects/ba/03d1555988b18da113d505e69c796c1903c76a --- old/fontinfo-20150410/.git/objects/ba/03d1555988b18da113d505e69c796c1903c76a 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/objects/ba/03d1555988b18da113d505e69c796c1903c76a 2016-04-27 10:57:49.000000000 +0200 @@ -0,0 +1,2 @@ +x;Â0©}íAhíø#èh¹ãÝðÁí Áé ¹Ý{Åh&ŠažUPÚjf$nZÅŸqšû µµ€\èZ#;+ ö6bÓ{×1d~VðmKÉw(%³mØ²±£ó€'2Jõ&0ÕkÊpæáî +ìÇË2e*ŒÌ>éŽ9X£BqÉ«ü7(ÞqÜA !eÌñWK·Rs*ùéÅ$ŸgN- \ No newline at end of file Files old/fontinfo-20150410/.git/objects/ff/98217a956a738d96823bb6903ae8d0fc487063 and new/fontinfo/.git/objects/ff/98217a956a738d96823bb6903ae8d0fc487063 differ Files old/fontinfo-20150410/.git/objects/pack/pack-e823ad618cf64ff7bec83997c89c2ebd25611ba8.idx and new/fontinfo/.git/objects/pack/pack-e823ad618cf64ff7bec83997c89c2ebd25611ba8.idx differ Files old/fontinfo-20150410/.git/objects/pack/pack-e823ad618cf64ff7bec83997c89c2ebd25611ba8.pack and new/fontinfo/.git/objects/pack/pack-e823ad618cf64ff7bec83997c89c2ebd25611ba8.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/packed-refs new/fontinfo/.git/packed-refs --- old/fontinfo-20150410/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/packed-refs 2016-04-27 10:52:57.000000000 +0200 @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled +988d1000d9b011ee63e6e5650c79d469dd522f5a refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/refs/heads/master new/fontinfo/.git/refs/heads/master --- old/fontinfo-20150410/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/refs/heads/master 2016-04-27 10:57:49.000000000 +0200 @@ -0,0 +1 @@ +ba03d1555988b18da113d505e69c796c1903c76a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/refs/remotes/origin/HEAD new/fontinfo/.git/refs/remotes/origin/HEAD --- old/fontinfo-20150410/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/refs/remotes/origin/HEAD 2016-04-27 10:52:57.000000000 +0200 @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/.git/refs/remotes/origin/master new/fontinfo/.git/refs/remotes/origin/master --- old/fontinfo-20150410/.git/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/.git/refs/remotes/origin/master 2016-04-27 10:58:06.000000000 +0200 @@ -0,0 +1 @@ +ba03d1555988b18da113d505e69c796c1903c76a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/Makefile new/fontinfo/Makefile --- old/fontinfo-20150410/Makefile 2015-04-10 08:28:48.000000000 +0200 +++ new/fontinfo/Makefile 2016-04-27 10:52:57.000000000 +0200 @@ -116,3 +116,4 @@ cp unicode/collections-map.sh fontinfo-$(VERSION)/unicode tar cvjf fontinfo-$(VERSION).tar.bz2 fontinfo-$(VERSION) rm -r fontinfo-$(VERSION) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/fontinfo-suse.sh new/fontinfo/fontinfo-suse.sh --- old/fontinfo-20150410/fontinfo-suse.sh 2015-04-10 08:28:48.000000000 +0200 +++ new/fontinfo/fontinfo-suse.sh 2016-04-27 10:56:55.000000000 +0200 @@ -21,10 +21,11 @@ -y bento \ -n ymp \ -g \ + -r 'openSUSE Tumbleweed,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_T…' \ + -r 'openSUSE Leap 42.1,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Leap_42…' \ -r 'openSUSE 13.2,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_13.2' \ + -r 'openSUSE 13.1,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_13.1' \ -r 'SUSE Linux Enterprise Server 12,http://download.opensuse.org/repositories/M17N:/fonts/SLE_12' \ -r 'SUSE Linux Enterprise Desktop 12,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Factory' \ - -r 'openSUSE 13.1,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_13.1' \ - -r 'openSUSE 12.3,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_12.3' \ - -r 'SUSE Linux Enterprise Server 11,http://download.opensuse.org/repositories/M17N:/fonts/SLE_11_SP3/' \ - -r 'SUSE Linux Enterprise Desktop 11,http://download.opensuse.org/repositories/M17N:/fonts/SLE_11_SP3/' \ + -r 'SUSE Linux Enterprise Server 11,http://download.opensuse.org/repositories/M17N:/fonts/SLE_11_SP4/' \ + -r 'SUSE Linux Enterprise Desktop 11,http://download.opensuse.org/repositories/M17N:/fonts/SLE_11_SP4/' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20150410/unicode/blocks.txt new/fontinfo/unicode/blocks.txt --- old/fontinfo-20150410/unicode/blocks.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/fontinfo/unicode/blocks.txt 2016-04-27 10:52:57.000000000 +0200 @@ -0,0 +1,220 @@ +{0x0000, 0x007F, "Basic Latin"}, +{0x0080, 0x00FF, "Latin-1 Supplement"}, +{0x0100, 0x017F, "Latin Extended-A"}, +{0x0180, 0x024F, "Latin Extended-B"}, +{0x0250, 0x02AF, "IPA Extensions"}, +{0x02B0, 0x02FF, "Spacing Modifier Letters"}, +{0x0300, 0x036F, "Combining Diacritical Marks"}, +{0x0370, 0x03FF, "Greek and Coptic"}, +{0x0400, 0x04FF, "Cyrillic"}, +{0x0500, 0x052F, "Cyrillic Supplement"}, +{0x0530, 0x058F, "Armenian"}, +{0x0590, 0x05FF, "Hebrew"}, +{0x0600, 0x06FF, "Arabic"}, +{0x0700, 0x074F, "Syriac"}, +{0x0750, 0x077F, "Arabic Supplement"}, +{0x0780, 0x07BF, "Thaana"}, +{0x07C0, 0x07FF, "NKo"}, +{0x0800, 0x083F, "Samaritan"}, +{0x0840, 0x085F, "Mandaic"}, +{0x08A0, 0x08FF, "Arabic Extended-A"}, +{0x0900, 0x097F, "Devanagari"}, +{0x0980, 0x09FF, "Bengali"}, +{0x0A00, 0x0A7F, "Gurmukhi"}, +{0x0A80, 0x0AFF, "Gujarati"}, +{0x0B00, 0x0B7F, "Oriya"}, +{0x0B80, 0x0BFF, "Tamil"}, +{0x0C00, 0x0C7F, "Telugu"}, +{0x0C80, 0x0CFF, "Kannada"}, +{0x0D00, 0x0D7F, "Malayalam"}, +{0x0D80, 0x0DFF, "Sinhala"}, +{0x0E00, 0x0E7F, "Thai"}, +{0x0E80, 0x0EFF, "Lao"}, +{0x0F00, 0x0FFF, "Tibetan"}, +{0x1000, 0x109F, "Myanmar"}, +{0x10A0, 0x10FF, "Georgian"}, +{0x1100, 0x11FF, "Hangul Jamo"}, +{0x1200, 0x137F, "Ethiopic"}, +{0x1380, 0x139F, "Ethiopic Supplement"}, +{0x13A0, 0x13FF, "Cherokee"}, +{0x1400, 0x167F, "Unified Canadian Aboriginal Syllabics"}, +{0x1680, 0x169F, "Ogham"}, +{0x16A0, 0x16FF, "Runic"}, +{0x1700, 0x171F, "Tagalog"}, +{0x1720, 0x173F, "Hanunoo"}, +{0x1740, 0x175F, "Buhid"}, +{0x1760, 0x177F, "Tagbanwa"}, +{0x1780, 0x17FF, "Khmer"}, +{0x1800, 0x18AF, "Mongolian"}, +{0x18B0, 0x18FF, "Unified Canadian Aboriginal Syllabics Extended"}, +{0x1900, 0x194F, "Limbu"}, +{0x1950, 0x197F, "Tai Le"}, +{0x1980, 0x19DF, "New Tai Lue"}, +{0x19E0, 0x19FF, "Khmer Symbols"}, +{0x1A00, 0x1A1F, "Buginese"}, +{0x1A20, 0x1AAF, "Tai Tham"}, +{0x1B00, 0x1B7F, "Balinese"}, +{0x1B80, 0x1BBF, "Sundanese"}, +{0x1BC0, 0x1BFF, "Batak"}, +{0x1C00, 0x1C4F, "Lepcha"}, +{0x1C50, 0x1C7F, "Ol Chiki"}, +{0x1CC0, 0x1CCF, "Sundanese Supplement"}, +{0x1CD0, 0x1CFF, "Vedic Extensions"}, +{0x1D00, 0x1D7F, "Phonetic Extensions"}, +{0x1D80, 0x1DBF, "Phonetic Extensions Supplement"}, +{0x1DC0, 0x1DFF, "Combining Diacritical Marks Supplement"}, +{0x1E00, 0x1EFF, "Latin Extended Additional"}, +{0x1F00, 0x1FFF, "Greek Extended"}, +{0x2000, 0x206F, "General Punctuation"}, +{0x2070, 0x209F, "Superscripts and Subscripts"}, +{0x20A0, 0x20CF, "Currency Symbols"}, +{0x20D0, 0x20FF, "Combining Diacritical Marks for Symbols"}, +{0x2100, 0x214F, "Letterlike Symbols"}, +{0x2150, 0x218F, "Number Forms"}, +{0x2190, 0x21FF, "Arrows"}, +{0x2200, 0x22FF, "Mathematical Operators"}, +{0x2300, 0x23FF, "Miscellaneous Technical"}, +{0x2400, 0x243F, "Control Pictures"}, +{0x2440, 0x245F, "Optical Character Recognition"}, +{0x2460, 0x24FF, "Enclosed Alphanumerics"}, +{0x2500, 0x257F, "Box Drawing"}, +{0x2580, 0x259F, "Block Elements"}, +{0x25A0, 0x25FF, "Geometric Shapes"}, +{0x2600, 0x26FF, "Miscellaneous Symbols"}, +{0x2700, 0x27BF, "Dingbats"}, +{0x27C0, 0x27EF, "Miscellaneous Mathematical Symbols-A"}, +{0x27F0, 0x27FF, "Supplemental Arrows-A"}, +{0x2800, 0x28FF, "Braille Patterns"}, +{0x2900, 0x297F, "Supplemental Arrows-B"}, +{0x2980, 0x29FF, "Miscellaneous Mathematical Symbols-B"}, +{0x2A00, 0x2AFF, "Supplemental Mathematical Operators"}, +{0x2B00, 0x2BFF, "Miscellaneous Symbols and Arrows"}, +{0x2C00, 0x2C5F, "Glagolitic"}, +{0x2C60, 0x2C7F, "Latin Extended-C"}, +{0x2C80, 0x2CFF, "Coptic"}, +{0x2D00, 0x2D2F, "Georgian Supplement"}, +{0x2D30, 0x2D7F, "Tifinagh"}, +{0x2D80, 0x2DDF, "Ethiopic Extended"}, +{0x2DE0, 0x2DFF, "Cyrillic Extended-A"}, +{0x2E00, 0x2E7F, "Supplemental Punctuation"}, +{0x2E80, 0x2EFF, "CJK Radicals Supplement"}, +{0x2F00, 0x2FDF, "Kangxi Radicals"}, +{0x2FF0, 0x2FFF, "Ideographic Description Characters"}, +{0x3000, 0x303F, "CJK Symbols and Punctuation"}, +{0x3040, 0x309F, "Hiragana"}, +{0x30A0, 0x30FF, "Katakana"}, +{0x3100, 0x312F, "Bopomofo"}, +{0x3130, 0x318F, "Hangul Compatibility Jamo"}, +{0x3190, 0x319F, "Kanbun"}, +{0x31A0, 0x31BF, "Bopomofo Extended"}, +{0x31C0, 0x31EF, "CJK Strokes"}, +{0x31F0, 0x31FF, "Katakana Phonetic Extensions"}, +{0x3200, 0x32FF, "Enclosed CJK Letters and Months"}, +{0x3300, 0x33FF, "CJK Compatibility"}, +{0x3400, 0x4DBF, "CJK Unified Ideographs Extension A"}, +{0x4DC0, 0x4DFF, "Yijing Hexagram Symbols"}, +{0x4E00, 0x9FFF, "CJK Unified Ideographs"}, +{0xA000, 0xA48F, "Yi Syllables"}, +{0xA490, 0xA4CF, "Yi Radicals"}, +{0xA4D0, 0xA4FF, "Lisu"}, +{0xA500, 0xA63F, "Vai"}, +{0xA640, 0xA69F, "Cyrillic Extended-B"}, +{0xA6A0, 0xA6FF, "Bamum"}, +{0xA700, 0xA71F, "Modifier Tone Letters"}, +{0xA720, 0xA7FF, "Latin Extended-D"}, +{0xA800, 0xA82F, "Syloti Nagri"}, +{0xA830, 0xA83F, "Common Indic Number Forms"}, +{0xA840, 0xA87F, "Phags-pa"}, +{0xA880, 0xA8DF, "Saurashtra"}, +{0xA8E0, 0xA8FF, "Devanagari Extended"}, +{0xA900, 0xA92F, "Kayah Li"}, +{0xA930, 0xA95F, "Rejang"}, +{0xA960, 0xA97F, "Hangul Jamo Extended-A"}, +{0xA980, 0xA9DF, "Javanese"}, +{0xAA00, 0xAA5F, "Cham"}, +{0xAA60, 0xAA7F, "Myanmar Extended-A"}, +{0xAA80, 0xAADF, "Tai Viet"}, +{0xAAE0, 0xAAFF, "Meetei Mayek Extensions"}, +{0xAB00, 0xAB2F, "Ethiopic Extended-A"}, +{0xABC0, 0xABFF, "Meetei Mayek"}, +{0xAC00, 0xD7AF, "Hangul Syllables"}, +{0xD7B0, 0xD7FF, "Hangul Jamo Extended-B"}, +{0xD800, 0xDB7F, "High Surrogates"}, +{0xDB80, 0xDBFF, "High Private Use Surrogates"}, +{0xDC00, 0xDFFF, "Low Surrogates"}, +{0xE000, 0xF8FF, "Private Use Area"}, +{0xF900, 0xFAFF, "CJK Compatibility Ideographs"}, +{0xFB00, 0xFB4F, "Alphabetic Presentation Forms"}, +{0xFB50, 0xFDFF, "Arabic Presentation Forms-A"}, +{0xFE00, 0xFE0F, "Variation Selectors"}, +{0xFE10, 0xFE1F, "Vertical Forms"}, +{0xFE20, 0xFE2F, "Combining Half Marks"}, +{0xFE30, 0xFE4F, "CJK Compatibility Forms"}, +{0xFE50, 0xFE6F, "Small Form Variants"}, +{0xFE70, 0xFEFF, "Arabic Presentation Forms-B"}, +{0xFF00, 0xFFEF, "Halfwidth and Fullwidth Forms"}, +{0xFFF0, 0xFFFF, "Specials"}, +{0x10000, 0x1007F, "Linear B Syllabary"}, +{0x10080, 0x100FF, "Linear B Ideograms"}, +{0x10100, 0x1013F, "Aegean Numbers"}, +{0x10140, 0x1018F, "Ancient Greek Numbers"}, +{0x10190, 0x101CF, "Ancient Symbols"}, +{0x101D0, 0x101FF, "Phaistos Disc"}, +{0x10280, 0x1029F, "Lycian"}, +{0x102A0, 0x102DF, "Carian"}, +{0x10300, 0x1032F, "Old Italic"}, +{0x10330, 0x1034F, "Gothic"}, +{0x10380, 0x1039F, "Ugaritic"}, +{0x103A0, 0x103DF, "Old Persian"}, +{0x10400, 0x1044F, "Deseret"}, +{0x10450, 0x1047F, "Shavian"}, +{0x10480, 0x104AF, "Osmanya"}, +{0x10800, 0x1083F, "Cypriot Syllabary"}, +{0x10840, 0x1085F, "Imperial Aramaic"}, +{0x10900, 0x1091F, "Phoenician"}, +{0x10920, 0x1093F, "Lydian"}, +{0x10980, 0x1099F, "Meroitic Hieroglyphs"}, +{0x109A0, 0x109FF, "Meroitic Cursive"}, +{0x10A00, 0x10A5F, "Kharoshthi"}, +{0x10A60, 0x10A7F, "Old South Arabian"}, +{0x10B00, 0x10B3F, "Avestan"}, +{0x10B40, 0x10B5F, "Inscriptional Parthian"}, +{0x10B60, 0x10B7F, "Inscriptional Pahlavi"}, +{0x10C00, 0x10C4F, "Old Turkic"}, +{0x10E60, 0x10E7F, "Rumi Numeral Symbols"}, +{0x11000, 0x1107F, "Brahmi"}, +{0x11080, 0x110CF, "Kaithi"}, +{0x110D0, 0x110FF, "Sora Sompeng"}, +{0x11100, 0x1114F, "Chakma"}, +{0x11180, 0x111DF, "Sharada"}, +{0x11680, 0x116CF, "Takri"}, +{0x12000, 0x123FF, "Cuneiform"}, +{0x12400, 0x1247F, "Cuneiform Numbers and Punctuation"}, +{0x13000, 0x1342F, "Egyptian Hieroglyphs"}, +{0x16800, 0x16A3F, "Bamum Supplement"}, +{0x16F00, 0x16F9F, "Miao"}, +{0x1B000, 0x1B0FF, "Kana Supplement"}, +{0x1D000, 0x1D0FF, "Byzantine Musical Symbols"}, +{0x1D100, 0x1D1FF, "Musical Symbols"}, +{0x1D200, 0x1D24F, "Ancient Greek Musical Notation"}, +{0x1D300, 0x1D35F, "Tai Xuan Jing Symbols"}, +{0x1D360, 0x1D37F, "Counting Rod Numerals"}, +{0x1D400, 0x1D7FF, "Mathematical Alphanumeric Symbols"}, +{0x1EE00, 0x1EEFF, "Arabic Mathematical Alphabetic Symbols"}, +{0x1F000, 0x1F02F, "Mahjong Tiles"}, +{0x1F030, 0x1F09F, "Domino Tiles"}, +{0x1F0A0, 0x1F0FF, "Playing Cards"}, +{0x1F100, 0x1F1FF, "Enclosed Alphanumeric Supplement"}, +{0x1F200, 0x1F2FF, "Enclosed Ideographic Supplement"}, +{0x1F300, 0x1F5FF, "Miscellaneous Symbols And Pictographs"}, +{0x1F600, 0x1F64F, "Emoticons"}, +{0x1F680, 0x1F6FF, "Transport And Map Symbols"}, +{0x1F700, 0x1F77F, "Alchemical Symbols"}, +{0x20000, 0x2A6DF, "CJK Unified Ideographs Extension B"}, +{0x2A700, 0x2B73F, "CJK Unified Ideographs Extension C"}, +{0x2B740, 0x2B81F, "CJK Unified Ideographs Extension D"}, +{0x2F800, 0x2FA1F, "CJK Compatibility Ideographs Supplement"}, +{0xE0000, 0xE007F, "Tags"}, +{0xE0100, 0xE01EF, "Variation Selectors Supplement"}, +{0xF0000, 0xFFFFF, "Supplementary Private Use Area-A"}, +{0x100000, 0x10FFFF, "Supplementary Private Use Area-B"},

1 0

commit gcc6 for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package gcc6 for openSUSE:Factory checked in at 2016-05-05 08:13:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc6 (Old) and /work/SRC/openSUSE:Factory/.gcc6.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc6" Changes: -------- --- /work/SRC/openSUSE:Factory/gcc6/cross-aarch64-gcc6.changes 2016-04-14 13:02:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gcc6.new/cross-aarch64-gcc6.changes 2016-05-05 08:13:04.000000000 +0200 @@ -1,0 +2,34 @@ +Wed May 4 08:27:42 UTC 2016 - rguenther(a)suse.com + +- Fix HSA build conditional for crosses. + +------------------------------------------------------------------- +Mon May 2 07:22:08 UTC 2016 - rguenther(a)suse.com + +- Update to gcc-6-branch head (r235696). + * Fixes libgcj_bc1 version check issue. + +------------------------------------------------------------------- +Wed Apr 27 10:37:26 UTC 2016 - rguenther(a)suse.com + +- Update to GCC 6.1.0 release (r235473). + * Includes fix for python3 miscompile [bnc#976024] +- Enable profiledbootstrap, but not if building libjava where also + disable bootstrap + +------------------------------------------------------------------- +Mon Apr 18 14:01:38 UTC 2016 - martin.liska(a)suse.com + +- Add gcc6-hsa-enablement.patch and enable HSA offloading target. + +------------------------------------------------------------------- +Thu Apr 14 12:38:43 UTC 2016 - rguenther(a)suse.com + +- Update to SVN trunk head (r234970). + +------------------------------------------------------------------- +Thu Apr 14 12:05:43 UTC 2016 - rguenther(a)suse.com + +- Enable Ada on ppc64le and aarch64. + +------------------------------------------------------------------- cross-armv6hl-gcc6.changes: same change cross-armv7hl-gcc6.changes: same change cross-avr-gcc6.changes: same change cross-i386-gcc6.changes: same change cross-m68k-gcc6.changes: same change cross-ppc64-gcc6.changes: same change cross-ppc64le-gcc6.changes: same change cross-s390x-gcc6.changes: same change cross-sparc-gcc6.changes: same change cross-sparc64-gcc6.changes: same change cross-x86_64-gcc6.changes: same change gcc6-testresults.changes: same change gcc6.changes: same change libgcj-gcc6.changes: same change Old: ---- gcc-6.0.0-r234449.tar.bz2 New: ---- gcc-6.1.1-r235696.tar.bz2 gcc6-hsa-enablement.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-aarch64-gcc6.spec ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -38,6 +38,7 @@ %define build_objc 0 %define build_objcp 0 %define build_go 0 +%define build_hsa 0 %define binutils_target %{cross_arch} %if %{cross_arch} == "armv7l" || %{cross_arch} == "armv7hl" @@ -114,7 +115,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -147,6 +148,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -219,6 +221,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -361,6 +364,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -384,6 +390,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ cross-armv6hl-gcc6.spec: same change cross-armv7hl-gcc6.spec: same change cross-avr-gcc6.spec: same change cross-i386-gcc6.spec: same change cross-m68k-gcc6.spec: same change cross-ppc64-gcc6.spec: same change cross-ppc64le-gcc6.spec: same change cross-s390x-gcc6.spec: same change cross-sparc-gcc6.spec: same change cross-sparc64-gcc6.spec: same change cross-x86_64-gcc6.spec: same change ++++++ gcc6-testresults.spec ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -38,7 +38,11 @@ # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 +%if %{suse_version} >= 1330 +%define ada_arch %ix86 x86_64 ppc ppc64 ppc64le s390 ia64 aarch64 +%else %define ada_arch %ix86 x86_64 ppc ppc64 s390 ia64 +%endif %else %define ada_arch %ix86 x86_64 ppc s390 ia64 %endif @@ -96,6 +100,12 @@ %define build_objcp 0 %endif +%ifarch x86_64 +%define build_hsa 1 +%else +%define build_hsa 0 +%endif + # Shared library SONAME versions %ifarch hppa %define libgcc_s 4 @@ -110,6 +120,7 @@ %define libgcj_bc_sover 1 %define libffi_sover 7 %define libgomp_sover 1 +%define libgomp_plugin_hsa_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 3 @@ -146,6 +157,7 @@ %define libgcj_bc_suffix %{plv libgcj_bc %{libgcj_bc_sover}} %define libffi_suffix %{plv libffi %{libffi_sover}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} +%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -254,7 +266,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -325,6 +337,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -448,6 +461,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -590,6 +604,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -613,6 +630,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ @@ -755,11 +775,15 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%if 0%{?building_libjava:1} make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%endif +%endif make info %if 0%{?building_libjava:1} make -C %{GCCDIST}/libstdc++-v3/doc doc-html-doxygen ++++++ gcc6.spec ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -20,7 +20,11 @@ # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 +%if %{suse_version} >= 1330 +%define ada_arch %ix86 x86_64 ppc ppc64 ppc64le s390 ia64 aarch64 +%else %define ada_arch %ix86 x86_64 ppc ppc64 s390 ia64 +%endif %else %define ada_arch %ix86 x86_64 ppc s390 ia64 %endif @@ -78,6 +82,12 @@ %define build_objcp 0 %endif +%ifarch x86_64 +%define build_hsa 1 +%else +%define build_hsa 0 +%endif + # Shared library SONAME versions %ifarch hppa %define libgcc_s 4 @@ -92,6 +102,7 @@ %define libgcj_bc_sover 1 %define libffi_sover 7 %define libgomp_sover 1 +%define libgomp_plugin_hsa_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 3 @@ -128,6 +139,7 @@ %define libgcj_bc_suffix %{plv libgcj_bc %{libgcj_bc_sover}} %define libffi_suffix %{plv libffi %{libffi_sover}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} +%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -236,7 +248,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -307,6 +319,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -1937,6 +1950,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -2079,6 +2093,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -2102,6 +2119,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ @@ -2244,11 +2264,15 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%if 0%{?building_libjava:1} make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%endif +%endif make info %if 0%{?building_libjava:1} make -C %{GCCDIST}/libstdc++-v3/doc doc-html-doxygen @@ -2323,7 +2347,7 @@ # Remove some useless .la files for lib in libobjc libgfortran libquadmath libcaf_single \ - libgomp libstdc++ libsupc++ libgcj-tools libgij libgo \ + libgomp libgomp-plugin-hsa libstdc++ libsupc++ libgcj-tools libgij libgo \ libasan libatomic libitm libtsan libcilkrts liblsan libubsan libvtv \ libmpx libmpxwrappers libstdc++fs; do rm -f $RPM_BUILD_ROOT%{versmainlibdir}/$lib.la @@ -2408,6 +2432,9 @@ libgo \ %endif libgomp \ +%if %{build_hsa} + libgomp-plugin-hsa \ +%endif %ifarch %atomic_arch libatomic \ %endif @@ -2452,7 +2479,7 @@ fi %endif done -# FIXME, tsan and lsan are not multilib +# FIXME, tsan and lsan (and libgomp-plugin-hsa) are not multilib %ifarch %tsan_arch %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libtsan.so @@ -2462,6 +2489,9 @@ %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/liblsan.so %endif +%if %{biarch} && %{build_hsa} +rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libgomp-plugin-hsa.so +%endif %endif %if %{build_cp} %if !0%{?building_libjava:1} @@ -2884,6 +2914,9 @@ %versmainlib libgomp.so %versmainlib libgomp.a %versmainlib libgomp.spec +%if %{build_hsa} +%versmainlib libgomp-plugin-hsa.so +%endif %ifarch %itm_arch %versmainlib libitm.so %versmainlib libitm.a @@ -3079,6 +3112,9 @@ %files -n libgomp%{libgomp_sover}%{libgomp_suffix} %defattr(-,root,root) %mainlib libgomp.so.%{libgomp_sover}* +%if %{build_hsa} +%mainlib libgomp-plugin-hsa.so.%{libgomp_plugin_hsa_sover}* +%endif %if %{separate_biarch} %files -n libgomp%{libgomp_sover}%{libgomp_suffix}%{separate_biarch_suffix} ++++++ libgcj-gcc6.spec ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -37,7 +37,11 @@ # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 +%if %{suse_version} >= 1330 +%define ada_arch %ix86 x86_64 ppc ppc64 ppc64le s390 ia64 aarch64 +%else %define ada_arch %ix86 x86_64 ppc ppc64 s390 ia64 +%endif %else %define ada_arch %ix86 x86_64 ppc s390 ia64 %endif @@ -95,6 +99,12 @@ %define build_objcp 0 %endif +%ifarch x86_64 +%define build_hsa 1 +%else +%define build_hsa 0 +%endif + # Shared library SONAME versions %ifarch hppa %define libgcc_s 4 @@ -109,6 +119,7 @@ %define libgcj_bc_sover 1 %define libffi_sover 7 %define libgomp_sover 1 +%define libgomp_plugin_hsa_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 3 @@ -145,6 +156,7 @@ %define libgcj_bc_suffix %{plv libgcj_bc %{libgcj_bc_sover}} %define libffi_suffix %{plv libffi %{libffi_sover}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} +%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -253,7 +265,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -324,6 +336,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -711,6 +724,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -853,6 +867,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -876,6 +893,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ @@ -1018,11 +1038,15 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%if 0%{?building_libjava:1} make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%endif +%endif make info %if 0%{?building_libjava:1} make -C %{GCCDIST}/libstdc++-v3/doc doc-html-doxygen @@ -1097,7 +1121,7 @@ # Remove some useless .la files for lib in libobjc libgfortran libquadmath libcaf_single \ - libgomp libstdc++ libsupc++ libgcj-tools libgij libgo \ + libgomp libgomp-plugin-hsa libstdc++ libsupc++ libgcj-tools libgij libgo \ libasan libatomic libitm libtsan libcilkrts liblsan libubsan libvtv \ libmpx libmpxwrappers libstdc++fs; do rm -f $RPM_BUILD_ROOT%{versmainlibdir}/$lib.la @@ -1136,6 +1160,9 @@ libgo \ %endif libgomp \ +%if %{build_hsa} + libgomp-plugin-hsa \ +%endif %ifarch %atomic_arch libatomic \ %endif @@ -1180,7 +1207,7 @@ fi %endif done -# FIXME, tsan and lsan are not multilib +# FIXME, tsan and lsan (and libgomp-plugin-hsa) are not multilib %ifarch %tsan_arch %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libtsan.so @@ -1190,6 +1217,9 @@ %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/liblsan.so %endif +%if %{biarch} && %{build_hsa} +rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libgomp-plugin-hsa.so +%endif %endif %if %{build_cp} %if !0%{?building_libjava:1} ++++++ cross.spec.in ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -17,6 +17,7 @@ %define build_objc 0 %define build_objcp 0 %define build_go 0 +%define build_hsa 0 %define binutils_target %{cross_arch} %if %{cross_arch} == "armv7l" || %{cross_arch} == "armv7hl" ++++++ gcc-6.0.0-r234449.tar.bz2 -> gcc-6.1.1-r235696.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/gcc6/gcc-6.0.0-r234449.tar.bz2 /work/SRC/openSUSE:Factory/.gcc6.new/gcc-6.1.1-r235696.tar.bz2 differ: char 11, line 1 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -22,7 +22,11 @@ # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 +%if %{suse_version} >= 1330 +%define ada_arch %ix86 x86_64 ppc ppc64 ppc64le s390 ia64 aarch64 +%else %define ada_arch %ix86 x86_64 ppc ppc64 s390 ia64 +%endif %else %define ada_arch %ix86 x86_64 ppc s390 ia64 %endif @@ -80,6 +84,12 @@ %define build_objcp 0 %endif +%ifarch x86_64 +%define build_hsa 1 +%else +%define build_hsa 0 +%endif + # Shared library SONAME versions %ifarch hppa %define libgcc_s 4 @@ -94,6 +104,7 @@ %define libgcj_bc_sover 1 %define libffi_sover 7 %define libgomp_sover 1 +%define libgomp_plugin_hsa_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 3 @@ -130,6 +141,7 @@ %define libgcj_bc_suffix %{plv libgcj_bc %{libgcj_bc_sover}} %define libffi_suffix %{plv libffi %{libffi_sover}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} +%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -242,7 +254,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 1 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -315,6 +327,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -1202,6 +1215,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -1344,6 +1358,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -1367,6 +1384,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ @@ -1511,11 +1531,15 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%if 0%{?building_libjava:1} make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%endif +%endif make info %if 0%{?building_libjava:1} make -C %{GCCDIST}/libstdc++-v3/doc doc-html-doxygen @@ -1591,7 +1615,7 @@ # Remove some useless .la files for lib in libobjc libgfortran libquadmath libcaf_single \ - libgomp libstdc++ libsupc++ libgcj-tools libgij libgo \ + libgomp libgomp-plugin-hsa libstdc++ libsupc++ libgcj-tools libgij libgo \ libasan libatomic libitm libtsan libcilkrts liblsan libubsan libvtv \ libmpx libmpxwrappers libstdc++fs; do rm -f $RPM_BUILD_ROOT%{versmainlibdir}/$lib.la @@ -1679,6 +1703,9 @@ libgo \ %endif libgomp \ +%if %{build_hsa} + libgomp-plugin-hsa \ +%endif %ifarch %atomic_arch libatomic \ %endif @@ -1723,7 +1750,7 @@ fi %endif done -# FIXME, tsan and lsan are not multilib +# FIXME, tsan and lsan (and libgomp-plugin-hsa) are not multilib %ifarch %tsan_arch %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libtsan.so @@ -1733,6 +1760,9 @@ %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/liblsan.so %endif +%if %{biarch} && %{build_hsa} +rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libgomp-plugin-hsa.so +%endif %endif %if %{build_cp} %if !0%{?building_libjava:1} @@ -2167,6 +2197,9 @@ %versmainlib libgomp.so %versmainlib libgomp.a %versmainlib libgomp.spec +%if %{build_hsa} +%versmainlib libgomp-plugin-hsa.so +%endif %ifarch %itm_arch %versmainlib libitm.so %versmainlib libitm.a @@ -2363,6 +2396,9 @@ %files -n libgomp%{libgomp_sover}%{libgomp_suffix} %defattr(-,root,root) %mainlib libgomp.so.%{libgomp_sover}* +%if %{build_hsa} +%mainlib libgomp-plugin-hsa.so.%{libgomp_plugin_hsa_sover}* +%endif %if %{separate_biarch} %files -n libgomp%{libgomp_sover}%{libgomp_suffix}%{separate_biarch_suffix} ++++++ gcc6-hsa-enablement.patch ++++++ ++++ 1763 lines (skipped)

1 0

commit accerciser for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package accerciser for openSUSE:Factory checked in at 2016-05-05 08:13:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/accerciser (Old) and /work/SRC/openSUSE:Factory/.accerciser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "accerciser" Changes: -------- --- /work/SRC/openSUSE:Factory/accerciser/accerciser.changes 2015-04-13 20:31:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.accerciser.new/accerciser.changes 2016-05-05 08:13:01.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 3 21:32:15 UTC 2016 - dimstar(a)opensuse.org + +- Require python3-gobject-Gdk instead of python3-gobject: pygobject + was further split in order to be able to install it without + X-dependencies. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ accerciser.spec ++++++ --- /var/tmp/diff_new_pack.JAW7mV/_old 2016-05-05 08:13:02.000000000 +0200 +++ /var/tmp/diff_new_pack.JAW7mV/_new 2016-05-05 08:13:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package accerciser # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -38,7 +38,7 @@ BuildRequires: pkgconfig(pygobject-3.0) >= 2.90.3 # py3atspi is a virtual name that is provided by the default at-spi stack Requires: py3atspi -Requires: python3-gobject +Requires: python3-gobject-Gdk Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires

1 0