commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2020-08-02 12:27:36
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new.3592 (New)
Package is "build-compare"
Sun Aug 2 12:27:36 2020 rev:117 rq:823017 version:20200727T175347.d95eb35
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2020-06-11 14:42:17.436909242 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new.3592/build-compare.changes
2020-08-02 12:27:50.415825207 +0200
@@ -1,0 +2,7 @@
+Mon Jul 27 06:06:06 UTC 2020 - bwiedem...@suse.de
+
+- Make output more diffable and readable
+- Fix regression in compare_archive
+- Fix unit tests
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.XJlwkt/_old 2020-08-02 12:27:51.687826514 +0200
+++ /var/tmp/diff_new_pack.XJlwkt/_new 2020-08-02 12:27:51.691826518 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20200529T212652.102d844
+Version:20200727T175347.d95eb35
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.XJlwkt/_old 2020-08-02 12:27:51.743826571 +0200
+++ /var/tmp/diff_new_pack.XJlwkt/_new 2020-08-02 12:27:51.743826571 +0200
@@ -218,7 +218,7 @@
function comp_file()
{
echo "comparing $1"
-if ! diff -au $2 $3; then
+if ! diff --label old-$1 --label new-$1 -au $2 $3; then
if test -z "$check_all"; then
rm $2 $3 $4 $5
return 1
@@ -320,7 +320,7 @@
cat $rpm_meta_old | trim_release_old > $file1
cat $rpm_meta_new | trim_release_new > $file2
echo "comparing the rpm tags of $name_new"
-if diff -au $file1 $file2; then
+if diff --label old-rpm-tags --label new-rpm-tags -au $file1 $file2; then
rm $file1 $file2 $rpm_meta_old $rpm_meta_new
return 0
fi
@@ -376,7 +376,7 @@
do
: "${REPLY}"
files+=( "${REPLY}" )
- done < <(diff -U0 $file1 $file2 | sed -E -n -e '/^-\//{s/^-//;s/
[0-9a-f]+ [0-9]+$//;p}')
+ done < <(diff -U0 $file1 $file2 | sed -E -n -e '/^\+\//{s/^\+//;s/
[0-9a-f]+ [0-9]+$//;p}')
fi
if test -n "$sh"; then
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.XJlwkt/_old 2020-08-02 12:27:51.755826584 +0200
+++ /var/tmp/diff_new_pack.XJlwkt/_new 2020-08-02 12:27:51.755826584 +0200
@@ -198,6 +198,8 @@
offset=$(( ($offset >> 6) << 6 ))
length=512
diff -u \
+--label "old $file (hex)" \
+--label "new $file (hex)" \
<( hexdump -C -s $offset -n $length "old/$file" ) \
<( hexdump -C -s $offset -n $length "new/$file" ) | $buildcompare_head
return 1
@@ -789,6 +791,7 @@
: "${REPLY}"
filelist+=( "${REPLY}" )
done < 'cn'
+ ret=0
for f in "${filelist[@]}"
do
if ! check_single_file "${file}/${f}"
@@ -801,7 +804,6 @@
fi
watchdog_touch
done
- ret=$?
else
wprint "$file has different file list"
diff -u 'co' 'cn'
@@ -832,7 +834,7 @@
verify_before_processing "${file}" "${dfile}"
case "$?" in
0) return 0 ;;
-1) return 1 ;;
+1) test -z "$check_all" && return 1 ;;
*) ;;
esac
@@ -901,6 +903,8 @@
ELF*[LM]SB\ pie\ executable*|\
setuid\ ELF*[LM]SB\ pie\ executable*)
diff --speed-large-files --unified \
+--label "old $file (disasm)" \
+--label "new $file (disasm)" \
<( $OBJDUMP -d --no-show-raw-insn old/$file |
filter_disasm |
sed -e "s,old/,," ;
@@ -973,6 +977,8 @@
for section in $sections
do
diff --unified \
+ --label "old $file (objdump)" \
+ --label "new $file (objdump)" \
<( $OBJDUMP -s -j $section old/$file |
sed -e "s,^old/,," ;
echo "${PIPESTATUS[@]}" > $file1) \
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2020-06-11 14:41:50
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new.3606 (New)
Package is "build-compare"
Thu Jun 11 14:41:50 2020 rev:116 rq:811920 version:20200529T212652.102d844
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2020-05-16 22:23:29.544923175 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new.3606/build-compare.changes
2020-06-11 14:42:17.436909242 +0200
@@ -1,0 +2,12 @@
+Fri May 29 19:20:21 UTC 2020 - o...@aepfle.de
+
+- Remove usage of readarray to remain compatible with bash3
+
+---
+Fri May 29 07:30:51 UTC 2020 - o...@aepfle.de
+
+- Colltect a list of known rpm tags and use it to build the
+ queryformat string for the tags listed below (bsc#1172232)
+ conflict obsolete oldsuggests provide recommend require suggest supplement
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.5yI9FF/_old 2020-06-11 14:42:19.120915729 +0200
+++ /var/tmp/diff_new_pack.5yI9FF/_new 2020-06-11 14:42:19.120915729 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20200514T095116.be3487c
+Version:20200529T212652.102d844
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.5yI9FF/_old 2020-06-11 14:42:19.172915930 +0200
+++ /var/tmp/diff_new_pack.5yI9FF/_new 2020-06-11 14:42:19.172915930 +0200
@@ -10,36 +10,59 @@
RPM="rpm -qp --nodigest --nosignature"
+declare -a rpm_querytags
+collect_rpm_querytags() {
+ rpm_querytags=( $(rpm --querytags) )
+}
+# returns 0 if tag is known, returns 1 if unknown
+rpmtag_known() {
+ local needle="\<${1}\>"
+ local haystack="${rpm_querytags[@]}"
+ [[ "${haystack}" =~ ${needle} ]]
+ return $?
+}
+
set_rpm_meta_global_variables() {
local pkg=$1
local rpm_tags=
local out=`mktemp`
+ local t v qt
+ local -a type variant list
# Name, Version, Release
QF_NAME="%{NAME}"
QF_VER_REL="%{VERSION}-%{RELEASE}"
QF_NAME_VER_REL="%{NAME}-%{VERSION}-%{RELEASE}"
-# provides destroy this because at least the self-provide includes the
-# -buildnumber :-(
-QF_PROVIDES="[%{PROVIDENAME} %{PROVIDEFLAGS} %{PROVIDEVERSION}\\n]\\n"
-QF_PROVIDES="${QF_PROVIDES}[%{REQUIRENAME} %{REQUIREFLAGS}
%{REQUIREVERSION}\\n]\\n"
-QF_PROVIDES="${QF_PROVIDES}[%{CONFLICTNAME} %{CONFLICTFLAGS}
%{CONFLICTVERSION}\\n]\\n"
-QF_PROVIDES="${QF_PROVIDES}[%{OBSOLETENAME} %{OBSOLETEFLAGS}
%{OBSOLETEVERSION}\\n]\\n"
-
-rpm_tags="%{RECOMMENDNAME} %{RECOMMENDFLAGS} %{RECOMMENDVERSION}"
-check_header "%{NAME} ${rpm_tags}" > "${out}"
-if test -s "${out}"
-then
- QF_PROVIDES="${QF_PROVIDES}[${rpm_tags}\\n]\\n"
-fi
-rpm_tags="%{SUPPLEMENTNAME} %{SUPPLEMENTFLAGS} %{SUPPLEMENTVERSION}"
-check_header "%{NAME} ${rpm_tags}" > "${out}"
-if test -s "${out}"
-then
- QF_PROVIDES="${QF_PROVIDES}[${rpm_tags}\\n]\\n"
-fi
+QF_PROVIDES=
+type=(
+ CONFLICT
+ OBSOLETE
+ OLDSUGGESTS
+ PROVIDE
+ RECOMMEND
+ REQUIRE
+ SUGGEST
+ SUPPLEMENT
+)
+variant=(
+ NAME
+ FLAGS
+ VERSION
+)
+for t in "${type[@]}"
+do
+ unset list
+ list=()
+ for v in "${variant[@]}"
+ do
+qt="${t}${v}"
+rpmtag_known "${qt}" || continue
+list+=("%{${qt}}")
+ done
+ QF_PROVIDES+="${t}\\n[${list[@]}\\n]\\n"
+done
# don't look at RELEASE, it contains our build number
QF_TAGS="%{NAME} %{VERSION} %{EPOCH}\\n"
@@ -54,24 +77,36 @@
# XXX We also need to check the existence (but not the content (!))
# of SIGGPG (and perhaps the other SIG*)
# XXX We don't look at triggers
-QF_TAGS="${QF_TAGS}[%{VERIFYSCRIPTPROG} %{VERIFYSCRIPT}]\\n"
# Only the first ChangeLog entry; should be enough
QF_TAGS="${QF_TAGS}%{CHANGELOGTIME} %{CHANGELOGNAME} %{CHANGELOGTEXT}\\n"
# scripts, might contain release number
-script_types='
-PRETRANS
-PREIN
-POSTIN
-PREUN
-POSTUN
-POSTTRANS
-VERIFYSCRIPT
-'
QF_SCRIPT=
-for script_type in ${script_types}
+type=(
+ PRETRANS
+ PREIN
+ POSTIN
+ PREUN
+ POSTUN
+ POSTTRANS
+ VERIFYSCRIPT
+)
+variant=(
+ PROG
+ FLAGS
+ ''
+)
+for t in "${type[@]}"
do
- QF_SCRIPT="${QF_SCRIPT}[%{${script_type}PROG} %{${script_type}FLAGS}
%{${script_type}}\\n]\\n"
+ unset list
+ list=()
+ for v in "${variant[@]}"
+ do
+qt="${t}${v}"
+rpmtag_known "${qt}" || continue
+list+=("%{${qt}}")
+ done
+ QF_SCRIPT+="${t}\\n[${list[@]}\\n]\\n"
done
# Now the files.
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2020-05-16 22:23:21
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new.2738 (New)
Package is "build-compare"
Sat May 16 22:23:21 2020 rev:115 rq:805486 version:20200514T095116.be3487c
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2020-05-11 13:25:57.099180376 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new.2738/build-compare.changes
2020-05-16 22:23:29.544923175 +0200
@@ -1,0 +2,10 @@
+Thu May 14 07:07:07 UTC 2020 - o...@aepfle.de
+
+- Trim first line of man page to catch overly verbose tools (now Pandoc)
+
+---
+Wed May 13 13:13:13 UTC 2020 - o...@aepfle.de
+
+- compare also posttrans scripts, and pretrans + verifyscript
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.NCy7QV/_old 2020-05-16 22:23:31.796927797 +0200
+++ /var/tmp/diff_new_pack.NCy7QV/_new 2020-05-16 22:23:31.800927805 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20200508T210136.9aadd6e
+Version:20200514T095116.be3487c
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.NCy7QV/_old 2020-05-16 22:23:31.856927920 +0200
+++ /var/tmp/diff_new_pack.NCy7QV/_new 2020-05-16 22:23:31.856927920 +0200
@@ -59,7 +59,20 @@
QF_TAGS="${QF_TAGS}%{CHANGELOGTIME} %{CHANGELOGNAME} %{CHANGELOGTEXT}\\n"
# scripts, might contain release number
-QF_SCRIPT="[%{PREINPROG} %{PREIN}\\n]\\n[%{POSTINPROG}
%{POSTIN}\\n]\\n[%{PREUNPROG} %{PREUN}\\n]\\n[%{POSTUNPROG} %{POSTUN}\\n]\\n"
+script_types='
+PRETRANS
+PREIN
+POSTIN
+PREUN
+POSTUN
+POSTTRANS
+VERIFYSCRIPT
+'
+QF_SCRIPT=
+for script_type in ${script_types}
+do
+ QF_SCRIPT="${QF_SCRIPT}[%{${script_type}PROG} %{${script_type}FLAGS}
%{${script_type}}\\n]\\n"
+done
# Now the files. We leave out mtime and size. For normal files
# the size will influence the MD5 anyway. For directories the sizes can
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.NCy7QV/_old 2020-05-16 22:23:31.872927953 +0200
+++ /var/tmp/diff_new_pack.NCy7QV/_new 2020-05-16 22:23:31.872927953 +0200
@@ -207,11 +207,12 @@
{
# Handles the first line if it is like:
#.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+#.\" Automatically generated by Pandoc 2.9.2.1
#.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
local f=$1
[[ $nofilter ]] && return
sed -i -e '1{
-
s|^\.\\"[[:blank:]]\+Automatically[[:blank:]]generated[[:blank:]]by[[:blank:]]Pod::Man[[:blank:]].*|.\\"
Overly verbose Pod::Man|
+
s|^\.\\"[[:blank:]]\+Automatically[[:blank:]]generated[[:blank:]]by[[:blank:]].*|.\\"
Automatically generated by SomeTool|
s|^\.\\"[[:blank:]]\+DO[[:blank:]]NOT[[:blank:]]MODIFY[[:blank:]]THIS[[:blank:]]FILE![[:blank:]]\+It[[:blank:]]was[[:blank:]]generated[[:blank:]]by[[:blank:]]help2man[[:blank:]].*|.\\"
Overly verbose help2man|
}' $f
}
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2020-05-11 13:25:55
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new.2738 (New)
Package is "build-compare"
Mon May 11 13:25:55 2020 rev:114 rq:801854 version:20200508T210136.9aadd6e
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2020-04-15 20:06:45.198115674 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new.2738/build-compare.changes
2020-05-11 13:25:57.099180376 +0200
@@ -1,0 +2,6 @@
+Tue May 5 05:05:05 UTC 2020 - o...@aepfle.de
+
+- handle oddly named ZIP archives
+- touch watchdog every 15 instead of 57 minutes
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.q6znaL/_old 2020-05-11 13:25:58.747183831 +0200
+++ /var/tmp/diff_new_pack.q6znaL/_new 2020-05-11 13:25:58.751183839 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20200331T115051.28bf642
+Version:20200508T210136.9aadd6e
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.q6znaL/_old 2020-05-11 13:25:58.827183998 +0200
+++ /var/tmp/diff_new_pack.q6znaL/_new 2020-05-11 13:25:58.831184007 +0200
@@ -6,7 +6,7 @@
# Written by Michael Matz and Stephan Coolo
# Enhanced by Andreas Jaeger
declare -i watchdog_host_timeout_seconds='3600'
-declare -i watchdog_touch_percent_prior_timeout='96'
+declare -i watchdog_touch_percent_prior_timeout='25'
declare -i watchdog_next_touch_seconds=0
function watchdog_reset
@@ -1047,6 +1047,11 @@
return 1
fi
;;
+Zip\ archive\ data,*)
+ if ! compare_archive "${file}" 'archive_zip' ; then
+return 1
+ fi
+ ;;
POSIX\ tar\ archive)
mv old/$file{,.tar}
mv new/$file{,.tar}
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2020-04-15 20:04:02
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new.2738 (New)
Package is "build-compare"
Wed Apr 15 20:04:02 2020 rev:113 rq:791952 version:20200331T115051.28bf642
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2020-02-15 22:21:28.315181636 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new.2738/build-compare.changes
2020-04-15 20:06:45.198115674 +0200
@@ -1,0 +2,5 @@
+Tue Mar 31 09:09:09 UTC 2020 - o...@aepfle.de
+
+- gtk-doc: filter version info from html files
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.k2pWUy/_old 2020-04-15 20:06:51.642120059 +0200
+++ /var/tmp/diff_new_pack.k2pWUy/_new 2020-04-15 20:06:51.646120061 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20200115T165709.b82e1e5
+Version:20200331T115051.28bf642
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.k2pWUy/_old 2020-04-15 20:06:51.702120099 +0200
+++ /var/tmp/diff_new_pack.k2pWUy/_new 2020-04-15 20:06:51.702120099 +0200
@@ -438,6 +438,20 @@
/usr/share/gtk-doc/html/*/*.devhelp2)
# various kde and gtk packages
strip_numbered_anchors
+ for f in old/$file new/$file; do
+sed -i -e '
+ /^/{
+: next
+n
+/^<\/head>/{
+b end_head
+}
+s/^//
+b next
+ }
+ : end_head
+ ' $f
+ done
;;
/usr/share/doc/packages/*/*.html|\
/usr/share/doc/packages/*/*/*.html|\
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2020-02-15 22:21:12
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new.26092 (New)
Package is "build-compare"
Sat Feb 15 22:21:12 2020 rev:112 rq:766378 version:20200115T165709.b82e1e5
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2020-01-18 12:13:38.990994714 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new.26092/build-compare.changes
2020-02-15 22:21:28.315181636 +0100
@@ -1,0 +2,6 @@
+Fri Jan 10 19:16:29 UTC 2020 - o...@aepfle.de
+
+- compare archives in separate directory to preserve existing files
+- consider only files and symlinks in verify_before_processing
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.KrGGeR/_old 2020-02-15 22:21:31.703183468 +0100
+++ /var/tmp/diff_new_pack.KrGGeR/_new 2020-02-15 22:21:31.703183468 +0100
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20200109T124459.beb05d0
+Version:20200115T165709.b82e1e5
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.KrGGeR/_old 2020-02-15 22:21:31.763183500 +0100
+++ /var/tmp/diff_new_pack.KrGGeR/_new 2020-02-15 22:21:31.763183500 +0100
@@ -43,56 +43,6 @@
watchdog_reset
}
-function findunjarbin
-{
-if [[ $(type -p fastjar) ]]; then
-UNJAR=fastjar
-elif [[ $(type -p jar) ]]; then
-UNJAR=jar
-elif [[ $(type -p unzip) ]]; then
-UNJAR=unzip
-else
-echo "ERROR: jar, fastjar, or unzip is not installed (trying file
$file)"
-exit 1
-fi
-}
-
-#usage unjar
-function unjar()
-{
-local file
-file=$1
-
-findunjarbin
-case $UNJAR in
-jar|fastjar)
-# echo jar -xf $file
-${UNJAR} -xf $file
-;;
-unzip)
-unzip -oqq $file
-;;
-esac
-}
-
-# list files in given jar file
-#usage unjar_l
-function unjar_l()
-{
-local file
-file=$1
-
-findunjarbin
-case $UNJAR in
-jar|fastjar)
-${UNJAR} -tf $file
-;;
-unzip)
-unzip -Z -1 $file
-;;
-esac
-}
-
filter_disasm()
{
[[ $nofilter ]] && return
@@ -211,6 +161,14 @@
return 1
fi
+ # consider only files and symlinks
+ if test ! -f "old/$file"; then
+return 0
+ fi
+ if test ! -f "new/$file"; then
+return 0
+ fi
+
if cmp -b "old/$file" "new/$file" > "${cmpout}" ; then
return 0
fi
@@ -633,6 +591,208 @@
esac
}
+archive_a()
+{
+ local cmd=$1
+ local file=$2
+ case "${cmd}" in
+ f)
+test -x "$(type -P ar)" && return 0
+echo "ERROR: ar missing for ${file}"
+return 1
+ ;;
+ l)
+ar t "${file}"
+test "$?" = "0" && return 0
+return 1
+ ;;
+ x)
+ar x "${file}"
+test "$?" = "0" && return 0
+return 1
+ ;;
+ esac
+}
+
+archive_cpio()
+{
+ local cmd=$1
+ local file=$2
+ case "${cmd}" in
+ f)
+test -x "$(type -P cpio)" && return 0
+echo "ERROR: cpio missing for ${file}"
+return 1
+ ;;
+ l)
+cpio --quiet --list --force-local < "${file}"
+test "$?" = "0" && return 0
+return 1
+ ;;
+ x)
+cpio --quiet --extract --force-local < "${file}"
+test "$?" = "0" && return 0
+return 1
+ ;;
+ esac
+}
+
+archive_squashfs()
+{
+ local cmd=$1
+ local file=$2
+ case "${cmd}" in
+ f)
+test -x "$(type -P unsquashfs)" && return 0
+echo "ERROR: unsquashfs missing for ${file}"
+return 1
+ ;;
+ l)
+unsquashfs -no-progress -ls -dest '' "${file}" | grep -Ev '^(Parallel
unsquashfs:|[0-9]+ inodes )'
+test "$?" = "0" && return 0
+return 1
+ ;;
+ x)
+unsquashfs -no-progress -dest "." "${file}"
+test "$?" = "0" && return 0
+return 1
+ ;;
+ esac
+}
+
+archive_tar()
+{
+ local cmd=$1
+ local file=$2
+ case "${cmd}" in
+ f)
+test -x "$(type -P tar)" && return 0
+echo "ERROR: tar missing for ${file}"
+return 1
+ ;;
+ l)
+tar tf "${file}"
+test "$?" = "0" && return 0
+return 1
+ ;;
+ x)
+tar xf "${file}"
+test "$?" = "0" && return 0
+return 1
+ ;;
+ esac
+}
+
+UNJAR=
+archive_zip()
+{
+ local cmd=$1
+ local file=$2
+ case "${cmd}" in
+ f)
+if test -x "$(type -P fastjar)"
+ then
+ UNJAR="${_}"
+elif test -x "$(type -P jar)"
+then
+ UNJAR="${_}"
+elif test -x "$(type -P unzip)"
+then
+ UNJAR="${_}"
+else
+ echo "ERROR:
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2020-01-18 12:13:33 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new.26092 (New) Package is "build-compare" Sat Jan 18 12:13:33 2020 rev:111 rq:762170 version:20200109T124459.beb05d0 Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2019-08-27 11:58:41.275673368 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new.26092/build-compare.changes 2020-01-18 12:13:38.990994714 +0100 @@ -1,0 +2,16 @@ +Tue Jan 7 13:59:43 UTC 2020 - o...@aepfle.de + +- this new decade must be handled in man pages created by docbook.xml +- use bash Process Substitution in diff_two_files +- use bash Process Substitution when processing ELF files +- move normalizing code from check_single_file into separate function +- better input verification in check_single_file +- split verification from diff_two_files into separate function +- move check for ignored files out of check_single_file +- separate helper functions from code in pkg-diff +- touch host watchdog when producing output and in loops (issue#35) +- add functions to touch host watchdog +- always run cleanup in check_compressed_file +- use EXIT handler in pkg-diff to remove tmpfiles + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.UNciAC/_old 2020-01-18 12:13:40.182995353 +0100 +++ /var/tmp/diff_new_pack.UNciAC/_new 2020-01-18 12:13:40.186995355 +0100 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:20190814T133923.4dfa207 +Version:20200109T124459.beb05d0 Release:0 Source1:COPYING Source2:same-build-result.sh ++ pkg-diff.sh ++ 1185 lines (skipped) between /work/SRC/openSUSE:Factory/build-compare/pkg-diff.sh and /work/SRC/openSUSE:Factory/.build-compare.new.26092/pkg-diff.sh
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2019-08-27 11:58:37 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new.7948 (New) Package is "build-compare" Tue Aug 27 11:58:37 2019 rev:110 rq:723342 version:20190814T133923.4dfa207 Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2019-02-24 16:55:07.364916547 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new.7948/build-compare.changes 2019-08-27 11:58:41.275673368 +0200 @@ -1,0 +2,6 @@ +Wed Aug 14 13:27:38 UTC 2019 - John Vandenberg + +- pkg-diff.sh: Ignore R build timestamp & temp paths + https://github.com/openSUSE/build-compare/pull/34 + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.dDUc6V/_old 2019-08-27 11:58:42.267673231 +0200 +++ /var/tmp/diff_new_pack.dDUc6V/_new 2019-08-27 11:58:42.271673231 +0200 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:20190219T103140.3277313 +Version:20190814T133923.4dfa207 Release:0 Source1:COPYING Source2:same-build-result.sh ++ pkg-diff.sh ++ --- /var/tmp/diff_new_pack.dDUc6V/_old 2019-08-27 11:58:42.335673221 +0200 +++ /var/tmp/diff_new_pack.dDUc6V/_new 2019-08-27 11:58:42.335673221 +0200 @@ -752,6 +752,21 @@ echo "Ignore $file" return 0 ;; +/usr/lib*/R/library/*/DESCRIPTION) + # Simulate R CMD INSTALL --built-timestamp='' + # Built: R 3.6.1; x86_64-suse-linux-gnu; 2019-08-13 04:19:49 UTC; unix + sed -i -e 's|\(Built: [^;]*; [^;]*; \)20[0-9][0-9]-[01][0-9]-[0123][0-9] [012][0-9]:[0-5][0-9]:[0-5][0-9] UTC\(; .*\)$|\1\2|' old/$file new/$file + ;; +/usr/lib*/R/library/*/Meta/package.rds) + # R binary cache of DESCRIPTION + echo "Ignore $file" + return 0 + ;; +/usr/lib*/R/library/*/R/*.rd[bx]) + # binary cache of interpreted R code + echo "Ignore $file" + return 0 + ;; */Linux*Env.Set.sh) # LibreOffice files, contains: # Generated on: Mon Apr 18 13:19:22 UTC 2011
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2019-02-24 16:55:03
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new.28833 (New)
Package is "build-compare"
Sun Feb 24 16:55:03 2019 rev:109 rq:677296 version:20190219T103140.3277313
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2018-07-07 21:52:41.787752317 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new.28833/build-compare.changes
2019-02-24 16:55:07.364916547 +0100
@@ -1,0 +2,13 @@
+Tue Feb 19 09:30:20 UTC 2019 - o...@aepfle.de
+
+- javadoc: filter dc.created
+- Support filenames with spaces
+- jar: always list files without date+size
+- Fix differing jars reported as identical
+
+---
+Tue Aug 28 20:14:53 UTC 2018 - o...@infoserver.lv
+
+- Ignore value of Release header when comparing spec files
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.yI0zDW/_old 2019-02-24 16:55:10.788914919 +0100
+++ /var/tmp/diff_new_pack.yI0zDW/_new 2019-02-24 16:55:10.792914917 +0100
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20180706T160151.66224a8
+Version:20190219T103140.3277313
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.yI0zDW/_old 2019-02-24 16:55:10.836914896 +0100
+++ /var/tmp/diff_new_pack.yI0zDW/_new 2019-02-24 16:55:10.836914896 +0100
@@ -175,6 +175,7 @@
rm $2 $3 $4 $5
return 1
fi
+ difffound=1
fi
return 0
}
@@ -265,16 +266,14 @@
set_regex
-# Check the whole spec file at first, return 0 immediately if the
+# Check the whole spec file at first, return 0 immediately if they
# are the same.
cat $rpm_meta_old | trim_release_old > $file1
cat $rpm_meta_new | trim_release_new > $file2
echo "comparing the rpm tags of $name_new"
if diff -au $file1 $file2; then
- if test -z "$check_all"; then
-rm $file1 $file2 $rpm_meta_old $rpm_meta_new
-return 0
- fi
+ rm $file1 $file2 $rpm_meta_old $rpm_meta_new
+ return 0
fi
get_value QF_TAGS $rpm_meta_old > $file1
@@ -291,6 +290,7 @@
if test -z "$check_all"; then
return 1
fi
+ difffound=1
;;
# Every other package is allowed to have a different RELEASE
*) ;;
@@ -323,7 +323,7 @@
fi
# Get only files with different MD5sums
-files=`diff -U0 $file1 $file2 | fgrep -v +++ | grep ^+ | cut -b2- | awk
'{print $1}'`
+files=`diff -U0 $file1 $file2 | fgrep -v +++ | grep ^+ | cut -b2- | sed -E
-e 's/ [0-9a-f]+ [0-9]+$//'`
if test -n "$sh"; then
echo "creating rename script"
@@ -340,6 +340,7 @@
fi
#
rm $file1 $file2
+[ "$difffound" = 1 ] && RES=1
return $RES
}
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.yI0zDW/_old 2019-02-24 16:55:10.844914892 +0100
+++ /var/tmp/diff_new_pack.yI0zDW/_new 2019-02-24 16:55:10.844914892 +0100
@@ -59,12 +59,8 @@
exit 1
fi
-#usage unjar
-function unjar()
+function findunjarbin
{
-local file
-file=$1
-
if [[ $(type -p fastjar) ]]; then
UNJAR=fastjar
elif [[ $(type -p jar) ]]; then
@@ -75,7 +71,15 @@
echo "ERROR: jar, fastjar, or unzip is not installed (trying file
$file)"
exit 1
fi
+}
+
+#usage unjar
+function unjar()
+{
+local file
+file=$1
+findunjarbin
case $UNJAR in
jar|fastjar)
# echo jar -xf $file
@@ -87,30 +91,20 @@
esac
}
-# list files in directory
+# list files in given jar file
#usage unjar_l
function unjar_l()
{
local file
file=$1
-if [[ $(type -p fastjar) ]]; then
-UNJAR=fastjar
-elif [[ $(type -p jar) ]]; then
-UNJAR=jar
-elif [[ $(type -p unzip) ]]; then
-UNJAR=unzip
-else
-echo "ERROR: jar, fastjar, or unzip is not installed (trying file
$file)"
-exit 1
-fi
-
+findunjarbin
case $UNJAR in
jar|fastjar)
${UNJAR} -tf $file
;;
unzip)
-unzip -l $file
+unzip -Z -1 $file
;;
esac
}
@@ -122,16 +116,6 @@
sed -i -e 's/^ *[0-9a-f]\+://' -e 's/\$0x[0-9a-f]\+/$something/' -e
's/callq *[0-9a-f]\+/callq /' -e 's/# *[0-9a-f]\+/# /' -e
's/\(0x\)\?[0-9a-f]\+(/offset(/' -e 's/[0-9a-f]\+
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2018-07-07 21:52:36
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is "build-compare"
Sat Jul 7 21:52:36 2018 rev:108 rq:621344 version:20180706T160151.66224a8
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2017-12-19 10:44:17.687924671 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2018-07-07 21:52:41.787752317 +0200
@@ -1,0 +2,36 @@
+Fri Jul 6 14:01:17 UTC 2018 - o...@aepfle.de
+
+- pkg-diff: fix diff returning 0
+
+---
+Wed Jul 4 05:58:13 UTC 2018 - o...@aepfle.de
+
+- Match also ELF pie executable (bsc#1097339)
+
+---
+Wed Jul 4 05:42:05 UTC 2018 - o...@aepfle.de
+
+- Remove trailing space from two match patterns
+
+---
+Tue Jun 26 06:45:38 UTC 2018 - o...@aepfle.de
+
+- Recognize "setuid ELF nn-bit xSB shared object" ELF binaries
+
+---
+Mon May 28 13:26:44 UTC 2018 - o...@aepfle.de
+
+- Avoid large temporary files from hexdump output and avoid
+ diff(1) runing OOM by using a fifo (issue#24)
+
+---
+Fri Apr 13 07:10:30 UTC 2018 - o...@aepfle.de
+
+- check rpm capabilities for recommends/suggests
+
+---
+Fri Dec 8 16:57:00 UTC 2017 - o...@infoserver.lv
+
+- Ignore /usr/lib/.build-id differences in package filelist
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.1mA2Z1/_old 2018-07-07 21:52:46.691746075 +0200
+++ /var/tmp/diff_new_pack.1mA2Z1/_new 2018-07-07 21:52:46.691746075 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20171204T112209.f06fbac
+Version:20180706T160151.66224a8
Release:0
Source1:COPYING
Source2:same-build-result.sh
@@ -30,8 +30,8 @@
Source5:srpm-check.sh
%if 0%{?suse_version}
Requires: bash
-Requires: coreutils
Requires: cpio
+Requires: coreutils
Requires: diffutils
Requires: file
Requires: gawk
++ functions.sh ++
--- /var/tmp/diff_new_pack.1mA2Z1/_old 2018-07-07 21:52:46.747746003 +0200
+++ /var/tmp/diff_new_pack.1mA2Z1/_new 2018-07-07 21:52:46.747746003 +0200
@@ -10,6 +10,12 @@
RPM="rpm -qp --nodigest --nosignature"
+set_rpm_meta_global_variables() {
+
+ local pkg=$1
+ local rpm_tags=
+ local out=`mktemp`
+
# Name, Version, Release
QF_NAME="%{NAME}"
QF_VER_REL="%{VERSION}-%{RELEASE}"
@@ -21,8 +27,19 @@
QF_PROVIDES="${QF_PROVIDES}[%{REQUIRENAME} %{REQUIREFLAGS}
%{REQUIREVERSION}\\n]\\n"
QF_PROVIDES="${QF_PROVIDES}[%{CONFLICTNAME} %{CONFLICTFLAGS}
%{CONFLICTVERSION}\\n]\\n"
QF_PROVIDES="${QF_PROVIDES}[%{OBSOLETENAME} %{OBSOLETEFLAGS}
%{OBSOLETEVERSION}\\n]\\n"
-QF_PROVIDES="${QF_PROVIDES}[%{RECOMMENDNAME} %{RECOMMENDFLAGS}
%{RECOMMENDVERSION}\\n]\\n"
-QF_PROVIDES="${QF_PROVIDES}[%{SUPPLEMENTNAME} %{SUPPLEMENTFLAGS}
%{SUPPLEMENTVERSION}\\n]\\n"
+
+rpm_tags="%{RECOMMENDNAME} %{RECOMMENDFLAGS} %{RECOMMENDVERSION}"
+check_header "%{NAME} ${rpm_tags}" > "${out}"
+if test -s "${out}"
+then
+ QF_PROVIDES="${QF_PROVIDES}[${rpm_tags}\\n]\\n"
+fi
+rpm_tags="%{SUPPLEMENTNAME} %{SUPPLEMENTFLAGS} %{SUPPLEMENTVERSION}"
+check_header "%{NAME} ${rpm_tags}" > "${out}"
+if test -s "${out}"
+then
+ QF_PROVIDES="${QF_PROVIDES}[${rpm_tags}\\n]\\n"
+fi
# don't look at RELEASE, it contains our build number
QF_TAGS="%{NAME} %{VERSION} %{EPOCH}\\n"
@@ -65,6 +82,7 @@
QF_ALL="$QF_ALL\n___QF_SCRIPT___\n${QF_SCRIPT}\n___QF_SCRIPT___\n"
QF_ALL="$QF_ALL\n___QF_FILELIST___\n${QF_FILELIST}\n___QF_FILELIST___\n"
QF_ALL="$QF_ALL\n___QF_CHECKSUM___\n${QF_CHECKSUM}\n___QF_CHECKSUM___\n"
+}
check_header()
{
@@ -83,6 +101,7 @@
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\|$version_release_old_regex_l)\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g}
s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
s/\(\/var\/adm\/update-messages\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
+
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2017-12-19 10:44:15 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is "build-compare" Tue Dec 19 10:44:15 2017 rev:107 rq:555909 version:20171204T112209.f06fbac Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2017-11-15 16:48:54.583577869 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2017-12-19 10:44:17.687924671 +0100 @@ -1,0 +2,5 @@ +Mon Dec 4 10:21:44 UTC 2017 - o...@aepfle.de + +- Treat .egg files as zip + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.4vbRbA/_old 2017-12-19 10:44:18.867867710 +0100 +++ /var/tmp/diff_new_pack.4vbRbA/_new 2017-12-19 10:44:18.867867710 +0100 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:20171108T070456.b855319 +Version:20171204T112209.f06fbac Release:0 Source1:COPYING Source2:same-build-result.sh ++ pkg-diff.sh ++ --- /var/tmp/diff_new_pack.4vbRbA/_old 2017-12-19 10:44:18.931864621 +0100 +++ /var/tmp/diff_new_pack.4vbRbA/_new 2017-12-19 10:44:18.931864621 +0100 @@ -548,7 +548,7 @@ done return $ret ;; -*.zip|*.jar|*.war) +*.zip|*.egg|*.jar|*.war) for dir in old new ; do ( cd $dir
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2017-11-15 16:48:50
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is "build-compare"
Wed Nov 15 16:48:50 2017 rev:106 rq:539772 version:20171108T070456.b855319
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2017-10-28 14:18:09.351292785 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2017-11-15 16:48:54.583577869 +0100
@@ -1,0 +2,15 @@
+Wed Nov 8 06:04:42 UTC 2017 - o...@aepfle.de
+
+- srpm check requires cpio
+
+---
+Mon Nov 6 15:15:04 UTC 2017 - o...@aepfle.de
+
+- Fix usage of cmp_spec and unrpm in srpm-check.sh
+
+---
+Fri Nov 3 14:03:04 UTC 2017 - o...@aepfle.de
+
+- Catch empty rpm -qp --qf output for tags not understood by rpm
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.KaCwjP/_old 2017-11-15 16:48:56.691500632 +0100
+++ /var/tmp/diff_new_pack.KaCwjP/_new 2017-11-15 16:48:56.691500632 +0100
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20171020T085619.7cef93b
+Version:20171108T070456.b855319
Release:0
Source1:COPYING
Source2:same-build-result.sh
@@ -31,6 +31,7 @@
%if 0%{?suse_version}
Requires: bash
Requires: coreutils
+Requires: cpio
Requires: diffutils
Requires: file
Requires: gawk
++ functions.sh ++
--- /var/tmp/diff_new_pack.KaCwjP/_old 2017-11-15 16:48:56.759498141 +0100
+++ /var/tmp/diff_new_pack.KaCwjP/_new 2017-11-15 16:48:56.759498141 +0100
@@ -146,7 +146,7 @@
# $1: printed info
# $2: file1
# $3: file2
-# $4, $5: spec_old and spec_new, for cleanup.
+# $4, $5: rpm_meta_old and rpm_meta_new, for cleanup.
function comp_file()
{
echo "comparing $1"
@@ -208,7 +208,7 @@
# 1 in case of errors or difference
# 2 in case of differences that need further investigation
# Sets $files with list of files that need further investigation
-function cmp_spec ()
+function cmp_rpm_meta ()
{
local RES
local file1 file2
@@ -219,36 +219,45 @@
file1=`mktemp`
file2=`mktemp`
-spec_old=`mktemp`
-spec_new=`mktemp`
+rpm_meta_old=`mktemp`
+rpm_meta_new=`mktemp`
-check_header "$QF_ALL" $oldrpm > $spec_old
-check_header "$QF_ALL" $newrpm > $spec_new
+check_header "$QF_ALL" $oldrpm > $rpm_meta_old
+check_header "$QF_ALL" $newrpm > $rpm_meta_new
-name_new="$(get_value QF_NAME $spec_new)"
-version_release_new="$(get_value QF_VER_REL $spec_new)"
-name_ver_rel_new="$(get_value QF_NAME_VER_REL $spec_new)"
+# rpm returns 0 even in case of error
+if test -s $rpm_meta_old && test -s $rpm_meta_new ; then
+ : some output provided, all query tags understood by rpm
+else
+ ls -l $rpm_meta_old $rpm_meta_new
+ echo "empty 'rpm -qp' output..."
+ return 1
+fi
+
+name_new="$(get_value QF_NAME $rpm_meta_new)"
+version_release_new="$(get_value QF_VER_REL $rpm_meta_new)"
+name_ver_rel_new="$(get_value QF_NAME_VER_REL $rpm_meta_new)"
-version_release_old="$(get_value QF_VER_REL $spec_old)"
-name_ver_rel_old="$(get_value QF_NAME_VER_REL $spec_old)"
+version_release_old="$(get_value QF_VER_REL $rpm_meta_old)"
+name_ver_rel_old="$(get_value QF_NAME_VER_REL $rpm_meta_old)"
set_regex
# Check the whole spec file at first, return 0 immediately if the
# are the same.
-cat $spec_old | trim_release_old > $file1
-cat $spec_new | trim_release_new > $file2
+cat $rpm_meta_old | trim_release_old > $file1
+cat $rpm_meta_new | trim_release_new > $file2
echo "comparing the rpm tags of $name_new"
if diff -au $file1 $file2; then
if test -z "$check_all"; then
-rm $file1 $file2 $spec_old $spec_new
+rm $file1 $file2 $rpm_meta_old $rpm_meta_new
return 0
fi
fi
-get_value QF_TAGS $spec_old > $file1
-get_value QF_TAGS $spec_new > $file2
-comp_file rpmtags $file1 $file2 $spec_old $spec_new || return 1
+get_value QF_TAGS $rpm_meta_old > $file1
+get_value QF_TAGS $rpm_meta_new > $file2
+comp_file rpmtags $file1 $file2 $rpm_meta_old $rpm_meta_new || return 1
# This might happen when?!
echo "comparing RELEASE"
@@ -266,24 +275,24 @@
esac
fi
-
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2017-10-28 14:18:06 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is "build-compare" Sat Oct 28 14:18:06 2017 rev:105 rq:535371 version:20171020T085619.7cef93b Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2017-08-08 11:56:39.569827069 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2017-10-28 14:18:09.351292785 +0200 @@ -1,0 +2,9 @@ +Fri Oct 20 06:53:18 UTC 2017 - o...@aepfle.de + +- Remove newly introduced files-duplicate check from rpmlint + In case files are hardlinked, the source and destination is + scrambled in rpm output: the pkg will be republished. + In case files are not hardlinked, the source and destination + is scrambled in rpmlint output: the pkg will be republished + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.HUBvWC/_old 2017-10-28 14:18:11.099228870 +0200 +++ /var/tmp/diff_new_pack.HUBvWC/_new 2017-10-28 14:18:11.099228870 +0200 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:20170727T140623.5b2169e +Version:20171020T085619.7cef93b Release:0 Source1:COPYING Source2:same-build-result.sh ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.HUBvWC/_old 2017-10-28 14:18:11.179225944 +0200 +++ /var/tmp/diff_new_pack.HUBvWC/_new 2017-10-28 14:18:11.183225798 +0200 @@ -140,11 +140,13 @@ # Remove release from files sort -u $OLDDIR/rpmlint.log|sed -e "s,$ver_rel1,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file1 sort -u $OTHERDIR/rpmlint.log|sed -e "s,$ver_rel2,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file2 +# Remove odd warning about not-hardlinked files # Remove odd warning about data and time, it comes and goes # Remove warning about python mtime mismatch, a republish will not help # Remove odd warning about filenames, they contain VERSION-RELEASE # Remove durations from progress reports sed -i -e " +/: W: files-duplicate /d /: W: file-contains-date-and-time /d /: W: python-bytecode-inconsistent-mtime /d /: W: filename-too-long-for-joliet /d
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2017-08-08 11:56:38
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is "build-compare"
Tue Aug 8 11:56:38 2017 rev:104 rq:514218 version:20170727T140623.5b2169e
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2017-04-12 17:10:11.458437601 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2017-08-08 11:56:39.569827069 +0200
@@ -1,0 +2,5 @@
+Thu Jul 27 12:05:25 UTC 2017 - o...@aepfle.de
+
+- Compare also supplements and recomments (issue#18)
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.qlQNNR/_old 2017-08-08 11:56:40.357716101 +0200
+++ /var/tmp/diff_new_pack.qlQNNR/_new 2017-08-08 11:56:40.361715538 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20170331T154431.96db83e
+Version:20170727T140623.5b2169e
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.qlQNNR/_old 2017-08-08 11:56:40.497696387 +0200
+++ /var/tmp/diff_new_pack.qlQNNR/_new 2017-08-08 11:56:40.497696387 +0200
@@ -21,6 +21,8 @@
QF_PROVIDES="${QF_PROVIDES}[%{REQUIRENAME} %{REQUIREFLAGS}
%{REQUIREVERSION}\\n]\\n"
QF_PROVIDES="${QF_PROVIDES}[%{CONFLICTNAME} %{CONFLICTFLAGS}
%{CONFLICTVERSION}\\n]\\n"
QF_PROVIDES="${QF_PROVIDES}[%{OBSOLETENAME} %{OBSOLETEFLAGS}
%{OBSOLETEVERSION}\\n]\\n"
+QF_PROVIDES="${QF_PROVIDES}[%{RECOMMENDNAME} %{RECOMMENDFLAGS}
%{RECOMMENDVERSION}\\n]\\n"
+QF_PROVIDES="${QF_PROVIDES}[%{SUPPLEMENTNAME} %{SUPPLEMENTFLAGS}
%{SUPPLEMENTVERSION}\\n]\\n"
# don't look at RELEASE, it contains our build number
QF_TAGS="%{NAME} %{VERSION} %{EPOCH}\\n"
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.qlQNNR/_old 2017-08-08 11:56:40.545689627 +0200
+++ /var/tmp/diff_new_pack.qlQNNR/_new 2017-08-08 11:56:40.553688500 +0200
@@ -7,6 +7,10 @@
# Enhanced by Andreas Jaeger
FUNCTIONS=${0%/*}/functions.sh
+: ${buildcompare_head:="head -n 200"}
+nofilter=${buildcompare_nofilter}
+sort=sort
+[[ $nofilter ]] && sort=cat
check_all=
case $1 in
@@ -114,9 +118,107 @@
filter_disasm()
{
local file=$1
+ [[ $nofilter ]] && return
sed -i -e 's/^ *[0-9a-f]\+://' -e 's/\$0x[0-9a-f]\+/$something/' -e
's/callq *[0-9a-f]\+/callq /' -e 's/# *[0-9a-f]\+/# /' -e
's/\(0x\)\?[0-9a-f]\+(/offset(/' -e 's/[0-9a-f]\+ :/\1:/'
-e 's/<\(.*\)+0x[0-9a-f]\+>/<\1 + ofs>/' ${file}
}
+filter_zip_flist()
+{
+ local file=$1
+ [[ $nofilter ]] && return
+ # 10-05-2010 14:39
+ sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ,"
$file
+ # 2012-02-03 07:59
+ sed -i -e "s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] ,
date ," $file
+}
+
+filter_xenefi() {
+ # PE32+ executable (EFI application) x86-64 (stripped to external PDB), for
MS Windows
+ perl -e "open fh, '+<', '$f'; seek fh, 0x80 + 0x08, SEEK_SET; print fh
'time'; seek fh, 0x80 + 0x58, SEEK_SET; print fh 'chck';"
+}
+
+filter_pyc() {
+ perl -e "open fh, '+<', '$f'; seek fh, 4, SEEK_SET; print fh '';"
+}
+
+filter_dvi() {
+ # Opcodes 247: pre; i[1], num[4], den[4], mag[4], k[1], x[k]
+ perl -e "
+ my \$rec;
+ open fh, '+<', '$f';
+ my \$dummy = read fh, \$rec, 15;
+ (\$pre, \$i, \$num, \$den, \$mag, \$k) = unpack('C2 N3 C', \$rec);
+ seek fh, 15, SEEK_SET;
+ while (\$k > 0) {
+ print fh '0';
+ \$k--;
+ }
+ "
+}
+
+filter_png() {
+ convert "$f" +set date:create +set date:modify "${f}.$PPID.$$"
+ mv -f "${f}.$PPID.$$" "${f}"
+}
+
+filter_emacs_lisp() {
+ sed -i -e '
+s|^;;; .ompiled by abuild@.* on ... ... .. ..:..:.. |;;; compiled by
abuild@buildhost on Wed Jul 01 00:00:00 2009|
+s|^;;; from file .*\.el|;;; from file
/home/abuild/rpmbuild/BUILD/anthy-9100h/src-util/elc.8411/anthy-azik.el|
+s|^;;; emacs version .*|;;; emacs version 21.5 (beta34) "kale" XEmacs
Lucid.|
+s|^;;; bytecomp version .*|;;; bytecomp version 2.28 XEmacs; 2009-08-09.|
+' "$f"
+}
+
+filter_pdf() {
+ # PDF files contain a unique ID, remove it
+ # Format of the ID is:
+ # /ID [<9ACE247A70CF9BEAFEE15E116259BD6D>
<9ACE247A70CF9BEAFEE15E116259BD6D>]
+ # with optional spaces. pdftex creates also:
+ # /CreationDate (D:20120103083206Z)
+ # /ModDate (D:20120103083206Z)
+ # and possibly XML metadata as well
+ sed -i \
+'/obj/,/endobj/{
+ s%/ID \?\[
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2017-04-12 17:10:09 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is "build-compare" Wed Apr 12 17:10:09 2017 rev:103 rq:486461 version:20170331T154431.96db83e Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2017-03-05 17:46:57.744539745 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2017-04-12 17:10:11.458437601 +0200 @@ -1,0 +2,15 @@ +Fri Mar 31 13:44:11 UTC 2017 - o...@aepfle.de + +- Handle timestamp and checksum in xen.efi + +--- +Wed Mar 22 19:05:36 UTC 2017 - o...@aepfle.de + +- Handle _kf5_htmldir, it HAD to be different... + +--- +Tue Mar 21 11:17:26 UTC 2017 - o...@aepfle.de + +- Handle /usr/share/vdr/locale/ + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.0BmcH5/_old 2017-04-12 17:10:12.950226422 +0200 +++ /var/tmp/diff_new_pack.0BmcH5/_new 2017-04-12 17:10:12.950226422 +0200 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:20170212T094342.98f72fb +Version:20170331T154431.96db83e Release:0 Source1:COPYING Source2:same-build-result.sh ++ pkg-diff.sh ++ --- /var/tmp/diff_new_pack.0BmcH5/_old 2017-04-12 17:10:13.042213401 +0200 +++ /var/tmp/diff_new_pack.0BmcH5/_new 2017-04-12 17:10:13.042213401 +0200 @@ -478,6 +478,11 @@ fi done return $ret;; + */xen*.efi) +# PE32+ executable (EFI application) x86-64 (stripped to external PDB), for MS Windows +perl -e "open fh, '+<', 'old/$file'; seek fh, 0x80 + 0x08, SEEK_SET; print fh 'time'; seek fh, 0x80 + 0x58, SEEK_SET; print fh 'chck';" +perl -e "open fh, '+<', 'new/$file'; seek fh, 0x80 + 0x08, SEEK_SET; print fh 'time'; seek fh, 0x80 + 0x58, SEEK_SET; print fh 'chck';" +;; *.pyc|*.pyo) perl -e "open fh, '+<', 'old/$file'; seek fh, 4, SEEK_SET; print fh '';" perl -e "open fh, '+<', 'new/$file'; seek fh, 4, SEEK_SET; print fh '';" @@ -536,7 +541,7 @@ return 0 fi ;; - /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo) + /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo|/usr/share/vdr/locale/*/LC_MESSAGES/*.mo) for f in old/$file new/$file; do sed -i -e "s,POT-Creation-Date: -..-.. ..:..+,POT-Creation-Date: 1970-01-01 00:00+," $f done @@ -549,6 +554,7 @@ done strip_numbered_anchors ;; + /usr/share/doc/HTML/*/*/index.cache|/usr/share/doc//HTML/*/*/*/index.cache|\ /usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache|\ /usr/share/gtk-doc/html/*/*.html|/usr/share/gtk-doc/html/*/*.devhelp2) # various kde and gtk packages
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2017-03-05 17:46:54
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is "build-compare"
Sun Mar 5 17:46:54 2017 rev:102 rq:456496 version:20170212T094342.98f72fb
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2016-12-29 22:41:51.409537542 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2017-03-05 17:46:57.744539745 +0100
@@ -1,0 +2,10 @@
+Sun Feb 12 08:41:01 UTC 2017 - o...@aepfle.de
+
+- Remove warning file-contains-date-and-time from rpmlint.log
+
+---
+Thu Jan 5 11:01:53 UTC 2017 - o...@aepfle.de
+
+- Fix name-version-release regex for release without dots
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.qozQGz/_old 2017-03-05 17:47:00.200192185 +0100
+++ /var/tmp/diff_new_pack.qozQGz/_new 2017-03-05 17:47:00.204191619 +0100
@@ -1,7 +1,7 @@
#
# spec file for package build-compare
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20161214T095953.e1115b2
+Version:20170212T094342.98f72fb
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.qozQGz/_old 2017-03-05 17:47:00.268182561 +0100
+++ /var/tmp/diff_new_pack.qozQGz/_new 2017-03-05 17:47:00.268182561 +0100
@@ -168,17 +168,36 @@
# Set version_release_old_regex_s, version_release_old_regex_l and
# name_ver_rel_old_regex_l, also the new ones.
function set_regex() {
-# Remember to quote the . which is in release
-# Short version without B_CNT
+ local rel_old=${version_release_old##*-}
+ local rel_new=${version_release_new##*-}
+
+ # Short version without B_CNT
+ # release may not contain a dot
+ case "${rel_old}" in
+*.*)
version_release_old_regex_s=${version_release_old%.*}
-version_release_old_regex_s=${version_release_old_regex_s//./\\.}
+;;
+*)
+version_release_old_regex_s=${version_release_old}
+;;
+ esac
+ # Remember to quote the . which is in release
+ version_release_old_regex_s=${version_release_old_regex_s//./\\.}
+ # Long version with B_CNT
+ version_release_old_regex_l=${version_release_old//./\\.}
+ name_ver_rel_old_regex_l=${name_ver_rel_old//./\\.}
+
+ case "${rel_new}" in
+*.*)
version_release_new_regex_s=${version_release_new%.*}
-version_release_new_regex_s=${version_release_new_regex_s//./\\.}
-# Long version with B_CNT
-version_release_old_regex_l=${version_release_old//./\\.}
-version_release_new_regex_l=${version_release_new//./\\.}
-name_ver_rel_old_regex_l=${name_ver_rel_old//./\\.}
-name_ver_rel_new_regex_l=${name_ver_rel_new//./\\.}
+;;
+*)
+version_release_new_regex_s=${version_release_new}
+;;
+ esac
+ version_release_new_regex_s=${version_release_new_regex_s//./\\.}
+ version_release_new_regex_l=${version_release_new//./\\.}
+ name_ver_rel_new_regex_l=${name_ver_rel_new//./\\.}
}
# Compare just the rpm meta data of two rpms
++ same-build-result.sh ++
--- /var/tmp/diff_new_pack.qozQGz/_old 2017-03-05 17:47:00.300178033 +0100
+++ /var/tmp/diff_new_pack.qozQGz/_new 2017-03-05 17:47:00.300178033 +0100
@@ -140,10 +140,12 @@
# Remove release from files
sort -u $OLDDIR/rpmlint.log|sed -e "s,$ver_rel1,@VERSION@-@RELEASE@,g" -e
"s|/tmp/rpmlint\..*spec|.spec|g" > $file1
sort -u $OTHERDIR/rpmlint.log|sed -e "s,$ver_rel2,@VERSION@-@RELEASE@,g"
-e "s|/tmp/rpmlint\..*spec|.spec|g" > $file2
+# Remove odd warning about data and time, it comes and goes
# Remove warning about python mtime mismatch, a republish will not help
# Remove odd warning about filenames, they contain VERSION-RELEASE
# Remove durations from progress reports
sed -i -e "
+/: W: file-contains-date-and-time /d
/: W: python-bytecode-inconsistent-mtime /d
/: W: filename-too-long-for-joliet /d
/: I: \(filelist-initialization\|check-completed\) /s| [0-9]\+\.[0-9] s|
x.x s|
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2016-11-19 12:48:41 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is "build-compare" Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2016-10-20 23:04:40.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2016-11-19 12:48:42.0 +0100 @@ -1,0 +2,17 @@ +Wed Nov 9 06:48:22 UTC 2016 - o...@aepfle.de + +- Ignore /etc/ld.so.cache +- Ignore /etc/machine-id + +--- +Tue Nov 8 08:06:30 UTC 2016 - o...@aepfle.de + +- Ignore /etc/hosts +- Handle every path matching /share/man/ as man page + +--- +Mon Nov 7 03:54:00 UTC 2016 - o...@infoserver.lv + +- Ignore .gnu_debugdata section when comparing ELF files. + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.5YB4BU/_old 2016-11-19 12:48:43.0 +0100 +++ /var/tmp/diff_new_pack.5YB4BU/_new 2016-11-19 12:48:43.0 +0100 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:20161012T163739.10c9ac7 +Version:20161109T075305.eed6e97 Release:0 Source1:COPYING Source2:same-build-result.sh ++ pkg-diff.sh ++ --- /var/tmp/diff_new_pack.5YB4BU/_old 2016-11-19 12:48:43.0 +0100 +++ /var/tmp/diff_new_pack.5YB4BU/_new 2016-11-19 12:48:43.0 +0100 @@ -636,7 +636,7 @@ trim_man_first_line $f done ;; - /usr/share/man/*/man*|/usr/share/man/man*|/usr/lib/texmf/doc/man/*/*) + */share/man/*|/usr/lib/texmf/doc/man/*/*) for f in old/$file new/$file; do trim_man_TH $f @@ -735,6 +735,15 @@ sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "old/$file" sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "new/$file" ;; + */ld.so.cache|*/etc/machine-id) +# packaged by libguestfs +return 0 + ;; + */etc/hosts) +# packaged by libguestfs +sed -i 's/^127.0.0.1[[:blank:]].*/127.0.0.1 hst/' "old/$file" +sed -i 's/^127.0.0.1[[:blank:]].*/127.0.0.1 hst/' "new/$file" + ;; esac ftype=`/usr/bin/file old/$file | sed -e 's@^[^:]\+:[[:blank:]]*@@' -e 's@[[:blank:]]*$@@'` @@ -777,8 +786,8 @@ fi echo "" >$file1 echo "" >$file2 - # Don't compare .build-id and .gnu_debuglink sections - sections="$($OBJDUMP -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr "\n" " ")" + # Don't compare .build-id, .gnu_debuglink and .gnu_debugdata sections + sections="$($OBJDUMP -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" -e "\.gnu_debugdata" | tr "\n" " ")" for section in $sections; do $OBJDUMP -s -j $section old/$file | sed "s,^old/,," > $file1 $OBJDUMP -s -j $section new/$file | sed "s,^new/,," > $file2 @@ -789,7 +798,7 @@ fi done if test -z "$elfdiff"; then - echo "$file: only difference was in build-id or gnu_debuglink, GOOD." + echo "$file: only difference was in build-id, gnu_debuglink or gnu_debugdata, GOOD." return 0 fi return 1
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2016-10-20 23:04:40
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is "build-compare"
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2016-09-30 15:12:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2016-10-20 23:04:40.0 +0200
@@ -1,0 +2,6 @@
+Wed Oct 12 16:40:24 CEST 2016 - r...@suse.de
+
+- pkg-diff.sh: use option --speed-large-files for diffing
+ disassembler output (bsc#1003528)
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.UPkcVJ/_old 2016-10-20 23:04:41.0 +0200
+++ /var/tmp/diff_new_pack.UPkcVJ/_new 2016-10-20 23:04:41.0 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20160921T091855.efc253f
+Version:20161012T163739.10c9ac7
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.UPkcVJ/_old 2016-10-20 23:04:41.0 +0200
+++ /var/tmp/diff_new_pack.UPkcVJ/_new 2016-10-20 23:04:41.0 +0200
@@ -746,7 +746,7 @@
monodis new/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'>
${file2}
if ! cmp -s ${file1} ${file2}; then
echo "$file differs ($ftype)"
- diff -u ${file1} ${file2}
+ diff --speed-large-files -u ${file1} ${file2}
return 1
fi
else
@@ -770,7 +770,7 @@
sed -i -e "s,old/,," $file1
sed -i -e "s,new/,," $file2
elfdiff=
- if ! diff -u $file1 $file2 > $dfile; then
+ if ! diff --speed-large-files -u $file1 $file2 > $dfile; then
echo "$file differs in assembler output"
head -n 200 $dfile
elfdiff="1"
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2016-09-30 15:12:21 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is "build-compare" Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2016-09-05 21:10:39.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2016-09-30 15:12:22.0 +0200 @@ -1,0 +2,5 @@ +Wed Sep 21 07:18:37 UTC 2016 - o...@aepfle.de + +- Handle broken symlinks + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.w5H1Es/_old 2016-09-30 15:12:23.0 +0200 +++ /var/tmp/diff_new_pack.w5H1Es/_new 2016-09-30 15:12:23.0 +0200 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:20160825T182753.c18eb00 +Version:20160921T091855.efc253f Release:0 Source1:COPYING Source2:same-build-result.sh ++ pkg-diff.sh ++ --- /var/tmp/diff_new_pack.w5H1Es/_old 2016-09-30 15:12:23.0 +0200 +++ /var/tmp/diff_new_pack.w5H1Es/_new 2016-09-30 15:12:23.0 +0200 @@ -842,7 +842,7 @@ return 1 fi ;; - symbolic\ link\ to\ *) + broken\ symbolic\ link\ to\ *|symbolic\ link\ to\ *) readlink "old/$file" > $file1 readlink "new/$file" > $file2 if ! diff -u $file1 $file2; then
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2016-09-05 21:10:38
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is "build-compare"
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2016-08-25 09:49:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2016-09-05 21:10:39.0 +0200
@@ -1,0 +2,15 @@
+Thu Aug 25 14:27:34 UTC 2016 - o...@aepfle.de
+
+- Update strip_numbered_anchors to catch more random identifiers
+
+---
+Wed Aug 24 13:22:12 UTC 2016 - liezhi.y...@windriver.com
+
+- functions.sh: improve deb and ipk checking
+- Add support for deb and ipk packaging
+- pkg-diff.sh: check for fifo (named fifo)
+- pkg-diff.sh: remove space in the end for ftype
+- pkg-diff.sh: check_single_file(): return at once when same
+- functions.sh: run rpm once to make it faster
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.JKfP0P/_old 2016-09-05 21:10:40.0 +0200
+++ /var/tmp/diff_new_pack.JKfP0P/_new 2016-09-05 21:10:40.0 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20160805T154520.57bb571
+Version:20160825T182753.c18eb00
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.JKfP0P/_old 2016-09-05 21:10:40.0 +0200
+++ /var/tmp/diff_new_pack.JKfP0P/_new 2016-09-05 21:10:40.0 +0200
@@ -10,9 +10,63 @@
RPM="rpm -qp --nodigest --nosignature"
-check_header()
+# Name, Version, Release
+QF_NAME="%{NAME}"
+QF_VER_REL="%{VERSION}-%{RELEASE}"
+QF_NAME_VER_REL="%{NAME}-%{VERSION}-%{RELEASE}"
+
+# provides destroy this because at least the self-provide includes the
+# -buildnumber :-(
+QF_PROVIDES="[%{PROVIDENAME} %{PROVIDEFLAGS} %{PROVIDEVERSION}\\n]\\n"
+QF_PROVIDES="${QF_PROVIDES}[%{REQUIRENAME} %{REQUIREFLAGS}
%{REQUIREVERSION}\\n]\\n"
+QF_PROVIDES="${QF_PROVIDES}[%{CONFLICTNAME} %{CONFLICTFLAGS}
%{CONFLICTVERSION}\\n]\\n"
+QF_PROVIDES="${QF_PROVIDES}[%{OBSOLETENAME} %{OBSOLETEFLAGS}
%{OBSOLETEVERSION}\\n]\\n"
+
+# don't look at RELEASE, it contains our build number
+QF_TAGS="%{NAME} %{VERSION} %{EPOCH}\\n"
+QF_TAGS="${QF_TAGS}%{SUMMARY}\\n%{DESCRIPTION}\\n"
+# the DISTURL tag can be used as checkin ID
+QF_TAGS="${QF_TAGS}%{VENDOR} %{DISTRIBUTION} %{DISTURL}\\n"
+QF_TAGS="${QF_TAGS}%{LICENSE}\\n"
+QF_TAGS="${QF_TAGS}%{GROUP} %{URL} %{EXCLUDEARCH} %{EXCLUDEOS}
%{EXCLUSIVEARCH}\\n"
+QF_TAGS="${QF_TAGS}%{EXCLUSIVEOS} %{RPMVERSION} %{PLATFORM}\\n"
+QF_TAGS="${QF_TAGS}%{PAYLOADFORMAT} %{PAYLOADCOMPRESSOR} %{PAYLOADFLAGS}\\n"
+
+# XXX We also need to check the existence (but not the content (!))
+# of SIGGPG (and perhaps the other SIG*)
+# XXX We don't look at triggers
+QF_TAGS="${QF_TAGS}[%{VERIFYSCRIPTPROG} %{VERIFYSCRIPT}]\\n"
+# Only the first ChangeLog entry; should be enough
+QF_TAGS="${QF_TAGS}%{CHANGELOGTIME} %{CHANGELOGNAME} %{CHANGELOGTEXT}\\n"
+
+# scripts, might contain release number
+QF_SCRIPT="[%{PREINPROG} %{PREIN}\\n]\\n[%{POSTINPROG}
%{POSTIN}\\n]\\n[%{PREUNPROG} %{PREUN}\\n]\\n[%{POSTUNPROG} %{POSTUN}\\n]\\n"
+
+# Now the files. We leave out mtime and size. For normal files
+# the size will influence the MD5 anyway. For directories the sizes can
+# differ, depending on which file system the package was built. To not
+# have to filter out directories we simply ignore all sizes.
+# Also leave out FILEDEVICES, FILEINODES (depends on the build host),
+# FILECOLORS, FILECLASS (normally useful but file output contains mtimes),
+# FILEDEPENDSX and FILEDEPENDSN.
+# Also FILELANGS (or?)
+QF_FILELIST="[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILEMODES:octal}
%{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS} %{FILEVERIFYFLAGS}
%{FILELINKTOS}\n]\\n"
+# ??? what to do with FILEPROVIDE and FILEREQUIRE?
+
+QF_CHECKSUM="[%{FILENAMES} %{FILEMD5S} %{FILEFLAGS}\n]\\n"
+
+QF_ALL="\n___QF_NAME___\n${QF_NAME}\n___QF_NAME___\n"
+QF_ALL="$QF_ALL\n___QF_TAGS___\n${QF_TAGS}\n___QF_TAGS___\n"
+QF_ALL="$QF_ALL\n___QF_VER_REL___\n${QF_VER_REL}\n___QF_VER_REL___\n"
+QF_ALL="$QF_ALL\n___QF_NAME_VER_REL___\n${QF_NAME_VER_REL}\n___QF_NAME_VER_REL___\n"
+QF_ALL="$QF_ALL\n___QF_PROVIDES___\n${QF_PROVIDES}\n___QF_PROVIDES___\n"
+QF_ALL="$QF_ALL\n___QF_SCRIPT___\n${QF_SCRIPT}\n___QF_SCRIPT___\n"
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2016-08-25 09:49:06
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is "build-compare"
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2016-04-17 22:15:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2016-08-25 09:49:08.0 +0200
@@ -1,0 +2,5 @@
+Fri Aug 5 13:44:51 UTC 2016 - o...@aepfle.de
+
+- Handle unknown ELF files as different.
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.eRpn1s/_old 2016-08-25 09:49:09.0 +0200
+++ /var/tmp/diff_new_pack.eRpn1s/_new 2016-08-25 09:49:09.0 +0200
@@ -16,14 +16,12 @@
#
-%define version_unconverted 20160406T155640.b74db7f
-
Name: build-compare
Summary:Build Result Compare Script
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20160406T155640.b74db7f
+Version:20160805T154520.57bb571
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.eRpn1s/_old 2016-08-25 09:49:09.0 +0200
+++ /var/tmp/diff_new_pack.eRpn1s/_new 2016-08-25 09:49:09.0 +0200
@@ -20,6 +20,8 @@
exit 1
fi
+test -z $OBJDUMP && OBJDUMP=objdump
+
# Always clean up on exit
local_tmpdir=`mktemp -d`
if test -z "${local_tmpdir}"
@@ -111,7 +113,8 @@
filter_disasm()
{
- sed -e 's/^ *[0-9a-f]\+://' -e 's/\$0x[0-9a-f]\+/$something/' -e 's/callq
*[0-9a-f]\+/callq /' -e 's/# *[0-9a-f]\+/# /' -e
's/\(0x\)\?[0-9a-f]\+(/offset(/' -e 's/[0-9a-f]\+ :/\1:/'
-e 's/<\(.*\)+0x[0-9a-f]\+>/<\1 + ofs>/'
+ local file=$1
+ sed -i -e 's/^ *[0-9a-f]\+://' -e 's/\$0x[0-9a-f]\+/$something/' -e
's/callq *[0-9a-f]\+/callq /' -e 's/# *[0-9a-f]\+/# /' -e
's/\(0x\)\?[0-9a-f]\+(/offset(/' -e 's/[0-9a-f]\+ :/\1:/'
-e 's/<\(.*\)+0x[0-9a-f]\+>/<\1 + ofs>/' ${file}
}
echo "Comparing `basename $oldpkg` to `basename $newpkg`"
@@ -715,18 +718,21 @@
fi
;;
ELF*executable*|ELF*[LM]SB\ relocatable*|ELF*[LM]SB\ shared\ object*)
- objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1
- if ! test -s $file1; then
+ $OBJDUMP -d --no-show-raw-insn old/$file > $file1
+ ret=$?
+ $OBJDUMP -d --no-show-raw-insn new/$file > $file2
+ if test ${ret}$? != 00 ; then
# objdump has no idea how to handle it
if ! diff_two_files; then
- ret=1
- break
+ return 1
fi
- fi
- elfdiff=
+ return 0
+ fi
+ filter_disasm $file1
+ filter_disasm $file2
sed -i -e "s,old/,," $file1
- objdump -d --no-show-raw-insn new/$file | filter_disasm > $file2
sed -i -e "s,new/,," $file2
+ elfdiff=
if ! diff -u $file1 $file2 > $dfile; then
echo "$file differs in assembler output"
head -n 200 $dfile
@@ -735,10 +741,10 @@
echo "" >$file1
echo "" >$file2
# Don't compare .build-id and .gnu_debuglink sections
- sections="$(objdump -s new/$file | grep "Contents of section .*:" | sed
-r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr "\n" "
")"
+ sections="$($OBJDUMP -s new/$file | grep "Contents of section .*:" |
sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr
"\n" " ")"
for section in $sections; do
- objdump -s -j $section old/$file | sed "s,^old/,," > $file1
- objdump -s -j $section new/$file | sed "s,^new/,," > $file2
+ $OBJDUMP -s -j $section old/$file | sed "s,^old/,," > $file1
+ $OBJDUMP -s -j $section new/$file | sed "s,^new/,," > $file2
if ! diff -u $file1 $file2 > $dfile; then
echo "$file differs in ELF section $section"
head -n 200 $dfile
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2016-04-17 22:14:59
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is "build-compare"
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2016-03-21 12:44:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2016-04-17 22:15:00.0 +0200
@@ -1,0 +2,5 @@
+Wed Apr 6 07:06:58 UTC 2016 - o...@aepfle.de
+
+- add used utilities to Requires
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.eXGv4k/_old 2016-04-17 22:15:01.0 +0200
+++ /var/tmp/diff_new_pack.eXGv4k/_new 2016-04-17 22:15:01.0 +0200
@@ -16,18 +16,30 @@
#
+%define version_unconverted 20160406T155640.b74db7f
+
Name: build-compare
Summary:Build Result Compare Script
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20160308T194108.4a952dd
+Version:20160406T155640.b74db7f
Release:0
Source1:COPYING
Source2:same-build-result.sh
Source3:pkg-diff.sh
Source4:functions.sh
Source5:srpm-check.sh
+%if 0%{?suse_version}
+Requires: bash
+Requires: coreutils
+Requires: diffutils
+Requires: file
+Requires: gawk
+Requires: grep
+Requires: rpm
+Requires: sed
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
#!BuildIgnore: build-compare
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2016-03-21 12:44:14
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is "build-compare"
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2016-01-16 11:55:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2016-03-21 12:44:16.0 +0100
@@ -1,0 +2,35 @@
+Tue Mar 8 18:00:40 UTC 2016 - o...@aepfle.de
+
+- Remove hacks from /var/adm/update-scripts|messages case
+
+---
+Tue Mar 8 16:48:48 UTC 2016 - o...@aepfle.de
+
+- Handle /var/adm/update-messages in scripts and filelist
+
+---
+Mon Mar 7 11:56:28 UTC 2016 - o...@aepfle.de
+
+- Whitespace in javadoc case
+- Whitespace changes in html case
+- Move case kde/gtk html up in the case list
+- Move case rdoc html up in the case list
+- Add option -a to same-build-result.sh and loop through all rpms
+- Rework sorting of rpm files in same-build-result.sh
+- Better diagnostic if number of subpackages changes
+- Create tmpfiles earlier in same-build-result.sh
+- Handle all javadoc html files
+
+---
+Fri Mar 4 18:50:32 UTC 2016 - o...@aepfle.de
+
+- Handle yet another variant of elc timestamps
+
+---
+Thu Mar 3 12:44:04 UTC 2016 - o...@aepfle.de
+
+- Handle timestamp in dvi files
+- Handle Last-modified HTML META tag
+- Handle yet another variant of javadoc timestamps
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.ZqZ2iY/_old 2016-03-21 12:44:17.0 +0100
+++ /var/tmp/diff_new_pack.ZqZ2iY/_new 2016-03-21 12:44:17.0 +0100
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:20160104T085658.0b929c8
+Version:20160308T194108.4a952dd
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.ZqZ2iY/_old 2016-03-21 12:44:17.0 +0100
+++ /var/tmp/diff_new_pack.ZqZ2iY/_new 2016-03-21 12:44:17.0 +0100
@@ -26,6 +26,7 @@
sed -e "
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g}
s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
+
s/\(\/var\/adm\/update-messages\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
"
}
function trim_release_new()
@@ -33,16 +34,17 @@
sed -e "
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g}
s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
+
s/\(\/var\/adm\/update-messages\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
"
}
# Get single directory or filename with long or short release string
function grep_release_old()
{
- grep -E
"(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]*(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))"
+ grep -E
"(/boot|/lib/modules|/lib/firmware|/usr/src|/var/adm/update-scripts)/[^/]*(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))"
}
function grep_release_new()
{
- grep -E
"(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]*(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))"
+ grep -E
"(/boot|/lib/modules|/lib/firmware|/usr/src|/var/adm/update-scripts)/[^/]*(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))"
}
function check_provides()
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.ZqZ2iY/_old 2016-03-21 12:44:17.0 +0100
+++ /var/tmp/diff_new_pack.ZqZ2iY/_new 2016-03-21 12:44:17.0 +0100
@@ -440,6 +440,31 @@
perl -e "open fh, '+<', 'old/$file'; seek fh, 4, SEEK_SET; print fh
'';"
perl -e "open fh, '+<', 'new/$file'; seek fh, 4, SEEK_SET; print fh
'';"
;;
+ *.dvi)
+ # Opcodes 247: pre; i[1], num[4], den[4],
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2016-01-16 11:55:35 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is "build-compare" Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2015-11-02 12:54:07.0 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2016-01-16 11:55:37.0 +0100 @@ -1,0 +2,5 @@ +Fri Jan 1 10:11:14 UTC 2016 - sch...@suse.de + +- Fix quoting in find expression + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.p3fTTc/_old 2016-01-16 11:55:38.0 +0100 +++ /var/tmp/diff_new_pack.p3fTTc/_new 2016-01-16 11:55:38.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package build-compare # -# 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 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:20151022T083541.cd832db +Version:20160104T085658.0b929c8 Release:0 Source1:COPYING Source2:same-build-result.sh ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.p3fTTc/_old 2016-01-16 11:55:38.0 +0100 +++ /var/tmp/diff_new_pack.p3fTTc/_new 2016-01-16 11:55:38.0 +0100 @@ -134,7 +134,7 @@ SUCCESS=0 fi - appdatas=`cd $OTHERDIR && find . -name *-appdata.xml` + appdatas=$(cd $OTHERDIR && find . -name "*-appdata.xml") for xml in $appdatas; do # compare appstream data if test -e $OLDDIR/$xml -a -e $OTHERDIR/$xml; then
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2015-11-02 12:54:06 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is "build-compare" Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2015-09-08 17:35:34.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2015-11-02 12:54:07.0 +0100 @@ -1,0 +2,15 @@ +Thu Oct 22 06:29:44 UTC 2015 - o...@aepfle.de + +- Remove filename-too-long-for-joliet from rpmlint.log + +--- +Mon Oct 12 13:59:31 UTC 2015 - o...@aepfle.de + +- Filter out durations from rpmlint progress report + +--- +Fri Oct 2 09:00:52 UTC 2015 - o...@aepfle.de + +- Handle texi2html 5.0 timestamps + +--- New: _service Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.N00lZa/_old 2015-11-02 12:54:08.0 +0100 +++ /var/tmp/diff_new_pack.N00lZa/_new 2015-11-02 12:54:08.0 +0100 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:20150821T175907.9b8c0be +Version:20151022T083541.cd832db Release:0 Source1:COPYING Source2:same-build-result.sh ++ _service ++ %ci.%h git://github.com/openSUSE/build-compare.git git *.tar */build-compare.* */*.sh */COPYING ++ pkg-diff.sh ++ --- /var/tmp/diff_new_pack.N00lZa/_old 2015-11-02 12:54:08.0 +0100 +++ /var/tmp/diff_new_pack.N00lZa/_new 2015-11-02 12:54:08.0 +0100 @@ -481,9 +481,11 @@ for f in old/$file new/$file; do sed -i -e ' s||| +
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2015-09-08 17:35:25 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is "build-compare" Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2015-08-21 07:35:01.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2015-09-08 17:35:34.0 +0200 @@ -1,0 +2,6 @@ +Fri Aug 21 12:57:57 UTC 2015 - seife+...@b1-systems.com + +- avoid -kmp packages with "filename-too-long-for-joliet" + triggering constant republishing + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.iJhNYb/_old 2015-09-08 17:35:35.0 +0200 +++ /var/tmp/diff_new_pack.iJhNYb/_new 2015-09-08 17:35:35.0 +0200 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:2015.07.15 +Version:20150821T175907.9b8c0be Release:0 Source1:COPYING Source2:same-build-result.sh ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.iJhNYb/_old 2015-09-08 17:35:35.0 +0200 +++ /var/tmp/diff_new_pack.iJhNYb/_new 2015-09-08 17:35:35.0 +0200 @@ -117,6 +117,13 @@ # Remove release from files sort -u $OLDDIR/rpmlint.log|sed -e "s,$ver_rel1,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file1 sort -u $OTHERDIR/rpmlint.log|sed -e "s,$ver_rel2,@VERSION@-@RELEASE@,g" -e "s|/tmp/rpmlint\..*spec|.spec|g" > $file2 +### kmp's are strange: +# the correct way would be to find the versions of -kmp- packages and ignore them, but this will do, too. +# example: this one leads to constant republishing of virtualbox for every build. +# -virtualbox-guest-kmp-default.x86_64: W: filename-too-long-for-joliet virtualbox-guest-kmp-default-5.0.2_k3.16.7_24-177.d_l_ocaml.2.x86_64.rpm +# +virtualbox-guest-kmp-default.x86_64: W: filename-too-long-for-joliet virtualbox-guest-kmp-default-5.0.2_k3.16.7_24-178.d_l_ocaml.1.x86_64.rpm +sed -i -e "/W: filename-too-long-for-joliet/s,\(^.*-kmp-.*-kmp-\).*$,\1," $file1 +sed -i -e "/W: filename-too-long-for-joliet/s,\(^.*-kmp-.*-kmp-\).*$,\1," $file2 if ! cmp -s $file1 $file2; then echo "rpmlint.log files differ:" diff -u $file1 $file2 |head -n 20
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2015-08-21 07:35:00
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2015-05-06 11:22:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2015-08-21 07:35:01.0 +0200
@@ -1,0 +2,12 @@
+Wed Jul 15 09:50:58 UTC 2015 - o...@aepfle.de
+
+- 2015.07.15
+- Handle more texi2html generated files and patterns
+
+---
+Wed Jun 17 14:25:06 UTC 2015 - o...@aepfle.de
+
+- 2015.06.17
+- Fix regex to handle /lib/(modules|firmware)/version-release-any properly
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.vBty9z/_old 2015-08-21 07:35:02.0 +0200
+++ /var/tmp/diff_new_pack.vBty9z/_new 2015-08-21 07:35:02.0 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:2015.04.28
+Version:2015.07.15
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.vBty9z/_old 2015-08-21 07:35:02.0 +0200
+++ /var/tmp/diff_new_pack.vBty9z/_new 2015-08-21 07:35:02.0 +0200
@@ -38,11 +38,11 @@
# Get single directory or filename with long or short release string
function grep_release_old()
{
- grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))
+ grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]*(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))
}
function grep_release_new()
{
- grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))
+ grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]*(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))
}
function check_provides()
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.vBty9z/_old 2015-08-21 07:35:02.0 +0200
+++ /var/tmp/diff_new_pack.vBty9z/_new 2015-08-21 07:35:02.0 +0200
@@ -475,15 +475,18 @@
done
;;
/usr/share/doc/packages/*/*.html|\
- /usr/share/doc/kde/HTML/*/*/*.html|/usr/share/doc/*/html/*.html)
+ /usr/share/doc/packages/*/*/*.html|\
+ /usr/share/doc/*/html/*.html|\
+ /usr/share/doc/kde/HTML/*/*/*.html)
for f in old/$file new/$file; do
- # texi2html output, e.g. in kvm, indent, qemu
-sed -i -e s|^!-- Created on .*, 20.. by texi2html .\...|!-- Created
on August 7, 2009 by texi2html 1.82| $f
-sed -i -e 's|^ *This document was generated by emAutobuild/em on
em.*, 20../em using a
href=http://www.nongnu.org/texi2html/;emtexi2html .\.../em/a.$| This
document was generated by emAutobuild/em on emAugust 7, 2009/em using
a href=http://www.nongnu.org/texi2html/;emtexi2html 1.82/em/a.|' $f
-# doxygen docu, e.g. in libssh and log4c
-sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9]
20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f
-# Generated on Sat Aug 14 2010 16:49:48 for libssh
-sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9]
[0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |'
$f
+sed -i -e '
+s|!-- Created on [^,]\+, [0-9]\+ [0-9]\+ by texi2html [0-9\.]\+
--|!-- Created on July, 14 2015 by texi2html 1.78 --|
+s|^!-- Created on .*, 20.. by texi2html .\...|!-- Created on August
7, 2009 by texi2html 1.82|
+s|This document was generated by emAutobuild/em on em[^,]\+,
[0-9]\+ [0-9]\+/em using a
href=http://www.nongnu.org/texi2html/;emtexi2html [0-9\.]\+/em/a.|This
document was generated by emAutobuild/em on emJuly, 15 2015/em using a
href=http://www.nongnu.org/texi2html/;emtexi2html 1.78/em/a.|
+s|^ *This document was generated by emAutobuild/em on em.*,
20../em using a href=http://www.nongnu.org/texi2html/;emtexi2html
.\.../em/a.$| This document was generated by emAutobuild/em on
emAugust 7, 2009/em using a
href=http://www.nongnu.org/texi2html/;emtexi2html 1.82/em/a.|
+s|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9]
20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |
+
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2015-04-23 07:55:42 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2015-03-30 19:09:13.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2015-04-23 07:55:43.0 +0200 @@ -1,0 +2,9 @@ +Mon Apr 13 08:55:39 UTC 2015 - o...@aepfle.de + +- 2015.04.13 +- Show hint if pkg-diff.sh returns non-zero +- Adjust intending in same-build-result.sh +- Handle /usr/src/packages/OTHER +- Handle setuid directory + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.wWlajt/_old 2015-04-23 07:55:43.0 +0200 +++ /var/tmp/diff_new_pack.wWlajt/_new 2015-04-23 07:55:43.0 +0200 @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Url:https://github.com/openSUSE/build-compare -Version:2015.03.20 +Version:2015.04.13 Release:0 Source1:COPYING Source2:same-build-result.sh ++ pkg-diff.sh ++ --- /var/tmp/diff_new_pack.wWlajt/_old 2015-04-23 07:55:43.0 +0200 +++ /var/tmp/diff_new_pack.wWlajt/_new 2015-04-23 07:55:43.0 +0200 @@ -689,7 +689,7 @@ return 1 fi ;; - directory|setuid,\ directory|sticky,\ directory) + directory|setuid\ directory|setuid,\ directory|sticky,\ directory) # tar might package directories - ignore them here return 0 ;; ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.wWlajt/_old 2015-04-23 07:55:43.0 +0200 +++ /var/tmp/diff_new_pack.wWlajt/_new 2015-04-23 07:55:43.0 +0200 @@ -76,18 +76,19 @@ oname=`$rpmqp $opac` nname=`$rpmqp $npac` if test $oname != $nname; then - echo names differ: $oname $nname - exit 1 +echo names differ: $oname $nname +exit 1 fi case $opac in *debuginfo*) - echo skipping -debuginfo package + echo skipping -debuginfo package ;; *) - bash $CMPSCRIPT $opac $npac || SUCCESS=0 - if test $SUCCESS -eq 0 -a -z $check_all; then + bash $CMPSCRIPT $opac $npac || SUCCESS=0 + if test $SUCCESS -eq 0 -a -z $check_all; then +echo differences between $opac and $npac exit 1 - fi + fi ;; esac done @@ -98,43 +99,52 @@ fi # Compare rpmlint.log files -OTHERDIR=/home/abuild/rpmbuild/OTHER - -if test -e $OLDDIR/rpmlint.log -a -e $OTHERDIR/rpmlint.log; then - file1=`mktemp` - file2=`mktemp` - echo comparing $OLDDIR/rpmlint.log and $OTHERDIR/rpmlint.log - # Sort the files first since the order of messages is not deterministic - # Remove release from files - sort -u $OLDDIR/rpmlint.log|sed -e s,$ver_rel1,@VERSION@-@RELEASE@,g -e s|/tmp/rpmlint\..*spec|.spec|g $file1 - sort -u $OTHERDIR/rpmlint.log|sed -e s,$ver_rel2,@VERSION@-@RELEASE@,g -e s|/tmp/rpmlint\..*spec|.spec|g $file2 - if ! cmp -s $file1 $file2; then -echo rpmlint.log files differ: -diff -u $file1 $file2 |head -n 20 -SUCCESS=0 - fi - rm $file1 $file2 -elif test -e $OTHERDIR/rpmlint.log; then - echo rpmlint.log is new - SUCCESS=0 +if test -d /home/abuild/rpmbuild/OTHER; then + OTHERDIR=/home/abuild/rpmbuild/OTHER +elif test -d /usr/src/packages/OTHER; then + OTHERDIR=/usr/src/packages/OTHER +else + echo no OTHERDIR + OTHERDIR= fi -appdatas=`cd $OTHERDIR find . -name *-appdata.xml` -for xml in $appdatas; do - # compare appstream data - if test -e $OLDDIR/$xml -a -e $OTHERDIR/$xml; then -file1=$OLDDIR/$xml -file2=$OTHERDIR/$xml +if test -n $OTHERDIR; then + if test -e $OLDDIR/rpmlint.log -a -e $OTHERDIR/rpmlint.log; then +file1=`mktemp` +file2=`mktemp` +echo comparing $OLDDIR/rpmlint.log and $OTHERDIR/rpmlint.log +# Sort the files first since the order of messages is not deterministic +# Remove release from files +sort -u $OLDDIR/rpmlint.log|sed -e s,$ver_rel1,@VERSION@-@RELEASE@,g -e s|/tmp/rpmlint\..*spec|.spec|g $file1 +sort -u $OTHERDIR/rpmlint.log|sed -e s,$ver_rel2,@VERSION@-@RELEASE@,g -e s|/tmp/rpmlint\..*spec|.spec|g $file2 if ! cmp -s $file1 $file2; then - echo $xml files differ: - diff -u0 $file1 $file2 |head -n 20 + echo rpmlint.log files differ: + diff -u $file1 $file2 |head -n 20 SUCCESS=0 fi - elif test -e $OTHERDIR/$xml; then -echo $xml is new +rm $file1 $file2 + elif test -e $OTHERDIR/rpmlint.log; then +echo rpmlint.log
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2015-03-30 19:09:11
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2015-02-22 17:19:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2015-03-30 19:09:13.0 +0200
@@ -1,0 +2,9 @@
+Fri Mar 20 18:58:22 UTC 2015 - o...@aepfle.de
+
+- 2015.03.20
+- Convert correct png file before comparison
+- Avoid name clashes when comparing png files
+- Handle filename changes gracefully when comparing unknown filetypes
+- Use generic helper to compare png files
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.0 +0200
+++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.0 +0200
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:2015.02.10
+Version:2015.03.20
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.0 +0200
+++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.0 +0200
@@ -255,4 +255,4 @@
rm $file1 $file2
return $RES
}
-# vim: tw=666 ts=2 et
+# vim: tw=666 ts=2 shiftwidth=2 et
++ pkg-diff.sh ++
--- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.0 +0200
+++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.0 +0200
@@ -154,14 +154,24 @@
diff_two_files()
{
- if ! cmp -s old/$file new/$file; then
- echo $file differs ($ftype)
- hexdump -C old/$file $file1
- hexdump -C new/$file $file2
- diff -u $file1 $file2 | head -n 200
- return 1
+ if test ! -e old/$file; then
+echo Missing in old package: $file
+return 1
fi
- return 0
+ if test ! -e new/$file; then
+echo Missing in new package: $file
+return 1
+ fi
+
+ if cmp -s old/$file new/$file; then
+return 0
+ fi
+
+ echo $file differs ($ftype)
+ hexdump -C old/$file $file1
+ hexdump -C new/$file $file2
+ diff -u $file1 $file2 | head -n 200
+ return 1
}
trim_man_first_line()
@@ -411,19 +421,17 @@
return $?
;;
*png)
- # Try to remove timestamps, only if convert from ImageMagick is
installed
+# Try to remove timestamps, only if convert from ImageMagick is
installed
if [[ $(type -p convert) ]]; then
- convert old/$file +set date:create +set date:modify
old/${file/.png/_n.png}
- convert old/$file +set date:create +set date:modify
new/${file/.png/_n.png}
- if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then
- echo $file differs ($ftype)
- hexdump -C old/${file/.png/_n.png} $file1
- hexdump -C new/${file/.png/_n.png} $file2
- diff -u $file1 $file2 | head -n 20
- return 1
- fi
- return 0
- fi
+ convert old/$file +set date:create +set date:modify
old/${file}.$PPID.$$
+ convert new/$file +set date:create +set date:modify
new/${file}.$PPID.$$
+ mv -f old/${file}.$PPID.$$ old/${file}
+ mv -f new/${file}.$PPID.$$ new/${file}
+ if ! diff_two_files; then
+return 1
+ fi
+ return 0
+fi
;;
/usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo)
for f in old/$file new/$file; do
@@ -762,4 +770,4 @@
echo Package content is identical
fi
exit $ret
-# vim: tw=666 ts=2 et
+# vim: tw=666 ts=2 shiftwidth=2 et
++ same-build-result.sh ++
--- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.0 +0200
+++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.0 +0200
@@ -141,4 +141,4 @@
fi
echo 'compare validated built as identical !'
exit 0
-# vim: tw=666 ts=2 et
+# vim: tw=666 ts=2 shiftwidth=2 et
++ srpm-check.sh ++
--- /var/tmp/diff_new_pack.LwLarH/_old 2015-03-30 19:09:14.0 +0200
+++ /var/tmp/diff_new_pack.LwLarH/_new 2015-03-30 19:09:14.0 +0200
@@ -97,4 +97,4 @@
rm -rf $dir
exit $ret
-# vim: tw=666 ts=2 et
+# vim: tw=666 ts=2 shiftwidth=2 et
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2015-02-22 17:19:55
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2015-02-08 11:42:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2015-02-22 17:19:56.0 +0100
@@ -1,0 +2,27 @@
+Thu Feb 12 10:41:45 UTC 2015 - o...@aepfle.de
+
+- Handle also .o files as ELF relocatable objects
+
+---
+Thu Feb 12 08:22:09 UTC 2015 - randy.e.w...@linux.intel.com
+
+- Rename rpm-check.sh to pkg-diff.sh
+
+---
+Tue Feb 10 15:35:25 UTC 2015 - o...@aepfle.de
+
+- 2015.02.10
+- Trim objdump output properly
+- Trim .TH also in localized man pages (bnc#915941)
+- Remove also DVIPSSource from .ps files
+
+---
+Tue Feb 10 15:33:32 UTC 2015 - randy.e.w...@linux.intel.com
+
+- Print section differences even if assembly has differences.
+- Add support for nested rpms.
+- Make rpm-check work for packages other than rpm.
+- Tell which section was different when doing ELF comparisons.
+- Error when one of the rpms is not found
+
+---
Old:
rpm-check.sh
New:
pkg-diff.sh
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.KGyH0B/_old 2015-02-22 17:19:57.0 +0100
+++ /var/tmp/diff_new_pack.KGyH0B/_new 2015-02-22 17:19:57.0 +0100
@@ -21,11 +21,11 @@
License:GPL-2.0+
Group: Development/Tools/Building
Url:https://github.com/openSUSE/build-compare
-Version:2015.02.06
+Version:2015.02.10
Release:0
Source1:COPYING
Source2:same-build-result.sh
-Source3:rpm-check.sh
+Source3:pkg-diff.sh
Source4:functions.sh
Source5:srpm-check.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ functions.sh ++
--- /var/tmp/diff_new_pack.KGyH0B/_old 2015-02-22 17:19:57.0 +0100
+++ /var/tmp/diff_new_pack.KGyH0B/_new 2015-02-22 17:19:57.0 +0100
@@ -57,19 +57,35 @@
check_header $pkg
}
-#usage unrpm file $dir
-# Unpack rpm files in directory $dir
-# like /usr/bin/unrpm - just for one file and with no options
-function unrpm()
+#usage unpackage file $dir
+# Unpack files in directory $dir
+# like /usr/bin/unpackage - just for one file and with no options
+function unpackage()
{
local file
local dir
file=$1
dir=$2
-CPIO_OPTS=--extract --unconditional --preserve-modification-time
--make-directories --quiet
mkdir -p $dir
pushd $dir 1/dev/null
-rpm2cpio $file | cpio ${CPIO_OPTS}
+case $file in
+*.bz2)
+bzip2 -d $file
+;;
+*.gz)
+gzip -d $file
+;;
+*.xz)
+xz -d $file
+;;
+*.tar|*.tar.bz2|*.tar.gz|*.tgz|*.tbz2)
+tar xf $file
+;;
+*.rpm)
+CPIO_OPTS=--extract --unconditional --preserve-modification-time
--make-directories --quiet
+rpm2cpio $file | cpio ${CPIO_OPTS}
+;;
+esac
popd 1/dev/null
}
@@ -85,6 +101,8 @@
local file1 file2
local f
local sh=$1
+local oldrpm=$2
+local newrpm=$3
QF=%{NAME}
++ pkg-diff.sh ++
765 lines (skipped)
++ same-build-result.sh ++
--- /var/tmp/diff_new_pack.KGyH0B/_old 2015-02-22 17:19:57.0 +0100
+++ /var/tmp/diff_new_pack.KGyH0B/_new 2015-02-22 17:19:57.0 +0100
@@ -7,11 +7,11 @@
# Enhanced by Andreas Jaeger a...@suse.de
#
# The script decides if the new build differes from the former one,
-# using rpm-check.sh.
+# using pkg-diff.sh.
# The script is called as part of the build process as:
# /usr/lib/build/same-build-result.sh /.build.oldpackages
/usr/src/packages/RPMS /usr/src/packages/SRPMS
-CMPSCRIPT=${0%/*}/rpm-check.sh
+CMPSCRIPT=${0%/*}/pkg-diff.sh
SCMPSCRIPT=${0%/*}/srpm-check.sh
check_all=1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2015-02-08 11:42:11
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2015-01-30 06:02:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2015-02-08 11:42:12.0 +0100
@@ -1,0 +2,33 @@
+Fri Feb 6 10:35:56 UTC 2015 - o...@aepfle.de
+
+- 2015.02.06
+- Remove more javadoc references (bnc#916161)
+- Handle *.war files like *.jar files
+- Trim name-version-release string in update-scripts
+
+---
+Wed Feb 4 15:53:05 UTC 2015 - o...@aepfle.de
+
+- 2015.02.04
+- Handle ruby gem files, they are tar archives (bnc#916047)
+- Remove Creator: and CreationDate: tags from .ps files (bnc#915952)
+- Correct regex for hostname in libtool (bnc#916268)
+
+---
+Tue Feb 3 11:34:39 UTC 2015 - o...@aepfle.de
+
+- 2015.02.03
+- Trim .TH also in perl man pages (bnc#915941)
+- Trim first line of man page to catch overly verbose tools
+- Use correct offset for patching mtime out of .pyc files
+- Add BuildIgnore to allow bootstrap in sle11
+
+---
+Mon Feb 2 10:05:40 UTC 2015 - o...@aepfle.de
+
+- 2015.02.02
+- Trim VERSION-RELEASE also in rpmlint log
+- Adjust regex for spec comparing in src.rpm
+- handle also stick and setuid directory from file(1) output
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.iI3S6B/_old 2015-02-08 11:42:14.0 +0100
+++ /var/tmp/diff_new_pack.iI3S6B/_new 2015-02-08 11:42:14.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package build-compare
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -20,7 +20,8 @@
Summary:Build Result Compare Script
License:GPL-2.0+
Group: Development/Tools/Building
-Version:2015.01.21
+Url:https://github.com/openSUSE/build-compare
+Version:2015.02.06
Release:0
Source1:COPYING
Source2:same-build-result.sh
@@ -29,6 +30,7 @@
Source5:srpm-check.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
+#!BuildIgnore: build-compare
%description
This package contains scripts to find out if the build result differs
++ functions.sh ++
--- /var/tmp/diff_new_pack.iI3S6B/_old 2015-02-08 11:42:14.0 +0100
+++ /var/tmp/diff_new_pack.iI3S6B/_new 2015-02-08 11:42:14.0 +0100
@@ -19,13 +19,21 @@
# - it is used as direntry below certain paths
# - it is assigned to some variable in scripts, at the end of a line
# - it is used in PROVIDES, at the end of a line
+# Trim name-version-release string:
+# - it is used in update-scripts which are called by libzypp
function trim_release_old()
{
- sed -e
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g}
+ sed -e
+
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g}
+
s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
+
}
function trim_release_new()
{
- sed -e
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g}
+ sed -e
+
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g}
+
s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g
+
}
# Get single directory or filename with long or short release string
function grep_release_old()
@@ -119,6 +127,8 @@
# Remember to quote the . which is in release
version_release_old=$($RPM --qf %{VERSION}-%{RELEASE} $oldrpm)
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2015-01-30 06:02:03
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2014-12-01 14:00:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2015-01-30 06:02:05.0 +0100
@@ -1,0 +2,17 @@
+Wed Jan 21 08:34:32 UTC 2015 - o...@aepfle.de
+
+- 2015.01.21
+- Remove leading spaces from file(1) output
+- Force removal of tmpdir to handle files marked as read-only
+
+---
+Fri Jan 9 09:37:34 UTC 2015 - o...@aepfle.de
+
+- 2015.01.14
+- Trim VERSION-RELEASE instead of RELEASE because the release number
+ will match other substrings.
+- Use regex instead in sed /regex/ to match dots properly
+- Handle plain cpio archives from gfxboot
+- Add patterns for .TH header in man pages to handle all cases
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.SfgX1Y/_old 2015-01-30 06:02:08.0 +0100
+++ /var/tmp/diff_new_pack.SfgX1Y/_new 2015-01-30 06:02:08.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package build-compare
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary:Build Result Compare Script
License:GPL-2.0+
Group: Development/Tools/Building
-Version:2014.11.25
+Version:2015.01.21
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.SfgX1Y/_old 2015-01-30 06:02:08.0 +0100
+++ /var/tmp/diff_new_pack.SfgX1Y/_new 2015-01-30 06:02:08.0 +0100
@@ -15,26 +15,26 @@
$RPM --qf $QF $1
}
-# Trim release string:
+# Trim version-release string:
# - it is used as direntry below certain paths
# - it is assigned to some variable in scripts, at the end of a line
# - it is used in PROVIDES, at the end of a line
function trim_release_old()
{
- sed -e
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$release_old\$\)/{s,-$release_old_regex_l,-@RELEASE_LONG@,g;s,-$release_old_regex_s,-@RELEASE_SHORT@,g}
+ sed -e
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g}
}
function trim_release_new()
{
- sed -e
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$release_new\$\)/{s,-$release_new_regex_l,-@RELEASE_LONG@,g;s,-$release_new_regex_s,-@RELEASE_SHORT@,g}
+ sed -e
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g}
}
# Get single directory or filename with long or short release string
function grep_release_old()
{
- grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(-${release_old_regex_l}(\$|[^/]+\$)|-${release_old_regex_s}(\$|[^/]+\$))
+ grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(${version_release_old_regex_l}(\$|[^/]+\$)|${version_release_old_regex_s}(\$|[^/]+\$))
}
function grep_release_new()
{
- grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(-${release_new_regex_l}(\$|[^/]+\$)|-${release_new_regex_s}(\$|[^/]+\$))
+ grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(${version_release_new_regex_l}(\$|[^/]+\$)|${version_release_new_regex_s}(\$|[^/]+\$))
}
function check_provides()
@@ -117,19 +117,19 @@
fi
# Remember to quote the . which is in release
-release_old=$($RPM --qf %{RELEASE} $oldrpm)
-release_new=$($RPM --qf %{RELEASE} $newrpm)
+version_release_old=$($RPM --qf %{VERSION}-%{RELEASE} $oldrpm)
+version_release_new=$($RPM --qf %{VERSION}-%{RELEASE} $newrpm)
# Short version without B_CNT
-release_old_regex_s=${release_old%.*}
-release_old_regex_s=${release_old_regex_s//./\\.}
-release_new_regex_s=${release_new%.*}
-release_new_regex_s=${release_new_regex_s//./\\.}
+version_release_old_regex_s=${version_release_old%.*}
+version_release_old_regex_s=${version_release_old_regex_s//./\\.}
+
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2014-12-01 14:00:26
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2014-11-18 22:53:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2014-12-01 14:00:33.0 +0100
@@ -1,0 +2,18 @@
+Wed Nov 26 08:58:45 UTC 2014 - oher...@suse.de
+
+- 2014.11.25
+- correctly handle cmp_spec return code if file checksum differs
+- handle also bz2 and xz compressed files with odd name
+
+---
+Tue Nov 18 11:58:51 UTC 2014 - oher...@suse.de
+
+- 2014.11.15
+- show sorted differences of rpmlint log (bnc#904092)
+- handle kernel and kmp packages, but support for kernel* is disabled
+- minor style fixes
+- handle cpio archives
+- handle absolute symlinks correctly
+- handle all ELF sections, not only the ones starting with dot
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.w9D07D/_old 2014-12-01 14:00:35.0 +0100
+++ /var/tmp/diff_new_pack.w9D07D/_new 2014-12-01 14:00:35.0 +0100
@@ -20,7 +20,7 @@
Summary:Build Result Compare Script
License:GPL-2.0+
Group: Development/Tools/Building
-Version:2014.07.15
+Version:2014.11.25
Release:0
Source1:COPYING
Source2:same-build-result.sh
@@ -36,8 +36,7 @@
%prep
-mkdir $RPM_BUILD_DIR/%name-%version
-%setup -T 0 -D
+%setup -q -c -T
%build
++ functions.sh ++
--- /var/tmp/diff_new_pack.w9D07D/_old 2014-12-01 14:00:35.0 +0100
+++ /var/tmp/diff_new_pack.w9D07D/_new 2014-12-01 14:00:35.0 +0100
@@ -15,16 +15,38 @@
$RPM --qf $QF $1
}
-function check_provides()
+# Trim release string:
+# - it is used as direntry below certain paths
+# - it is assigned to some variable in scripts, at the end of a line
+# - it is used in PROVIDES, at the end of a line
+function trim_release_old()
+{
+ sed -e
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$release_old\$\)/{s,-$release_old_regex_l,-@RELEASE_LONG@,g;s,-$release_old_regex_s,-@RELEASE_SHORT@,g}
+}
+function trim_release_new()
+{
+ sed -e
/\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$release_new\$\)/{s,-$release_new_regex_l,-@RELEASE_LONG@,g;s,-$release_new_regex_s,-@RELEASE_SHORT@,g}
+}
+# Get single directory or filename with long or short release string
+function grep_release_old()
+{
+ grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(-${release_old_regex_l}(\$|[^/]+\$)|-${release_old_regex_s}(\$|[^/]+\$))
+}
+function grep_release_new()
{
+ grep -E
(/boot|/lib/modules|/lib/firmware|/usr/src)/[^/]+(-${release_new_regex_l}(\$|[^/]+\$)|-${release_new_regex_s}(\$|[^/]+\$))
+}
+function check_provides()
+{
+ local pkg=$1
# provides destroy this because at least the self-provide includes the
# -buildnumber :-(
QF=[%{PROVIDENAME} %{PROVIDEFLAGS} %{PROVIDEVERSION}\\n]\\n
QF=$QF [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n
QF=$QF [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n
QF=$QF [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n
- check_header $1 | sed -e s,-$2$,-@RELEASE@,
+ check_header $pkg
}
#usage unrpm file $dir
@@ -51,6 +73,11 @@
# Sets $files with list of files that need further investigation
function cmp_spec ()
{
+local RES
+local file1 file2
+local f
+local sh=$1
+
QF=%{NAME}
# don't look at RELEASE, it contains our build number
@@ -81,6 +108,7 @@
# the DISTURL tag can be used as checkin ID
#echo $QF
+echo comparing rpmtags
if ! diff -au $file1 $file2; then
if test -z $check_all; then
rm $file1 $file2
@@ -89,19 +117,36 @@
fi
# Remember to quote the . which is in release
-release1=$($RPM --qf %{RELEASE} $oldrpm|sed -e 's/\./\\./g')
-release2=$($RPM --qf %{RELEASE} $newrpm|sed -e 's/\./\\./g')
-# This might happen with a forced rebuild of factory
-if [ ${release1%.*} != ${release2%.*} ] ; then
- echo release prefix mismatch
- if test -z $check_all; then
-return 1
- fi
+release_old=$($RPM --qf %{RELEASE} $oldrpm)
+release_new=$($RPM --qf %{RELEASE} $newrpm)
+# Short version without B_CNT
+release_old_regex_s=${release_old%.*}
+release_old_regex_s=${release_old_regex_s//./\\.}
+release_new_regex_s=${release_new%.*}
+
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2014-11-18 22:53:15
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2014-08-21 17:24:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2014-11-18 22:53:17.0 +0100
@@ -1,0 +2,17 @@
+Wed Nov 12 09:29:24 UTC 2014 - sch...@suse.de
+
+- Use $(...) instead of `...` to avoid losing backslash quoting
+
+---
+Fri Nov 7 11:12:10 UTC 2014 - oher...@suse.de
+
+- Update check-all option to really keep going and check all files
+- Add check to recursively look into gzip files with odd suffix
+ to properly handle /usr/share/vlc/skins2/default.vlt
+
+---
+Sat Aug 2 19:37:18 UTC 2014 - johannesoberm...@gmx.de
+
+- Fix quoting .
+
+---
Other differences:
--
++ functions.sh ++
--- /var/tmp/diff_new_pack.MW8ouC/_old 2014-11-18 22:53:18.0 +0100
+++ /var/tmp/diff_new_pack.MW8ouC/_new 2014-11-18 22:53:18.0 +0100
@@ -82,25 +82,31 @@
# the DISTURL tag can be used as checkin ID
#echo $QF
if ! diff -au $file1 $file2; then
- rm $file1 $file2
- return 1
+ if test -z $check_all; then
+rm $file1 $file2
+return 1
+ fi
fi
# Remember to quote the . which is in release
-release1=`$RPM --qf %{RELEASE} $oldrpm|sed -e 's/\./\\./g'`
-release2=`$RPM --qf %{RELEASE} $newrpm|sed -e 's/\./\\./g'`
+release1=$($RPM --qf %{RELEASE} $oldrpm|sed -e 's/\./\\./g')
+release2=$($RPM --qf %{RELEASE} $newrpm|sed -e 's/\./\\./g')
# This might happen with a forced rebuild of factory
if [ ${release1%.*} != ${release2%.*} ] ; then
echo release prefix mismatch
- return 1
+ if test -z $check_all; then
+return 1
+ fi
fi
check_provides $oldrpm $release1 $file1
check_provides $newrpm $release2 $file2
if ! diff -au $file1 $file2; then
- rm $file1 $file2
- return 1
+ if test -z $check_all; then
+rm $file1 $file2
+return 1
+ fi
fi
# scripts, might contain release number
@@ -109,8 +115,10 @@
check_header $newrpm | sed -e s,-$release2$,-@RELEASE@, $file2
if ! diff -au $file1 $file2; then
- rm $file1 $file2
- return 1
+ if test -z $check_all; then
+rm $file1 $file2
+return 1
+ fi
fi
# First check the file attributes and later the md5s
@@ -130,8 +138,10 @@
check_header $newrpm | sed -e s,-$release2,-@RELEASE@, $file2
if ! diff -au $file1 $file2; then
- rm $file1 $file2
- return 1
+ if test -z $check_all; then
+rm $file1 $file2
+return 1
+ fi
fi
# now the md5sums. if they are different, we check more detailed
++ rpm-check.sh ++
--- /var/tmp/diff_new_pack.MW8ouC/_old 2014-11-18 22:53:18.0 +0100
+++ /var/tmp/diff_new_pack.MW8ouC/_new 2014-11-18 22:53:18.0 +0100
@@ -104,7 +104,9 @@
;;
1)
echo RPM meta information is different
- exit 1
+ if test -z $check_all; then
+exit 1
+ fi
;;
2)
;;
@@ -150,6 +152,45 @@
}
+check_gzip_file()
+{
+ local file=$1
+ local tmpdir=`mktemp -d`
+ local ftype
+ local ret=0
+ if test -n $tmpdir; then
+mkdir $tmpdir/{old,new}
+cp --parents --dereference old/$file $tmpdir/
+cp --parents --dereference new/$file $tmpdir/
+if pushd $tmpdir /dev/null ; then
+ mv old/$file{,.gz}
+ mv new/$file{,.gz}
+ gunzip old/$file.gz
+ gunzip new/$file.gz
+ ftype=`/usr/bin/file old/$file | cut -d: -f2-`
+ case $ftype in
+*POSIX\ tar\ archive)
+ echo gzip content is: $ftype
+ mv old/$file{,.tar}
+ mv new/$file{,.tar}
+ if ! check_single_file ${file}.tar; then
+ret=1
+ fi
+ ;;
+*)
+ echo unhandled gzip content: $ftype
+ if ! diff_two_files; then
+ret=1
+ fi
+ ;;
+ esac
+ popd /dev/null
+fi
+rm -rf $tmpdir
+ fi
+ return $ret
+}
+
check_single_file()
{
local file=$1
@@ -513,6 +554,12 @@
# tar might package directories - ignore them here
return 0
;;
+ *gzip\ compressed\ data*)
+ echo gzipped file with odd filename: $file
+ if !
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2014-08-21 17:24:49
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2014-07-25 09:08:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2014-08-21 17:24:51.0 +0200
@@ -1,0 +2,5 @@
+Tue Jul 29 15:07:04 UTC 2014 - johannesoberm...@gmx.de
+
+- Remove numbered anchors from all Docbook / HTML files (bnc#889629).
+
+---
Other differences:
--
++ rpm-check.sh ++
--- /var/tmp/diff_new_pack.9UCIgI/_old 2014-08-21 17:24:52.0 +0200
+++ /var/tmp/diff_new_pack.9UCIgI/_new 2014-08-21 17:24:52.0 +0200
@@ -136,8 +136,22 @@
return 0
}
+
+strip_numbered_anchors()
+{
+ # Remove numbered anchors on Docbook / HTML files.
+ # This should be save since we remove them from old and new files.
+ # A trailing /a or /div tag will stay also on both files.
+ for f in old/$file new/$file; do
+ sed -i -e 's%[ ]*a[ ]\+name[^]*[0-9]\+[^]*%%g' \
+ -e 's%[ ]*a[ ]\+href[^]*#[^]*[0-9]\+[^]*%%g' \
+ -e 's%[^]*id=ftn\.[^]*[0-9]\+[^]*%%g' $f
+ done
+}
+
+
check_single_file()
-{
+{
local file=$1
case $file in
*.spec)
@@ -267,9 +281,11 @@
# Generated on Sat Aug 14 2010 16:49:48 for libssh
sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9]
[0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |'
$f
done
+ strip_numbered_anchors
;;
/usr/share/javadoc/*.html |\
/usr/share/javadoc/*/*.html|/usr/share/javadoc/*/*/*.html)
+ strip_numbered_anchors
# There are more timestamps in html, so far we handle only some
primitive versions.
for f in old/$file new/$file; do
# Javadoc:
@@ -283,7 +299,7 @@
# deprecated-list is randomly ordered, sort it for comparison
case $f in
*/deprecated-list.html)
-sort -o $f $f
+sort -o $f $f
;;
esac
done
@@ -369,13 +385,7 @@
/usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache|\
/usr/share/gtk-doc/html/*/*.html|/usr/share/gtk-doc/html/*/*.devhelp2)
# various kde and gtk packages
- for f in old/$file new/$file; do
- sed -i -e 's%name=id[0-9]*\([ ]\)%name=id424242\1%g' $f
- sed -i -e 's%name=[a-z]*\.id[0-9]*%name=ftn.id11%g' $f
- sed -i -e 's%\.html#id[0-9]*\(/\)\?%.html#id424242\1%g' $f
- sed -i -e 's%href=#\([a-z]*\.\)\?id[0-9]*\([
]\)%href=#\1id000\2%g' $f
- sed -i -e 's%id=\([a-z]*\.\)\?id[0-9]*\([
]\)%id=\1id000\2%g' $f
- done
+ strip_numbered_anchors
;;
*/created.rid)
# ruby documentation
@@ -389,6 +399,7 @@
for f in old/$file new/$file; do
sed -i -e 's%td[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+
[0-9]\+:[0-9]\+:[0-9]\+ + 201[0-9]/td%tdMon Sep 20 19:02:43 +
2010/td%g' $f
done
+ strip_numbered_anchors
;;
*/Linux*Env.Set.sh)
# LibreOffice files, contains:
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2014-07-25 09:08:47 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2014-07-19 11:04:55.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2014-07-25 09:08:51.0 +0200 @@ -1,0 +2,6 @@ +Tue Jul 22 06:45:25 UTC 2014 - meiss...@suse.com + +- if all ELF sections except build-id and .gnu_debuglink compare equal, + this is the same binary. + +--- Other differences: -- ++ rpm-check.sh ++ --- /var/tmp/diff_new_pack.5ATxzO/_old 2014-07-25 09:08:52.0 +0200 +++ /var/tmp/diff_new_pack.5ATxzO/_new 2014-07-25 09:08:52.0 +0200 @@ -486,7 +486,8 @@ echo $file differs in ELF sections head -n 200 $dfile else - echo WARNING: no idea about $file + echo $file: only difference was in build-id or gnu_debuglink, GOOD. + return 0 fi return 1 ;; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2014-07-19 11:04:34
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2014-07-10 09:32:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2014-07-19 11:04:55.0 +0200
@@ -1,0 +2,14 @@
+Thu Jul 17 06:46:47 UTC 2014 - meiss...@suse.com
+
+- Allow file list changes where the release number is encoded
+ in the filename.
+- compare post-update message and scripts (fixes fetchmsttfonts
+ constant republish) as they have the release number hardcoded.
+
+---
+Tue Jul 15 11:42:09 CEST 2014 - oher...@suse.de
+
+- Fix shell syntax error in rpm-check.sh
+- 2014.07.15
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.fl1Egd/_old 2014-07-19 11:04:56.0 +0200
+++ /var/tmp/diff_new_pack.fl1Egd/_new 2014-07-19 11:04:56.0 +0200
@@ -20,7 +20,7 @@
Summary:Build Result Compare Script
License:GPL-2.0+
Group: Development/Tools/Building
-Version:2012.01.26
+Version:2014.07.15
Release:0
Source1:COPYING
Source2:same-build-result.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.fl1Egd/_old 2014-07-19 11:04:56.0 +0200
+++ /var/tmp/diff_new_pack.fl1Egd/_new 2014-07-19 11:04:56.0 +0200
@@ -125,9 +125,9 @@
# Also FILELANGS (or?)
QF=[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILEMODES:octal}
%{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS} %{FILEVERIFYFLAGS}
%{FILELINKTOS}\n]\\n
# ??? what to do with FILEPROVIDE and FILEREQUIRE?
-
-check_header $oldrpm $file1
-check_header $newrpm $file2
+
+check_header $oldrpm | sed -e s,-$release1,-@RELEASE@, $file1
+check_header $newrpm | sed -e s,-$release2,-@RELEASE@, $file2
if ! diff -au $file1 $file2; then
rm $file1 $file2
@@ -136,9 +136,10 @@
# now the md5sums. if they are different, we check more detailed
# if there are different filenames, we will already have aborted before
-QF=[%{FILENAMES} %{FILEMD5S}\n]\\n
-check_header $oldrpm $file1
-check_header $newrpm $file2
+# file flag 64 means ghost, filter those out.
+QF=[%{FILENAMES} %{FILEMD5S} %{FILEFLAGS}\n]\\n
+check_header $oldrpm |grep -v 64$ $file1
+check_header $newrpm |grep -v 64$ $file2
RES=2
# done if the same
++ rpm-check.sh ++
--- /var/tmp/diff_new_pack.fl1Egd/_old 2014-07-19 11:04:56.0 +0200
+++ /var/tmp/diff_new_pack.fl1Egd/_new 2014-07-19 11:04:56.0 +0200
@@ -402,6 +402,21 @@
echo Ignore $file
return 0
;;
+/var/adm/update-messages/*|/var/adm/update-scripts/*)
+ # encode version-release inside
+ oldfn=`echo $file|sed -e s/-$release2/-$release1/;`
+
+ # fetchmsttfonts embeds the release number in the update shell script.
+ echo sed -i -e s/-$release1/-$release2/g; old/$oldfn
+ sed -i -e s/-$release1/-$release2/g; old/$oldfn
+
+ if ! diff -u old/$oldfn new/$file; then
+ echo $oldfn is not same as $file
+ return 1
+ fi
+ echo $file and $oldfn are same
+ return 0
+ ;;
*pdf)
# PDF files contain a unique ID, remove it
# Format of the ID is:
@@ -463,8 +478,7 @@
echo $file1
echo $file2
# Don't compare .build-id and .gnu_debuglink sections
- for section in $(objdump -s new/$file | grep Contents of section .*:
| sed -r s,.* (\..*):,\1,g | grep -v -e \.build-id -e \.gnu_debuglink | tr
-\n ); do
+ for section in $(objdump -s new/$file | grep Contents of section .*:
| sed -r s,.* (\..*):,\1,g | grep -v -e \.build-id -e \.gnu_debuglink |
tr \n ); do
objdump -s -j $section old/$file | sed s,old/,, $file1
objdump -s -j $section new/$file | sed s,new/,, $file2
done
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2014-07-10 08:24:46 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2013-10-18 11:37:49.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2014-07-10 09:32:16.0 +0200 @@ -1,0 +2,12 @@ +Mon Jul 7 08:28:45 UTC 2014 - a...@suse.com + +- Fix last patch to not use non-existant file (bnc#877078). + +--- +Fri May 9 18:30:26 UTC 2014 - johannesoberm...@gmx.de + +- Don't compare .note.gnu.build-id and .gnu_debuglink sections in ELF + binaries (bnc#877078). +- Don't compare debuginfo packages. + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.A3gw8R/_old 2014-07-10 09:32:17.0 +0200 +++ /var/tmp/diff_new_pack.A3gw8R/_new 2014-07-10 09:32:17.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package build-compare # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ rpm-check.sh ++ --- /var/tmp/diff_new_pack.A3gw8R/_old 2014-07-10 09:32:17.0 +0200 +++ /var/tmp/diff_new_pack.A3gw8R/_new 2014-07-10 09:32:18.0 +0200 @@ -460,10 +460,14 @@ head -n 200 $dfile return 1 fi - objdump -s old/$file $file1 - sed -i -e s,old/,, $file1 - objdump -s new/$file $file2 - sed -i -e s,new/,, $file2 + echo $file1 + echo $file2 + # Don't compare .build-id and .gnu_debuglink sections + for section in $(objdump -s new/$file | grep Contents of section .*: | sed -r s,.* (\..*):,\1,g | grep -v -e \.build-id -e \.gnu_debuglink | tr +\n ); do + objdump -s -j $section old/$file | sed s,old/,, $file1 + objdump -s -j $section new/$file | sed s,new/,, $file2 + done if ! diff -u $file1 $file2 $dfile; then echo $file differs in ELF sections head -n 200 $dfile ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.A3gw8R/_old 2014-07-10 09:32:18.0 +0200 +++ /var/tmp/diff_new_pack.A3gw8R/_new 2014-07-10 09:32:18.0 +0200 @@ -79,9 +79,13 @@ echo names differ: $oname $nname exit 1 fi - bash $CMPSCRIPT $opac $npac || SUCCESS=0 - if test $SUCCESS -eq 0 -a -z $check_all; then - exit 1 + if [ $(echo $opac | grep -e debuginfo) ]; then + echo skipping -debuginfo package + else + bash $CMPSCRIPT $opac $npac || SUCCESS=0 + if test $SUCCESS -eq 0 -a -z $check_all; then +exit 1 + fi fi done -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2013-10-18 11:31:44 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-05-25 16:14:36.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2013-10-18 11:37:49.0 +0200 @@ -1,0 +2,5 @@ +Thu Oct 17 12:44:19 UTC 2013 - sch...@suse.de + +- Also look into MSB shared objects + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.cXtxZn/_old 2013-10-18 11:38:00.0 +0200 +++ /var/tmp/diff_new_pack.cXtxZn/_new 2013-10-18 11:38:00.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package build-compare # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ rpm-check.sh ++ --- /var/tmp/diff_new_pack.cXtxZn/_old 2013-10-18 11:38:00.0 +0200 +++ /var/tmp/diff_new_pack.cXtxZn/_new 2013-10-18 11:38:00.0 +0200 @@ -443,7 +443,7 @@ return 1 fi ;; -*ELF*executable*|*ELF*LSB\ shared\ object*) +*ELF*executable*|*ELF*[LM]SB\ shared\ object*) objdump -d --no-show-raw-insn old/$file | filter_disasm $file1 if ! test -s $file1; then # objdump has no idea how to handle it -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-05-25 16:14:29 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-05-08 18:00:38.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-05-25 16:14:36.0 +0200 @@ -1,0 +2,6 @@ +Thu May 24 10:17:15 UTC 2012 - a...@suse.de + +- Only handle files, not directories when searching for packages. + Patch by Matthieu Tanguay-Carel mtang...@thoughtworks.com. + +--- Other differences: -- ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.dcMg1W/_old 2012-05-25 16:14:37.0 +0200 +++ /var/tmp/diff_new_pack.dcMg1W/_new 2012-05-25 16:14:37.0 +0200 @@ -59,8 +59,8 @@ # problem: a package can contain both noarch and arch subpackages, so we have to # take care of proper sorting of NEWRPMS, e.g. noarch/x.rpm and x86_64/w.rpm since OLDRPMS # has all the packages in a single directory and would sort this as w.rpm, x.rpm. -OLDRPMS=($(find $OLDDIR -name \*rpm -a ! -name \*src.rpm -a ! -name \*.delta.rpm|sort|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm')) -NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm -a ! -name \*.delta.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm')) +OLDRPMS=($(find $OLDDIR -type f -name \*rpm -a ! -name \*src.rpm -a ! -name \*.delta.rpm|sort|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm')) +NEWRPMS=($(find $NEWDIRS -type f -name \*rpm -a ! -name \*src.rpm -a ! -name \*.delta.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit-|grep -v -- -64bit-|grep -v -- '-x86-.*\.ia64\.rpm')) # Get release from first RPM and keep for rpmlint check # Remember to quote the . for future regexes -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2012-05-08 18:00:36
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare, Maintainer is co...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2012-05-07 22:45:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2012-05-08 18:00:38.0 +0200
@@ -1,0 +2,6 @@
+Tue May 8 12:35:21 UTC 2012 - a...@suse.de
+
+- Further handling of pdf files (bnc#760867), patch by
+ David Haller da...@dhaller.de.
+
+---
Other differences:
--
++ rpm-check.sh ++
--- /var/tmp/diff_new_pack.SvJx15/_old 2012-05-08 18:00:41.0 +0200
+++ /var/tmp/diff_new_pack.SvJx15/_new 2012-05-08 18:00:41.0 +0200
@@ -138,7 +138,7 @@
check_single_file()
{
- local file=$1
+ local file=$1
case $file in
*.spec)
sed -i -e s,Release:.*$release1,Release: @RELEASE@, old/$file
@@ -406,13 +406,22 @@
# PDF files contain a unique ID, remove it
# Format of the ID is:
# /ID [9ACE247A70CF9BEAFEE15E116259BD6D
9ACE247A70CF9BEAFEE15E116259BD6D]
- # pdftex creates also:
+ # with optional spaces. pdftex creates also:
# /CreationDate (D:20120103083206Z)
# /ModDate (D:20120103083206Z)
- for f in old/$file new/$file; do
-sed -i -e 's%/ID \?\[ \?[^]\+ [^]\+ \?\]%/IDrandom%g' $f
- sed -i -e 's%/CreationDate (D:.*)%/CreationDate (D: XXX)%g' $f
- sed -i -e 's%/ModDate (D:.*)%/ModDate (D: XXX)%g' $f
+ # and possibly XML metadata as well
+ for f in old/$file new/$file; do
+sed -i \
+'/obj/,/endobj/{
+ s%/ID \?\[ \?[^]\+ \?[^]\+ \?\]%/IDrandom%g;
+ s%/CreationDate \?(D:[^)]*)%/CreationDate (D: XXX)%g;
+ s%/ModDate \?(D:[^)]*)%/ModDate (D: XXX)%g;
+
s%pdf:CreationDate[^]*/pdf:CreationDate%pdf:CreationDateXXX/pdf:CreationDate%g;
+
s%pdf:ModDate[^]*/pdf:ModDate%pdf:ModDateXXX/pdf:ModDate%g;
+
s%xap:CreateDate[^]*/xap:CreateDate%xap:CreateDateXXX/xap:CreateDate%g;
+
s%xap:ModifyDate[^]*/xap:ModifyDate%xap:ModifyDateXXX/xap:ModifyDate%g;
+
s%xap:MetadataDate[^]*/xap:MetadataDate%xap:MetadataDateXXX/xap:MetadataDate%g;
+}' $f
done
;;
esac
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-05-07 22:43:41 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-04-12 09:19:57.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-05-07 22:45:05.0 +0200 @@ -1,0 +2,10 @@ +Mon May 7 14:50:43 UTC 2012 - a...@suse.de + +- Further handling of pdf files (bnc#760867). + +--- +Mon May 7 11:30:28 UTC 2012 - a...@suse.de + +- Handle /ID in pdf files (bnc#760867). + +--- Other differences: -- ++ rpm-check.sh ++ --- /var/tmp/diff_new_pack.HOG1l1/_old 2012-05-07 22:45:06.0 +0200 +++ /var/tmp/diff_new_pack.HOG1l1/_new 2012-05-07 22:45:06.0 +0200 @@ -1,6 +1,6 @@ #! /bin/bash # -# Copyright (c) 2009, 2010, 2011 SUSE Linux Product GmbH, Germany. +# Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany. # Licensed under GPL v2, see COPYING file for details. # # Written by Michael Matz and Stephan Coolo @@ -402,6 +402,19 @@ echo Ignore $file return 0 ;; +*pdf) + # PDF files contain a unique ID, remove it + # Format of the ID is: + # /ID [9ACE247A70CF9BEAFEE15E116259BD6D 9ACE247A70CF9BEAFEE15E116259BD6D] + # pdftex creates also: + # /CreationDate (D:20120103083206Z) + # /ModDate (D:20120103083206Z) + for f in old/$file new/$file; do +sed -i -e 's%/ID \?\[ \?[^]\+ [^]\+ \?\]%/IDrandom%g' $f + sed -i -e 's%/CreationDate (D:.*)%/CreationDate (D: XXX)%g' $f + sed -i -e 's%/ModDate (D:.*)%/ModDate (D: XXX)%g' $f + done + ;; esac ftype=`/usr/bin/file old/$file | cut -d: -f2-` -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-04-12 09:19:55 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-03-09 21:22:01.0 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-04-12 09:19:57.0 +0200 @@ -1,0 +2,5 @@ +Wed Apr 4 18:25:48 UTC 2012 - reddw...@opensuse.org + +- Handle gtk-doc documentation + +--- Other differences: -- ++ rpm-check.sh ++ --- /var/tmp/diff_new_pack.ZQ70of/_old 2012-04-12 09:19:58.0 +0200 +++ /var/tmp/diff_new_pack.ZQ70of/_new 2012-04-12 09:19:58.0 +0200 @@ -366,12 +366,13 @@ sed -i -e 's|built by abuild@[a-z0-9]* on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] .* 20[0-9][0-9]|built by abuild@build42 on Thu May 6 11:21:17 UTC 2010|' $f done ;; - /usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache) - # various kde packages + /usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache|\ + /usr/share/gtk-doc/html/*/*.html|/usr/share/gtk-doc/html/*/*.devhelp2) + # various kde and gtk packages for f in old/$file new/$file; do sed -i -e 's%name=id[0-9]*\([ ]\)%name=id424242\1%g' $f sed -i -e 's%name=[a-z]*\.id[0-9]*%name=ftn.id11%g' $f - sed -i -e 's%\.html#id[0-9]*%.html#id424242%g' $f + sed -i -e 's%\.html#id[0-9]*\(/\)\?%.html#id424242\1%g' $f sed -i -e 's%href=#\([a-z]*\.\)\?id[0-9]*\([ ]\)%href=#\1id000\2%g' $f sed -i -e 's%id=\([a-z]*\.\)\?id[0-9]*\([ ]\)%id=\1id000\2%g' $f done -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-03-09 21:21:52 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-02-22 15:52:52.0 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-03-09 21:22:01.0 +0100 @@ -1,0 +2,5 @@ +Thu Mar 8 21:44:36 UTC 2012 - reddw...@opensuse.org + +- Improve kde index.cache handling + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.lEggNr/_old 2012-03-09 21:22:03.0 +0100 +++ /var/tmp/diff_new_pack.lEggNr/_new 2012-03-09 21:22:03.0 +0100 @@ -16,7 +16,6 @@ # - Name: build-compare Summary:Build Result Compare Script License:GPL-2.0+ ++ rpm-check.sh ++ --- /var/tmp/diff_new_pack.lEggNr/_old 2012-03-09 21:22:03.0 +0100 +++ /var/tmp/diff_new_pack.lEggNr/_new 2012-03-09 21:22:03.0 +0100 @@ -372,7 +372,8 @@ sed -i -e 's%name=id[0-9]*\([ ]\)%name=id424242\1%g' $f sed -i -e 's%name=[a-z]*\.id[0-9]*%name=ftn.id11%g' $f sed -i -e 's%\.html#id[0-9]*%.html#id424242%g' $f - sed -i -e 's%href=#\([a-z]*\.\)\?id[0-9]*%href=#\1id000%g' $f + sed -i -e 's%href=#\([a-z]*\.\)\?id[0-9]*\([ ]\)%href=#\1id000\2%g' $f + sed -i -e 's%id=\([a-z]*\.\)\?id[0-9]*\([ ]\)%id=\1id000\2%g' $f done ;; */created.rid) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2012-02-22 15:52:50
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare, Maintainer is co...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2012-02-16 22:00:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2012-02-22 15:52:52.0 +0100
@@ -1,0 +2,16 @@
+Wed Feb 22 11:12:13 UTC 2012 - a...@suse.de
+
+- Remove release from pre/post scripts.
+
+---
+Wed Feb 22 11:07:53 UTC 2012 - co...@suse.com
+
+- I changed my mind, appdata.xml is too hard to get right. So
+ we need to support variable binary names for the appdata
+
+---
+Sat Feb 18 18:27:40 UTC 2012 - a...@suse.de
+
+- Quote dot in release to not have false matches.
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.EZ8eij/_old 2012-02-22 15:52:53.0 +0100
+++ /var/tmp/diff_new_pack.EZ8eij/_new 2012-02-22 15:52:53.0 +0100
@@ -16,6 +16,7 @@
#
+
Name: build-compare
Summary:Build Result Compare Script
License:GPL-2.0+
++ functions.sh ++
--- /var/tmp/diff_new_pack.EZ8eij/_old 2012-02-22 15:52:53.0 +0100
+++ /var/tmp/diff_new_pack.EZ8eij/_new 2012-02-22 15:52:53.0 +0100
@@ -1,6 +1,6 @@
#! /bin/bash
#
-# Copyright (c) 2009, 2010, 2011 SUSE Linux Product GmbH, Germany.
+# Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany.
# Licensed under GPL v2, see COPYING file for details.
#
# Written by Michael Matz and Stephan Coolo
@@ -62,8 +62,7 @@
QF=$QF %{EXCLUSIVEOS} %{RPMVERSION} %{PLATFORM}\\n
QF=$QF %{PAYLOADFORMAT} %{PAYLOADCOMPRESSOR} %{PAYLOADFLAGS}\\n
-QF=$QF [%{PREINPROG} %{PREIN}\\n]\\n[%{POSTINPROG}
%{POSTIN}\\n]\\n[%{PREUNPROG} %{PREUN}\\n]\\n[%{POSTUNPROG} %{POSTUN}\\n]\\n
-
+
# XXX We also need to check the existence (but not the content (!))
# of SIGGPG (and perhaps the other SIG*)
@@ -87,8 +86,9 @@
return 1
fi
-release1=`$RPM --qf %{RELEASE} $oldrpm`
-release2=`$RPM --qf %{RELEASE} $newrpm`
+# Remember to quote the . which is in release
+release1=`$RPM --qf %{RELEASE} $oldrpm|sed -e 's/\./\\./g'`
+release2=`$RPM --qf %{RELEASE} $newrpm|sed -e 's/\./\\./g'`
# This might happen with a forced rebuild of factory
if [ ${release1%.*} != ${release2%.*} ] ; then
echo release prefix mismatch
@@ -101,6 +101,16 @@
if ! diff -au $file1 $file2; then
rm $file1 $file2
return 1
+fi
+
+# scripts, might contain release number
+QF=[%{PREINPROG} %{PREIN}\\n]\\n[%{POSTINPROG}
%{POSTIN}\\n]\\n[%{PREUNPROG} %{PREUN}\\n]\\n[%{POSTUNPROG} %{POSTUN}\\n]\\n
+check_header $oldrpm | sed -e s,-$release1$,-@RELEASE@, $file1
+check_header $newrpm | sed -e s,-$release2$,-@RELEASE@, $file2
+
+if ! diff -au $file1 $file2; then
+ rm $file1 $file2
+ return 1
fi
# First check the file attributes and later the md5s
++ same-build-result.sh ++
--- /var/tmp/diff_new_pack.EZ8eij/_old 2012-02-22 15:52:53.0 +0100
+++ /var/tmp/diff_new_pack.EZ8eij/_new 2012-02-22 15:52:53.0 +0100
@@ -63,8 +63,9 @@
NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm -a ! -name
\*.delta.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit-|grep -v --
-64bit-|grep -v -- '-x86-.*\.ia64\.rpm'))
# Get release from first RPM and keep for rpmlint check
-release1=`rpm -qp --nodigest --nosignature --qf %{RELEASE} ${OLDRPMS[0]}`
-release2=`rpm -qp --nodigest --nosignature --qf %{RELEASE} ${NEWRPMS[0]}`
+# Remember to quote the . for future regexes
+release1=`rpm -qp --nodigest --nosignature --qf %{RELEASE}
${OLDRPMS[0]}|sed -e 's/\./\\./g'`
+release2=`rpm -qp --nodigest --nosignature --qf %{RELEASE}
${NEWRPMS[0]}|sed -e 's/\./\\./g'`
SUCCESS=1
rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature '
@@ -111,19 +112,22 @@
SUCCESS=0
fi
-# compare appstream data
-if test -e $OLDDIR/appdata.xml -a -e $OTHERDIR/appdata.xml; then
- file1=$OLDDIR/appdata.xml
- file2=$OTHERDIR/appdata.xml
- if ! cmp -s $file1 $file2; then
-echo appdata.xml files differ:
-diff -u0 $file1 $file2 |head -n 20
+appdatas=`cd $OTHERDIR find . -name *-appdata.xml`
+for xml in $appdatas; do
+ # compare appstream data
+ if test -e $OLDDIR/$xml -a -e $OTHERDIR/$xml; then
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-02-16 16:11:39 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-02-07 14:44:55.0 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-02-16 16:11:41.0 +0100 @@ -1,0 +2,6 @@ +Thu Feb 16 13:39:21 UTC 2012 - co...@suse.com + +- !unchanged if rpmlint.log was new created +- !unchanged if appdata.xml was new or updated + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.69ENUZ/_old 2012-02-16 16:11:42.0 +0100 +++ /var/tmp/diff_new_pack.69ENUZ/_new 2012-02-16 16:11:42.0 +0100 @@ -16,13 +16,12 @@ # - Name: build-compare +Summary:Build Result Compare Script License:GPL-2.0+ Group: Development/Tools/Building -Summary:Build Result Compare Script Version:2012.01.26 -Release:6 +Release:0 Source1:COPYING Source2:same-build-result.sh Source3:rpm-check.sh ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.69ENUZ/_old 2012-02-16 16:11:42.0 +0100 +++ /var/tmp/diff_new_pack.69ENUZ/_new 2012-02-16 16:11:42.0 +0100 @@ -90,23 +90,39 @@ fi # Compare rpmlint.log files -RPMLINTDIR=/home/abuild/rpmbuild/OTHER +OTHERDIR=/home/abuild/rpmbuild/OTHER -if test -e $OLDDIR/rpmlint.log -a -e $RPMLINTDIR/rpmlint.log; then +if test -e $OLDDIR/rpmlint.log -a -e $OTHERDIR/rpmlint.log; then file1=`mktemp` file2=`mktemp` - echo comparing $OLDDIR/rpmlint.log and $RPMLINTDIR/rpmlint.log + echo comparing $OLDDIR/rpmlint.log and $OTHERDIR/rpmlint.log # Sort the files first since the order of messages is not deterministic # Remove release from files sort -u $OLDDIR/rpmlint.log|sed -e s,$release1,@RELEASE@,g -e s|/tmp/rpmlint\..*spec|.spec|g $file1 - sort -u $RPMLINTDIR/rpmlint.log|sed -e s,$release2,@RELEASE@,g -e s|/tmp/rpmlint\..*spec|.spec|g $file2 + sort -u $OTHERDIR/rpmlint.log|sed -e s,$release2,@RELEASE@,g -e s|/tmp/rpmlint\..*spec|.spec|g $file2 if ! cmp -s $file1 $file2; then echo rpmlint.log files differ: -# File is sorted, so don't give context that will confuse readers -diff -u0 $file1 $file2 |head -n 20 +diff -u $OLDDIR/rpmlint.log $OTHERDIR/rpmlint.log |head -n 20 SUCCESS=0 fi rm $file1 $file2 +elif -e $OTHERDIR/rpmlint.log; then + echo rpmlint.log is new + SUCCESS=0 +fi + +# compare appstream data +if test -e $OLDDIR/appdata.xml -a -e $OTHERDIR/appdata.xml; then + file1=$OLDDIR/appdata.xml + file2=$OTHERDIR/appdata.xml + if ! cmp -s $file1 $file2; then +echo appdata.xml files differ: +diff -u0 $file1 $file2 |head -n 20 +SUCCESS=0 + fi +elif -e $OTHERDIR/appdata.xml; then + echo appdata.xml is new + SUCCESS=0 fi if test $SUCCESS -eq 0; then -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-02-16 22:00:43 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-02-16 16:11:41.0 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-02-16 22:00:44.0 +0100 @@ -1,0 +2,5 @@ +Thu Feb 16 21:00:31 UTC 2012 - co...@suse.com + +- fix missing test in shell script + +--- Other differences: -- ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.J2udJC/_old 2012-02-16 22:00:46.0 +0100 +++ /var/tmp/diff_new_pack.J2udJC/_new 2012-02-16 22:00:46.0 +0100 @@ -106,7 +106,7 @@ SUCCESS=0 fi rm $file1 $file2 -elif -e $OTHERDIR/rpmlint.log; then +elif test -e $OTHERDIR/rpmlint.log; then echo rpmlint.log is new SUCCESS=0 fi @@ -120,7 +120,7 @@ diff -u0 $file1 $file2 |head -n 20 SUCCESS=0 fi -elif -e $OTHERDIR/appdata.xml; then +elif test -e $OTHERDIR/appdata.xml; then echo appdata.xml is new SUCCESS=0 fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-02-07 14:44:54 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-01-27 15:17:00.0 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-02-07 14:44:55.0 +0100 @@ -1,0 +2,28 @@ +Mon Feb 6 11:53:57 UTC 2012 - a...@suse.de + +- Fix off-by-one error in rpmlint processing that hit packages with + just one binary package. + +--- +Sun Feb 5 12:16:49 UTC 2012 - a...@suse.de + +- Improve rpmlint check. + +--- +Sun Feb 5 12:11:35 UTC 2012 - a...@suse.de + +- Take care of date format change of unzip. + +--- +Sun Feb 5 10:43:49 UTC 2012 - a...@suse.de + +- Replace all occurences of release in rpmlint, take care of + temporary files in rpmlint + +--- +Sun Feb 5 09:23:56 UTC 2012 - a...@suse.de + +- Use separate invocation lines for .TH lines to catch + some better. + +--- Other differences: -- ++ rpm-check.sh ++ --- /var/tmp/diff_new_pack.c5RnZk/_old 2012-02-07 14:44:57.0 +0100 +++ /var/tmp/diff_new_pack.c5RnZk/_new 2012-02-07 14:44:57.0 +0100 @@ -190,9 +190,12 @@ unjar_l ./$file |sort flist # 10-05-2010 14:39 sed -i -e s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date , flist + # 2012-02-03 07:59 + sed -i -e s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date , flist cd ../new unjar_l ./$file |sort flist sed -i -e s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ,; flist + sed -i -e s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date , flist cd .. if ! cmp -s old/flist new/flist; then echo $file has different file list @@ -318,14 +321,21 @@ # .TH appender.h 3 Tue Aug 31 2010 Version 1.2.1 log4c \ -*- nroff -*- # .TH OFFLINEIMAP 1 11 May 2010 John Goerzen OfflineIMAP Manual # .TH gv 3guile 13 May 2010 -# .TH ARCH 1 September 2010 GNU coreutils 8.5 User Commands #.TH GIT\-ARCHIMPORT 1 09/13/2010 Git 1\.7\.1 Git Manual # .TH LDIRECTORD 8 2010-10-20 perl v5.12.2 User Contributed Perl Documentation for f in old/$file new/$file; do -sed -i -e 's|.TH \?\([^ ]*\)\? \?\([0-9][a-z]*\)\? \?\(20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]\|[A-Z][a-z]* [0-9][0-9], 20[0-9][0-9]\|[0-9]* [A-Z][a-z]* 20[0-9][0-9]\|[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+ 20[0-9][0-9]\|[A-Z][a-z]* 20[0-9][0-9]\)\? |.TH \1 \2 2000-01-01 |' $f +sed -i -e 's|.TH \?\([^ ]*\)\? \?\([0-9][a-z]*\)\? \?\(20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]\|[0-9]* [A-Z][a-z]* 20[0-9][0-9]\)\? |.TH \1 \2 2000-01-01 |' $f sed -i -e 's|.TH \?\([^ ]*\)\? \?\([0-9][a-z]*\)\? \?\([0-1][0-9]/[0-9][0-9]/201[0-9]\)\? |.TH \1 \2 2000-01-01 |' $f sed -i -e 's|.TH \(.*\) \?\(20[0-1][0-9]-[0-9][0-9]-[0-9][0-9]\)\? |.TH \1 2000-01-01 |' $f +# .TH ccmake 1 February 05, 2012 ccmake 2.8.7 + sed -i -e 's|^.TH \?\([^ ]*\)\? \?\([0-9][a-z]*\)\? \?\([A-Z][a-z]* [0-9][0-9], 20[0-9][0-9]\)\? |.TH \1 \2 2000-01-01 |' $f +# .TH appender.h 3 Tue Aug 31 2010 Version 1.2.1 log4c \ -*- nroff -*- +sed -i -e 's|.TH \?\([^ ]*\)\? \?\([0-9][a-z]*\)\? \?[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+ 20[0-9][0-9]\? |.TH \1 \2 2000-01-01 |' $f +# .TH ARCH 1 September 2010 GNU coreutils 8.5 User Commands +sed -i -e 's|.TH \?\([^ ]*\)\? \?\([0-9][a-z]*\)\? \?[A-Z][a-z]* 20[0-9][0-9]\? |.TH \1 \2 2000-01-01 |' $f +# .TH GCM-CALIBRATE 1 03 February 2012 +sed -i -e 's|.TH \?\([^ ]*\)\? \?\([0-9][a-z]*\)\? \?[0-9]* [A-Z][a-z]* 20[0-9][0-9]\? |.TH \1 \2 2000-01-01 |' $f # generated by docbook xml: #.\ Date: 09/13/2010 sed -i -e 's|Date: [0-1][0-9]/[0-9][0-9]/201[0-9]|Date: 09/13/2010|' $f ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.c5RnZk/_old 2012-02-07 14:44:57.0 +0100 +++ /var/tmp/diff_new_pack.c5RnZk/_new 2012-02-07 14:44:57.0 +0100 @@ -63,8 +63,8 @@ NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm -a ! -name \*.delta.rpm|sort --field-separator=/ --key=7|grep -v
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at 2012-01-27 15:16:50
Comparing /work/SRC/openSUSE:Factory/build-compare (Old)
and /work/SRC/openSUSE:Factory/.build-compare.new (New)
Package is build-compare, Maintainer is co...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes
2012-01-20 20:23:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes
2012-01-27 15:17:00.0 +0100
@@ -1,0 +2,5 @@
+Thu Jan 26 10:01:55 UTC 2012 - a...@suse.de
+
+- Remove release from rpmlint.log before comparing.
+
+---
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.hocAB5/_old 2012-01-27 15:17:02.0 +0100
+++ /var/tmp/diff_new_pack.hocAB5/_new 2012-01-27 15:17:02.0 +0100
@@ -21,7 +21,7 @@
License:GPL-2.0+
Group: Development/Tools/Building
Summary:Build Result Compare Script
-Version:2012.01.09
+Version:2012.01.26
Release:6
Source1:COPYING
Source2:same-build-result.sh
++ same-build-result.sh ++
--- /var/tmp/diff_new_pack.hocAB5/_old 2012-01-27 15:17:02.0 +0100
+++ /var/tmp/diff_new_pack.hocAB5/_new 2012-01-27 15:17:02.0 +0100
@@ -62,6 +62,10 @@
OLDRPMS=($(find $OLDDIR -name \*rpm -a ! -name \*src.rpm -a ! -name
\*.delta.rpm|sort|grep -v -- -32bit-|grep -v -- -64bit-|grep -v --
'-x86-.*\.ia64\.rpm'))
NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm -a ! -name
\*.delta.rpm|sort --field-separator=/ --key=7|grep -v -- -32bit-|grep -v --
-64bit-|grep -v -- '-x86-.*\.ia64\.rpm'))
+# Get release from first RPM and keep for rpmlint check
+release1=`rpm -qp --nodigest --nosignature --qf %{RELEASE} ${OLDRPMS[1]}`
+release2=`rpm -qp --nodigest --nosignature --qf %{RELEASE} ${NEWRPMS[1]}`
+
SUCCESS=1
rpmqp='rpm -qp --qf %{NAME} --nodigest --nosignature '
for opac in ${OLDRPMS[*]}; do
@@ -89,17 +93,19 @@
RPMLINTDIR=/home/abuild/rpmbuild/OTHER
if test -e $OLDDIR/rpmlint.log -a -e $RPMLINTDIR/rpmlint.log; then
+ file1=`mktemp`
+ file2=`mktemp`
echo comparing $OLDDIR/rpmlint.log and $RPMLINTDIR/rpmlint.log
# Sort the files first since the order of messages is not deterministic
- sort -u $OLDDIR/rpmlint.log $OLDDIR/rpmlint.log.sorted
- sort -u $RPMLINTDIR/rpmlint.log $RPMLINTDIR/rpmlint.log.sorted
- if ! cmp -s $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted; then
+ # Remove release from files
+ sort -u $OLDDIR/rpmlint.log|sed -e s,$release1, @RELEASE@, $file1
+ sort -u $RPMLINTDIR/rpmlint.log|sed -e s,$release2, @RELEASE@, $file2
+ if ! cmp -s $file1 $file2; then
echo rpmlint.log files differ:
diff -u $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log|head -n 20
-rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted
-exit 1
+SUCCESS=0
fi
- rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted
+ rm $file1 $file2
fi
if test $SUCCESS -eq 0; then
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-01-20 20:23:04 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2012-01-12 17:12:42.0 +0100 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-01-20 20:23:05.0 +0100 @@ -1,0 +2,5 @@ +Fri Jan 20 08:49:39 UTC 2012 - a...@suse.de + +- Sort rpmlint.log files first since the order is non-deterministic. + +--- Other differences: -- ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.Y5nqXQ/_old 2012-01-20 20:23:06.0 +0100 +++ /var/tmp/diff_new_pack.Y5nqXQ/_new 2012-01-20 20:23:06.0 +0100 @@ -90,11 +90,16 @@ if test -e $OLDDIR/rpmlint.log -a -e $RPMLINTDIR/rpmlint.log; then echo comparing $OLDDIR/rpmlint.log and $RPMLINTDIR/rpmlint.log - if ! cmp -s $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log; then + # Sort the files first since the order of messages is not deterministic + sort -u $OLDDIR/rpmlint.log $OLDDIR/rpmlint.log.sorted + sort -u $RPMLINTDIR/rpmlint.log $RPMLINTDIR/rpmlint.log.sorted + if ! cmp -s $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted; then echo rpmlint.log files differ: diff -u $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log|head -n 20 +rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted exit 1 fi + rm $OLDDIR/rpmlint.log.sorted $RPMLINTDIR/rpmlint.log.sorted fi if test $SUCCESS -eq 0; then -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2012-01-11 15:36:02 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2011-09-23 01:52:59.0 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new/build-compare.changes 2012-01-11 15:36:33.0 +0100 @@ -1,0 +2,5 @@ +Mon Jan 9 13:15:33 UTC 2012 - a...@suse.de + +- Compare rpmlint.log if it exists. + +--- Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.pQeHOq/_old 2012-01-11 15:36:38.0 +0100 +++ /var/tmp/diff_new_pack.pQeHOq/_new 2012-01-11 15:36:38.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package build-compare # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ License:GPL-2.0+ Group: Development/Tools/Building Summary:Build Result Compare Script -Version:2011.04.19 +Version:2012.01.09 Release:6 Source1:COPYING Source2:same-build-result.sh ++ same-build-result.sh ++ --- /var/tmp/diff_new_pack.pQeHOq/_old 2012-01-11 15:36:38.0 +0100 +++ /var/tmp/diff_new_pack.pQeHOq/_new 2012-01-11 15:36:38.0 +0100 @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2009, 2010 SUSE Linux Product GmbH, Germany. +# Copyright (c) 2009, 2010, 2012 SUSE Linux Product GmbH, Germany. # Licensed under GPL v2, see COPYING file for details. # # Written by Adrian Schroeter adr...@suse.de @@ -85,6 +85,16 @@ exit 1 fi +# Compare rpmlint.log files +RPMLINTDIR=$NEWDIRS/../OTHER +if [ -e $OLDDIR/rpmlint.log -e $RPMLINTDIR/rpmlint.log ]; then + if ! cmp -s $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log; then +echo rpmlint.log files differ: +diff -u $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log|head -n 20 +exit 1 + fi +fi + if test $SUCCESS -eq 0; then exit 1 fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2011-12-06 18:01:54 Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new (New) Package is build-compare, Maintainer is co...@suse.com Changes: Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.yTLh78/_old 2011-12-06 18:03:56.0 +0100 +++ /var/tmp/diff_new_pack.yTLh78/_new 2011-12-06 18:03:56.0 +0100 @@ -18,7 +18,7 @@ Name: build-compare -License:GPLv2+ +License:GPL-2.0+ Group: Development/Tools/Building Summary:Build Result Compare Script Version:2011.04.19 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at Mon Sep 19 21:05:29 CEST 2011. --- build-compare/build-compare.changes 2011-08-31 16:11:58.0 +0200 +++ /mounts/work_src_done/STABLE/build-compare/build-compare.changes 2011-09-17 23:08:23.0 +0200 @@ -1,0 +2,5 @@ +Sat Sep 17 21:08:18 UTC 2011 - jeng...@medozas.de + +- Remove redundant tags/sections from specfile + +--- calling whatdependson for head-i586 Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.0u6IhO/_old 2011-09-19 21:05:25.0 +0200 +++ /var/tmp/diff_new_pack.0u6IhO/_new 2011-09-19 21:05:25.0 +0200 @@ -15,13 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: build-compare License:GPLv2+ Group: Development/Tools/Building -AutoReqProv:on Summary:Build Result Compare Script Version:2011.04.19 Release:6 Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at Thu Sep 1 16:06:48 CEST 2011.
--- build-compare/build-compare.changes 2011-07-11 14:00:06.0 +0200
+++ /mounts/work_src_done/STABLE/build-compare/build-compare.changes
2011-08-31 16:11:58.0 +0200
@@ -1,0 +2,5 @@
+Wed Aug 31 14:11:39 UTC 2011 - co...@suse.com
+
+- comparing fileclass was no good idea after all
+
+---
calling whatdependson for head-i586
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.2UHE1q/_old 2011-09-01 16:05:52.0 +0200
+++ /var/tmp/diff_new_pack.2UHE1q/_new 2011-09-01 16:05:52.0 +0200
@@ -24,7 +24,7 @@
AutoReqProv:on
Summary:Build Result Compare Script
Version:2011.04.19
-Release:4
+Release:6
Source1:COPYING
Source2:same-build-result.sh
Source3:rpm-check.sh
++ functions.sh ++
--- /var/tmp/diff_new_pack.2UHE1q/_old 2011-09-01 16:05:52.0 +0200
+++ /var/tmp/diff_new_pack.2UHE1q/_new 2011-09-01 16:05:52.0 +0200
@@ -110,9 +110,10 @@
# differ, depending on which file system the package was built. To not
# have to filter out directories we simply ignore all sizes.
# Also leave out FILEDEVICES, FILEINODES (depends on the build host),
-# FILECOLORS, FILEDEPENDSX and FILEDEPENDSN.
+# FILECOLORS, FILECLASS (normally useful but file output contains mtimes),
+# FILEDEPENDSX and FILEDEPENDSN.
# Also FILELANGS (or?)
-QF=[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILECLASS}
%{FILEMODES:octal} %{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS}
%{FILEVERIFYFLAGS} %{FILELINKTOS}\n]\\n
+QF=[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILEMODES:octal}
%{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS} %{FILEVERIFYFLAGS}
%{FILELINKTOS}\n]\\n
# ??? what to do with FILEPROVIDE and FILEREQUIRE?
check_header $oldrpm $file1
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at Tue Jul 12 12:04:55 CEST 2011.
--- build-compare/build-compare.changes 2011-05-20 20:30:15.0 +0200
+++ /mounts/work_src_done/STABLE/build-compare/build-compare.changes
2011-07-11 14:00:06.0 +0200
@@ -1,0 +2,5 @@
+Mon Jul 11 13:58:52 CEST 2011 - dmuel...@suse.de
+
+- also compare fileclass
+
+---
calling whatdependson for head-i586
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.43Hxr8/_old 2011-07-12 11:53:06.0 +0200
+++ /var/tmp/diff_new_pack.43Hxr8/_new 2011-07-12 11:53:06.0 +0200
@@ -24,7 +24,7 @@
AutoReqProv:on
Summary:Build Result Compare Script
Version:2011.04.19
-Release:2
+Release:4
Source1:COPYING
Source2:same-build-result.sh
Source3:rpm-check.sh
@@ -38,7 +38,6 @@
to a former build.
-
%prep
mkdir $RPM_BUILD_DIR/%name-%version
%setup -T 0 -D
++ functions.sh ++
--- /var/tmp/diff_new_pack.43Hxr8/_old 2011-07-12 11:53:06.0 +0200
+++ /var/tmp/diff_new_pack.43Hxr8/_new 2011-07-12 11:53:06.0 +0200
@@ -110,9 +110,9 @@
# differ, depending on which file system the package was built. To not
# have to filter out directories we simply ignore all sizes.
# Also leave out FILEDEVICES, FILEINODES (depends on the build host),
-# FILECOLORS, FILECLASS (???), FILEDEPENDSX and FILEDEPENDSN.
+# FILECOLORS, FILEDEPENDSX and FILEDEPENDSN.
# Also FILELANGS (or?)
-QF=[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILEMODES:octal}
%{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS} %{FILEVERIFYFLAGS}
%{FILELINKTOS}\n]\\n
+QF=[%{FILENAMES} %{FILEFLAGS} %{FILESTATES} %{FILECLASS}
%{FILEMODES:octal} %{FILEUSERNAME} %{FILEGROUPNAME} %{FILERDEVS}
%{FILEVERIFYFLAGS} %{FILELINKTOS}\n]\\n
# ??? what to do with FILEPROVIDE and FILEREQUIRE?
check_header $oldrpm $file1
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at Mon May 23 15:18:09 CEST 2011. --- build-compare/build-compare.changes 2011-04-19 15:37:48.0 +0200 +++ /mounts/work_src_done/STABLE/build-compare/build-compare.changes 2011-05-20 20:30:15.0 +0200 @@ -1,0 +2,5 @@ +Fri May 20 18:29:57 UTC 2011 - a...@suse.de + +- Remove debug echo output. + +--- calling whatdependson for head-i586 Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.oN23hp/_old 2011-05-23 15:16:58.0 +0200 +++ /var/tmp/diff_new_pack.oN23hp/_new 2011-05-23 15:16:58.0 +0200 @@ -24,7 +24,7 @@ AutoReqProv:on Summary:Build Result Compare Script Version:2011.04.19 -Release:1 +Release:2 Source1:COPYING Source2:same-build-result.sh Source3:rpm-check.sh ++ rpm-check.sh ++ --- /var/tmp/diff_new_pack.oN23hp/_old 2011-05-23 15:16:58.0 +0200 +++ /var/tmp/diff_new_pack.oN23hp/_new 2011-05-23 15:16:58.0 +0200 @@ -150,7 +150,6 @@ return 0 ;; *.a) - echo $file is .a flist=`ar t new/$file` pwd=$PWD fdir=`dirname $file` Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at Wed Apr 20 13:56:45 CEST 2011. --- build-compare/build-compare.changes 2011-03-15 09:37:03.0 +0100 +++ /mounts/work_src_done/STABLE/build-compare/build-compare.changes 2011-04-19 15:37:48.0 +0200 @@ -1,0 +2,5 @@ +Tue Apr 19 11:47:57 UTC 2011 - a...@suse.de + +- Handle libreoffice-bootstrap. + +--- calling whatdependson for head-i586 Other differences: -- ++ build-compare.spec ++ --- /var/tmp/diff_new_pack.EWDWdR/_old 2011-04-20 13:56:31.0 +0200 +++ /var/tmp/diff_new_pack.EWDWdR/_new 2011-04-20 13:56:31.0 +0200 @@ -23,8 +23,8 @@ Group: Development/Tools/Building AutoReqProv:on Summary:Build Result Compare Script -Version:2011.02.28 -Release:2 +Version:2011.04.19 +Release:1 Source1:COPYING Source2:same-build-result.sh Source3:rpm-check.sh ++ rpm-check.sh ++ --- /var/tmp/diff_new_pack.EWDWdR/_old 2011-04-20 13:56:31.0 +0200 +++ /var/tmp/diff_new_pack.EWDWdR/_new 2011-04-20 13:56:31.0 +0200 @@ -379,6 +379,18 @@ sed -i -e 's%td[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+ [0-9]\+:[0-9]\+:[0-9]\+ + 201[0-9]/td%tdMon Sep 20 19:02:43 + 2010/td%g' $f done ;; +*/Linux*Env.Set.sh) + # LibreOffice files, contains: + # Generated on: Mon Apr 18 13:19:22 UTC 2011 + for f in old/$file new/$file; do +sed -i -e 's%^# Generated on:.*UTC 201[0-9] *$%# Generated on: Sometime%g' $f + done + ;; +/usr/lib/libreoffice/solver/inc/*/deliver.log) + # LibreOffice log file + echo Ignore $file + return 0 + ;; esac ftype=`/usr/bin/file old/$file | cut -d: -f2-` Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit build-compare for openSUSE:Factory
Hello community,
here is the log from the commit of package build-compare for openSUSE:Factory
checked in at Wed Mar 16 11:34:13 CET 2011.
--- build-compare/build-compare.changes 2011-02-28 15:00:49.0 +0100
+++ /mounts/work_src_done/STABLE/build-compare/build-compare.changes
2011-03-15 09:37:03.0 +0100
@@ -1,0 +2,5 @@
+Tue Mar 15 08:36:26 UTC 2011 - a...@suse.de
+
+- Use perl -e instead of -E (bnc#679562).
+
+---
calling whatdependson for head-i586
Other differences:
--
++ build-compare.spec ++
--- /var/tmp/diff_new_pack.P9VPMf/_old 2011-03-16 11:31:31.0 +0100
+++ /var/tmp/diff_new_pack.P9VPMf/_new 2011-03-16 11:31:31.0 +0100
@@ -24,7 +24,7 @@
AutoReqProv:on
Summary:Build Result Compare Script
Version:2011.02.28
-Release:1
+Release:2
Source1:COPYING
Source2:same-build-result.sh
Source3:rpm-check.sh
++ rpm-check.sh ++
--- /var/tmp/diff_new_pack.P9VPMf/_old 2011-03-16 11:31:31.0 +0100
+++ /var/tmp/diff_new_pack.P9VPMf/_new 2011-03-16 11:31:31.0 +0100
@@ -1,6 +1,6 @@
#! /bin/bash
#
-# Copyright (c) 2009, 2010 SUSE Linux Product GmbH, Germany.
+# Copyright (c) 2009, 2010, 2011 SUSE Linux Product GmbH, Germany.
# Licensed under GPL v2, see COPYING file for details.
#
# Written by Michael Matz and Stephan Coolo
@@ -219,8 +219,8 @@
done
return $ret;;
*.pyc|*.pyo)
-perl -E open fh, '+', 'old/$file'; seek fh, 3, SEEK_SET; print fh
'';
-perl -E open fh, '+', 'new/$file'; seek fh, 3, SEEK_SET; print fh
'';
+perl -e open fh, '+', 'old/$file'; seek fh, 3, SEEK_SET; print fh
'';
+perl -e open fh, '+', 'new/$file'; seek fh, 3, SEEK_SET; print fh
'';
;;
*.bz2)
bunzip2 -c old/$file old/${file/.bz2/}
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
