-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
fc66a27
commit 8a653da
Showing
4 changed files
with
11 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,9 @@ | ||
# Ulfius Changelog | ||
|
||
## 2.3.4 | ||
|
||
- Fix Makefile soname | ||
|
||
## 2.3.3 | ||
|
||
- Add Debian hardening patch on Makefile | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,10 +28,10 @@ set(PROJECT_BUGREPORT_PATH "https://github.com/babelouest/ulfius/issues") | |
|
||
set(LIBRARY_VERSION_MAJOR "2") | ||
set(LIBRARY_VERSION_MINOR "3") | ||
set(LIBRARY_VERSION_PATCH "3") | ||
set(LIBRARY_VERSION_PATCH "4") | ||
set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") | ||
set(LIBRARY_SOVERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}") | ||
set(YDER_VERSION_DOWNLOAD "1.3.1") | ||
set(YDER_VERSION_DOWNLOAD "1.3.3") | ||
|
||
# cmake modules | ||
|
||
|
@@ -285,7 +285,7 @@ set(CPACK_DEBIAN_PACKAGE_NAME "libulfius") | |
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "[email protected]") | ||
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION}) | ||
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://babelouest.github.io/ulfius/") | ||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.4), liborcania (>= 1.2.0), libyder (>= 1.2.0)") | ||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.4), liborcania (>= 1.2), libyder (>= 1.3)") | ||
if (WITH_CURL) | ||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libcurl3-gnutls (>= 7.16.2)") | ||
endif () | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
# | ||
# Makefile used to build the software | ||
# | ||
# Copyright 2015-2017 Nicolas Mora <[email protected]> | ||
# Copyright 2015-2018 Nicolas Mora <[email protected]> | ||
# | ||
# This program is free software; you can redistribute it and/or | ||
# modify it under the terms of the GNU Lesser General Public License | ||
|
@@ -27,7 +27,7 @@ CC=gcc | |
CFLAGS+=-c -pedantic -std=gnu99 -fPIC -Wall -D_REENTRANT -I$(DESTDIR)/include -I$(ULFIUS_INCLUDE) -I$(LIBORCANIA_LOCATION) -I$(LIBYDER_LOCATION) $(ADDITIONALFLAGS) $(JANSSONFLAG) $(CURLFLAG) $(WEBSOCKETFLAG) $(CPPFLAGS) | ||
LIBS=-L$(DESTDIR)/lib -L$(LIBORCANIA_LOCATION) -L$(LIBYDER_LOCATION) -lc -lmicrohttpd -lyder -lorcania -lpthread $(LDFLAGS) | ||
OUTPUT=libulfius.so | ||
VERSION=2.3.3 | ||
VERSION=2.3.4 | ||
|
||
ifndef JANSSONFLAG | ||
LJANSSON=-ljansson | ||
|
@@ -44,7 +44,7 @@ endif | |
all: release | ||
|
||
libulfius.so: ulfius.o u_map.o u_request.o u_response.o u_send_request.o u_websocket.o | ||
$(CC) -shared -Wl,-soname,$(OUTPUT).$(VERSION) -o $(OUTPUT).$(VERSION) ulfius.o u_map.o u_request.o u_response.o u_send_request.o u_websocket.o $(LIBS) $(LJANSSON) $(LCURL) $(LWEBSOCKET) | ||
$(CC) -shared -fPIC -Wl,-soname,$(OUTPUT) -o $(OUTPUT).$(VERSION) ulfius.o u_map.o u_request.o u_response.o u_send_request.o u_websocket.o $(LIBS) $(LJANSSON) $(LCURL) $(LWEBSOCKET) | ||
ln -sf $(OUTPUT).$(VERSION) $(OUTPUT) | ||
|
||
libulfius.a: ulfius.o u_map.o u_request.o u_response.o u_send_request.o u_websocket.o | ||
|