Hello community,
here is the log from the commit of package orcania for openSUSE:Factory checked
in at 2019-07-23 22:35:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/orcania (Old)
and /work/SRC/openSUSE:Factory/.orcania.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orcania"
Tue Jul 23 22:35:53 2019 rev:5 rq:717660 version:2.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/orcania/orcania.changes 2019-07-08
15:11:45.455387262 +0200
+++ /work/SRC/openSUSE:Factory/.orcania.new.4126/orcania.changes
2019-07-23 22:35:55.398989390 +0200
@@ -1,0 +2,9 @@
+Fri Jul 12 20:59:29 UTC 2019 - Martin Hauke <mar...@gmx.de>
+
+- Update to version 2.0.1
+ * Fix double free() on `pointer_list_remove_at`
+ * Clean build process
+ * Fix config option STRTSR so cmake and makefile will use the
+ same name
+
+-------------------------------------------------------------------
Old:
----
orcania-2.0.0.tar.gz
New:
----
orcania-2.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ orcania.spec ++++++
--- /var/tmp/diff_new_pack.dqUEee/_old 2019-07-23 22:35:55.874989291 +0200
+++ /var/tmp/diff_new_pack.dqUEee/_new 2019-07-23 22:35:55.878989290 +0200
@@ -19,7 +19,7 @@
%define sover 2_0
Name: orcania
-Version: 2.0.0
+Version: 2.0.1
Release: 0
Summary: MISC function Library
License: LGPL-2.1-or-later
++++++ orcania-2.0.0.tar.gz -> orcania-2.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/orcania-2.0.0/.travis.yml
new/orcania-2.0.1/.travis.yml
--- old/orcania-2.0.0/.travis.yml 2019-06-27 23:54:43.000000000 +0200
+++ new/orcania-2.0.1/.travis.yml 2019-07-09 16:14:08.000000000 +0200
@@ -5,18 +5,35 @@
language: c
addons:
apt:
- packages: [ check, libsubunit-dev, cppcheck ]
+ packages: [ check, libsubunit-dev, cppcheck, pkg-config ]
matrix:
include:
- - os: linux
+ - env: LABEL=linux-gcc
+ os: linux
compiler: gcc
- - os: linux
+ - env: LABEL=lnux-clang
+ os: linux
compiler: clang
- env: LABEL=cppcheck
+ os: osx
+ addons:
+ homebrew:
+ packages:
+ - check
+ - pkg-config
+ update: true
+ script:
+ - mkdir build && cd build
+ - cmake -DBUILD_ORCANIA_TESTING=on ..
+ - make test
+ - env: LABEL=osx
os: linux
script:
- cppcheck --force --enable=warning,missingInclude --error-exitcode=1
. >build.log 2>&1 || (cat build.log && exit 1)
script:
+ - pushd test
+ - make test
+ - popd
- mkdir build && cd build
- cmake -DBUILD_ORCANIA_TESTING=on ..
- make test package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/orcania-2.0.0/CHANGELOG.md
new/orcania-2.0.1/CHANGELOG.md
--- old/orcania-2.0.0/CHANGELOG.md 2019-06-27 23:54:43.000000000 +0200
+++ new/orcania-2.0.1/CHANGELOG.md 2019-07-09 16:14:08.000000000 +0200
@@ -1,5 +1,12 @@
# Orcania Changelog
+## 2.0.1
+
+- Fix double free() on `pointer_list_remove_at`
+- Fix build for MacOSX (thanks JohnAZoidberg!)
+- Clean build process
+- Fix config option STRTSR so cmake and makefile will use the same name
+
## 2.0.0
- Add struct _pointer_list to manage arrays of pointers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/orcania-2.0.0/CMakeLists.txt
new/orcania-2.0.1/CMakeLists.txt
--- old/orcania-2.0.0/CMakeLists.txt 2019-06-27 23:54:43.000000000 +0200
+++ new/orcania-2.0.1/CMakeLists.txt 2019-07-09 16:14:08.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 "0")
-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}")
@@ -74,9 +74,9 @@
option(WITH_STRSTR "Use inline implementation of strstr" OFF)
if (WITH_STRSTR)
- set(STRSTR ON)
+ set(O_STRSTR ON)
else ()
- set(STRSTR OFF)
+ set(O_STRSTR OFF)
endif ()
set(PKGCONF_REQ "")
@@ -115,13 +115,13 @@
# tests
-option(BUILD_ORCANIA_TESTING "Build the testing tree." OFF) # because we don
not use include(CTest)
+option(BUILD_ORCANIA_TESTING "Build the testing tree." OFF) # because we do
not use include(CTest)
if (BUILD_ORCANIA_TESTING)
include(FindCheck)
find_package(Check)
if (CHECK_FOUND)
- if (NOT WIN32)
+ if (NOT WIN32 AND NOT APPLE)
include(FindSubunit)
find_package(Subunit REQUIRED)
endif ()
@@ -134,13 +134,20 @@
set(LIBS orcania ${LIBS} ${CHECK_LIBRARIES})
if (NOT WIN32)
find_package(Threads REQUIRED)
- set(LIBS ${LIBS} ${SUBUNIT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m
rt)
+ set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT} m)
+ endif ()
+ if (NOT APPLE)
+ set(LIBS ${LIBS} rt)
+ endif ()
+ if (NOT WIN32 AND NOT APPLE)
+ set(LIBS ${LIBS} ${SUBUNIT_LIBRARIES} rt)
endif ()
set(TESTS
str_test
split_test
- memory_test)
+ memory_test
+ pointer_list_test)
configure_file(
"${CMAKE_MODULE_PATH}/CTestCustom.cmake.in"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/orcania-2.0.0/include/orcania-cfg.h.in
new/orcania-2.0.1/include/orcania-cfg.h.in
--- old/orcania-2.0.0/include/orcania-cfg.h.in 2019-06-27 23:54:43.000000000
+0200
+++ new/orcania-2.0.1/include/orcania-cfg.h.in 2019-07-09 16:14:08.000000000
+0200
@@ -28,6 +28,6 @@
#define _ORCANIA_CFG_H_
#define ORCANIA_VERSION ${PROJECT_VERSION}
-#cmakedefine STRSTR
+#cmakedefine O_STRSTR
#endif /* _ORCANIA_CFG_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/orcania-2.0.0/src/Makefile
new/orcania-2.0.1/src/Makefile
--- old/orcania-2.0.0/src/Makefile 2019-06-27 23:54:43.000000000 +0200
+++ new/orcania-2.0.1/src/Makefile 2019-07-09 16:14:08.000000000 +0200
@@ -32,10 +32,15 @@
CC=gcc
CFLAGS+=-c -fPIC -Wall -Werror -Wextra -I$(ORCANIA_INCLUDE) -D_REENTRANT
$(ADDITIONALFLAGS) $(CPPFLAGS)
OUTPUT=liborcania.so
-VERSION=2.0.0
+VERSION=2.0.1
OBJECTS=orcania.o memory.o base64.o
LIBS=-lc -lm
+SONAME = -soname
+ifeq ($(shell uname -s),Darwin)
+ SONAME = -install_name
+endif
+
ifdef STRSTRFLAG
STRSTR=1
else
@@ -49,10 +54,10 @@
@echo Config file $(CONFIG_FILE) generated
@sed -i -e 's/$${PROJECT_VERSION}/$(VERSION)/g' $(CONFIG_FILE)
@if [ "$(STRSTR)" = "1" ]; then \
- sed -i -e 's/\#cmakedefine STRSTR/\#define O_STRSTR/g'
$(CONFIG_FILE); \
+ sed -i -e 's/\#cmakedefine O_STRSTR/\#define O_STRSTR/g'
$(CONFIG_FILE); \
echo "FORCE IMPLEMENT STRSTR ENABLED"; \
else \
- sed -i -e 's/\#cmakedefine STRSTR/\/* #undef O_STRSTR *\//g'
$(CONFIG_FILE); \
+ sed -i -e 's/\#cmakedefine O_STRSTR/\/* #undef O_STRSTR *\//g'
$(CONFIG_FILE); \
echo "FORCE IMPLEMENT STRSTR DISABLED"; \
fi
@@ -70,7 +75,7 @@
@sed -i -e 's/@PKGCONF_REQ_PRIVATE@/$(PKGCONF_REQ_PRIVATE)/g'
$(PKGCONFIG_FILE)
liborcania.so: $(OBJECTS)
- $(CC) -shared -fPIC -Wl,-soname,$(OUTPUT) -o $(OUTPUT).$(VERSION)
$(OBJECTS) $(LIBS) $(LDFLAGS)
+ $(CC) -shared -fPIC -Wl,$(SONAME),$(OUTPUT) -o $(OUTPUT).$(VERSION)
$(OBJECTS) $(LIBS) $(LDFLAGS)
ln -sf $(OUTPUT).$(VERSION) $(OUTPUT)
liborcania.a: $(OBJECTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/orcania-2.0.0/src/orcania.c
new/orcania-2.0.1/src/orcania.c
--- old/orcania-2.0.0/src/orcania.c 2019-06-27 23:54:43.000000000 +0200
+++ new/orcania-2.0.1/src/orcania.c 2019-07-09 16:14:08.000000000 +0200
@@ -685,6 +685,7 @@
pointer_list->list = o_realloc(pointer_list->list,
(pointer_list->size-1)*sizeof(void *));
} else {
o_free(pointer_list->list);
+ pointer_list->list = NULL;
}
pointer_list->size--;
return 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/orcania-2.0.0/test/Makefile
new/orcania-2.0.1/test/Makefile
--- old/orcania-2.0.0/test/Makefile 2019-06-27 23:54:43.000000000 +0200
+++ new/orcania-2.0.1/test/Makefile 2019-07-09 16:14:08.000000000 +0200
@@ -23,7 +23,7 @@
CFLAGS+=-Wall -D_REENTRANT -DDEBUG -g -O0 -I$(INCLUDE_LOCATION) $(CPPFLAGS)
ORCANIA_LOCATION=../src
INCLUDE_LOCATION=../include
-LIBS=-lc -lorcania -lcheck -lpthread -lm -lrt -lsubunit -L$(ORCANIA_LOCATION)
+LIBS=-lc -lorcania $(shell pkg-config --libs check) -L$(ORCANIA_LOCATION)
all: test
