Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package orcania for openSUSE:Factory checked in at 2021-06-09 21:52:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orcania (Old) and /work/SRC/openSUSE:Factory/.orcania.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orcania" Wed Jun 9 21:52:00 2021 rev:9 rq:897971 version:2.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/orcania/orcania.changes 2021-03-30 21:18:36.945837879 +0200 +++ /work/SRC/openSUSE:Factory/.orcania.new.32437/orcania.changes 2021-06-09 21:52:16.182471278 +0200 @@ -1,0 +2,6 @@ +Sat Jun 5 13:27:14 UTC 2021 - Martin Hauke <[email protected]> + +- Update to version 2.2.1 + * Add ld flags in liborcania.pc on static build + +------------------------------------------------------------------- Old: ---- orcania-2.2.0.tar.gz New: ---- orcania-2.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orcania.spec ++++++ --- /var/tmp/diff_new_pack.kAXM07/_old 2021-06-09 21:52:16.834472440 +0200 +++ /var/tmp/diff_new_pack.kAXM07/_new 2021-06-09 21:52:16.838472448 +0200 @@ -19,7 +19,7 @@ %define sover 2_2 Name: orcania -Version: 2.2.0 +Version: 2.2.1 Release: 0 Summary: MISC function Library License: LGPL-2.1-or-later ++++++ orcania-2.2.0.tar.gz -> orcania-2.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orcania-2.2.0/.gitignore new/orcania-2.2.1/.gitignore --- old/orcania-2.2.0/.gitignore 2021-02-27 19:14:14.000000000 +0100 +++ new/orcania-2.2.1/.gitignore 2021-06-02 13:42:40.000000000 +0200 @@ -3,6 +3,7 @@ *.so.* *.a *.pc +*.log str_test split_test memory_test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orcania-2.2.0/CHANGELOG.md new/orcania-2.2.1/CHANGELOG.md --- old/orcania-2.2.0/CHANGELOG.md 2021-02-27 19:14:14.000000000 +0100 +++ new/orcania-2.2.1/CHANGELOG.md 2021-06-02 13:42:40.000000000 +0200 @@ -1,5 +1,9 @@ # Orcania Changelog +## 2.2.1 + +- Add ld flags in liborcania.pc on static build + ## 2.2.0 - Add command-line tool `base64url` which is similar to GNU `base64` tool but for `base64url` format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orcania-2.2.0/CMakeLists.txt new/orcania-2.2.1/CMakeLists.txt --- old/orcania-2.2.0/CMakeLists.txt 2021-02-27 19:14:14.000000000 +0100 +++ new/orcania-2.2.1/CMakeLists.txt 2021-06-02 13:42:40.000000000 +0200 @@ -30,7 +30,7 @@ set(PROJECT_BUGREPORT_PATH "https://github.com/babelouest/orcania/issues";) set(LIBRARY_VERSION_MAJOR "2") set(LIBRARY_VERSION_MINOR "2") -set(LIBRARY_VERSION_PATCH "0") +set(LIBRARY_VERSION_PATCH "1") set(LIBS "-lm") set(PROJECT_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orcania-2.2.0/liborcania.pc.in new/orcania-2.2.1/liborcania.pc.in --- old/orcania-2.2.0/liborcania.pc.in 2021-02-27 19:14:14.000000000 +0100 +++ new/orcania-2.2.1/liborcania.pc.in 2021-06-02 13:42:40.000000000 +0200 @@ -9,5 +9,5 @@ Version: @LIBRARY_VERSION@ Requires: @PKGCONF_REQ@ Requires.private: @PKGCONF_REQ_PRIVATE@ -Libs: -L${libdir} -lorcania +Libs: -L${libdir} -lorcania @LIB_STATIC@ Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orcania-2.2.0/src/Makefile new/orcania-2.2.1/src/Makefile --- old/orcania-2.2.0/src/Makefile 2021-02-27 19:14:14.000000000 +0100 +++ new/orcania-2.2.1/src/Makefile 2021-06-02 13:42:40.000000000 +0200 @@ -34,9 +34,10 @@ OUTPUT=liborcania.so VERSION_MAJOR=2 VERSION_MINOR=2 -VERSION_PATCH=0 +VERSION_PATCH=1 OBJECTS=orcania.o memory.o base64.o -LIBS=-lc -lm +LIBSDEP=-lm +LIBS=-lc SONAME = -soname ifeq ($(shell uname -s),Darwin) @@ -79,12 +80,13 @@ @sed -i -e 's/@LIBRARY_VERSION@/$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)/g' $(PKGCONFIG_FILE) @sed -i -e 's/@PKGCONF_REQ@/$(PKGCONF_REQ)/g' $(PKGCONFIG_FILE) @sed -i -e 's/@PKGCONF_REQ_PRIVATE@/$(PKGCONF_REQ_PRIVATE)/g' $(PKGCONFIG_FILE) + @sed -i -e 's/@LIB_STATIC@/$(LIB_STATIC)/g' $(PKGCONFIG_FILE) -liborcania.so: $(OBJECTS) - $(CC) -shared -fPIC -Wl,$(SONAME),$(OUTPUT) -o $(OUTPUT).$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH) $(OBJECTS) $(LIBS) $(LDFLAGS) +liborcania.so: $(OBJECTS) $(PKGCONFIG_FILE) + $(CC) -shared -fPIC -Wl,$(SONAME),$(OUTPUT) -o $(OUTPUT).$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH) $(OBJECTS) $(LIBS) $(LIBSDEP) $(LDFLAGS) ln -sf $(OUTPUT).$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH) $(OUTPUT) -liborcania.a: $(OBJECTS) +liborcania.a: $(OBJECTS) $(PKGCONFIG_FILE) ar rcs liborcania.a $(OBJECTS) %.o: %.c $(CONFIG_FILE) ../include/orcania.h @@ -93,7 +95,7 @@ clean: rm -f *.o *.so *.a $(OUTPUT) $(OUTPUT).* $(CONFIG_FILE) $(PKGCONFIG_FILE) -install: all $(PKGCONFIG_FILE) +install: all install $(OUTPUT).$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH) $(DESTDIR)/lib mkdir -p $(DESTDIR)/lib/pkgconfig/ $(DESTDIR)/include install -m644 $(PKGCONFIG_FILE) $(DESTDIR)/lib/pkgconfig/ @@ -127,6 +129,10 @@ static-debug: liborcania.a +static-debug: LIB_STATIC=$(LIBSDEP) + static: ADDITIONALFLAGS=-O3 static: liborcania.a + +static: LIB_STATIC=$(LIBSDEP) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orcania-2.2.0/test/Makefile new/orcania-2.2.1/test/Makefile --- old/orcania-2.2.0/test/Makefile 2021-02-27 19:14:14.000000000 +0100 +++ new/orcania-2.2.1/test/Makefile 2021-06-02 13:42:40.000000000 +0200 @@ -7,47 +7,32 @@ ORCANIA_LOCATION=../src INCLUDE_LOCATION=../include ORCANIA_LIBRARY=$(ORCANIA_LOCATION)/liborcania.so -LIBS=-lc -lorcania $(shell pkg-config --libs check) -L$(ORCANIA_LOCATION) +LDFLAGS=-lc -lorcania $(shell pkg-config --libs check) -L$(ORCANIA_LOCATION) VALGRIND_COMMAND=valgrind --tool=memcheck --leak-check=full --show-leak-kinds=all +TARGET=str_test split_test memory_test pointer_list_test +VERBOSE=0 +MEMCHECK=0 all: test clean: - rm -f *.o str_test split_test memory_test pointer_list_test valgrind-*.txt + rm -f *.o $(TARGET) *.log valgrind-*.txt -liborcania.so: - cd $(ORCANIA_LOCATION) && $(MAKE) debug +$(ORCANIA_LIBRARY): $(ORCANIA_LOCATION)/orcania.c $(ORCANIA_LOCATION)/memory.c $(ORCANIA_LOCATION)/base64.c + cd $(ORCANIA_LOCATION) && $(MAKE) debug $* -str_test: str_test.c - $(CC) $(CFLAGS) str_test.c -o str_test $(LIBS) +%: %.c + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -test_str_test: liborcania.so str_test - -LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} ./str_test - -split_test: split_test.c - $(CC) $(CFLAGS) split_test.c -o split_test $(LIBS) - -test_split_test: liborcania.so split_test - -LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} ./split_test - -memory_test: memory_test.c - $(CC) $(CFLAGS) memory_test.c -o memory_test $(LIBS) - -test_memory_test: liborcania.so memory_test - -LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} ./memory_test - -pointer_list_test: pointer_list_test.c - $(CC) $(CFLAGS) pointer_list_test.c -o pointer_list_test $(LIBS) - -test_pointer_list_test: liborcania.so pointer_list_test - -LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} ./pointer_list_test - -test: test_str_test test_split_test test_memory_test test_pointer_list_test +test: $(ORCANIA_LIBRARY) $(TARGET) test_str_test test_split_test test_memory_test test_pointer_list_test check: test -memcheck: $(ORCANIA_LIBRARY) str_test split_test memory_test pointer_list_test - -CK_FORK=no LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} $(VALGRIND_COMMAND) ./str_test 2>valgrind-str_test.txt - -CK_FORK=no LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} $(VALGRIND_COMMAND) ./split_test 2>valgrind-split_test.txt - -CK_FORK=no LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} $(VALGRIND_COMMAND) ./memory_test 2>valgrind-memory_test.txt - -CK_FORK=no LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} $(VALGRIND_COMMAND) ./pointer_list_test 2>valgrind-pointer_list_test.txt +test_%: % $(ORCANIA_LIBRARY) + @if [ "$(VERBOSE)" = "0" ] && [ "$(MEMCHECK)" = "0" ]; then \ + LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} ./run_test.sh ./$^; \ + elif [ "$(MEMCHECK)" = "0" ]; then \ + LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} ./$^ ; \ + else \ + CK_FORK=no LD_LIBRARY_PATH=$(ORCANIA_LOCATION):${LD_LIBRARY_PATH} $(VALGRIND_COMMAND) ./$^ 2>[email protected]; \ + fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orcania-2.2.0/test/run_test.sh new/orcania-2.2.1/test/run_test.sh --- old/orcania-2.2.0/test/run_test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/orcania-2.2.1/test/run_test.sh 2021-06-02 13:42:40.000000000 +0200 @@ -0,0 +1,27 @@ +#!/bin/bash + +printf_new() { + str=$1 + num=$2 + v=$(printf "%-${num}s" "$str") + printf "${v// / }" +} + +RED='\033[0;31m' +GREEN='\033[0;32m' +NC='\033[0m' # No Color +COMMAND=$1 +CHRLEN=${#COMMAND} +NBSP=$((32-$CHRLEN)) + +printf "Run $1" +printf_new " " $NBSP + +$1 $2 $3 $4 $5 $6 $7 $8 $9 1>$1.log 2>&1 + +if [ $? -ne 0 ] +then + printf "${RED}FAIL${NC}\n" +else + printf "${GREEN}SUCCESS${NC}\n" +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orcania-2.2.0/tools/base64url/Makefile new/orcania-2.2.1/tools/base64url/Makefile --- old/orcania-2.2.0/tools/base64url/Makefile 2021-02-27 19:14:14.000000000 +0100 +++ new/orcania-2.2.1/tools/base64url/Makefile 2021-06-02 13:42:40.000000000 +0200 @@ -25,7 +25,7 @@ CFLAGS+=-Wall -I$(ORCANIA_INCLUDE) $(ADDITIONALFLAGS) $(CPPFLAGS) LIBS=-lc -lorcania -L$(ORCANIA_LOCATION) -ORCANIA_LIBRARY=../../src/librhonabwy.so +ORCANIA_LIBRARY=../../src/liborcania.so VALGRIND_COMMAND=valgrind --tool=memcheck --leak-check=full --show-leak-kinds=all --track-origins=yes all: base64url
