Prepare for release and kill pcre dependency.

repsheet · Apr 8, 2015 · c55e575 · c55e575
1 parent 38745b9
commit c55e575
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 11 deletions.
diff --git a/.doxygen b/.doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "librepsheet"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.0.0
+PROJECT_NUMBER         = 4.1.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-08  Aaron Bedra  <[email protected]>
+
+	* 4.1.0: Remove pcre dependency for remote_address
+
 2015-04-07  Aaron Bedra  <[email protected]>
 
 	* 4.0.0: Unifies keyspace (Breaking changes)

diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.61)
-AC_INIT([librepsheet], [4.0.0], [[email protected]])
+AC_INIT([librepsheet], [4.1.0], [[email protected]])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+librepsheet (4.1.0-1) unstable-security; urgency=medium
+
+  * Updates for remote_address that remove the pcre dependency
+
+ -- Aaron Bedra <[email protected]>  Wed, 08 Apr 2015 11:32:04 -0500
+
 librepsheet (4.0.0-1) unstable-security; urgency=medium
 
   * Unifies keyspace (Breaking changes)

diff --git a/debian/control b/debian/control
@@ -2,20 +2,20 @@ Source: librepsheet
 Section: libs
 Priority: optional
 Maintainer: Aaron Bedra <[email protected]>
-Build-Depends: debhelper (>> 8), libhiredis-dev, libpcre3-dev
+Build-Depends: debhelper (>> 8), libhiredis-dev
 Standards-Version: 3.9.1
 
 Package: librepsheet
 Section: libs
 Architecture: any
-Depends: libhiredis0.10, libpcre3, ${shlibs:Depends}, ${misc:Depends}
+Depends: libhiredis0.10, ${shlibs:Depends}, ${misc:Depends}
 Description: Core library
  This library holds the business logic for Repsheet
 
 Package: librepsheet-dev
 Section: libdevel
 Architecture: any
-Depends: libhiredis-dev, libpcre3-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libhiredis-dev, ${shlibs:Depends}, ${misc:Depends}
 Description: Core library - development files
  This library holds the business logic for Repsheet
  .

diff --git a/rpmbuild/SPECS/librepsheet.spec b/rpmbuild/SPECS/librepsheet.spec
@@ -1,5 +1,5 @@
 Name: repsheet
-Version: 4.0.0
+Version: 4.1.0
 Release: 1
 Summary: Core library
 License: ASL 2.0
@@ -8,7 +8,7 @@ URL: https://github.com/repsheet/librepsheet
 Source0: https://github.com/repsheet/librepsheet/archive/%{name}-%{version}.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: hiredis
-BuildRequires: pcre-devel hiredis-devel gcc automake autoconf libtool check check-devel
+BuildRequires: hiredis-devel gcc automake autoconf libtool check check-devel
 
 %description
 This library contains the business logic for Repsheet
@@ -72,6 +72,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Wed Apr 08 2015 Aaron Bedra <[email protected]> - 4.1.0-1
+- Updates for remote_address that remove the pcre dependency
 * Tue Apr 07 2015 Aaron Bedra <[email protected]> - 4.0.0-1
 - Unifies Keyspace (Breaking changes)
 * Mon Dec 08 2014 Aaron Bedra <[email protected]> - 3.2.0-1

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -8,4 +8,4 @@ librepsheet_la_SOURCES = librepsheet.c \
                          whitelist.c   \
                          marked.c      \
                          xff.c
-librepsheet_la_LDFLAGS = -lhiredis -lpcre -lm
+librepsheet_la_LDFLAGS = -lhiredis -lm
diff --git a/src/librepsheet.c b/src/librepsheet.c
@@ -1,6 +1,5 @@
 #include <stdlib.h>
 #include <string.h>
-#include <pcre.h>
 
 #include "hiredis/hiredis.h"
 
@@ -29,7 +28,7 @@
  *
  * To build librepsheet you will need the following dependencies:
  *
- * - autoconf, automake, libtool, libpcre, hiredis, check (optional for tests)
+ * - autoconf, automake, libtool, hiredis, check (optional for tests)
  *
  * The library can be built and installed using the following commands:
  *

diff --git a/src/xff.c b/src/xff.c
@@ -19,6 +19,7 @@
  *
  * @param connected_address The IP of the connection to the server
  * @param xff_header The contents of the X-Forwarded-For header
+ * @param address The string to store the resulting address
  */
 int remote_address(char *connected_address, char *xff_header, char *address)
 {

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -23,4 +23,4 @@ test_runner_SOURCES = librepsheet_test.c   \
                       ../src/xff.c         \
                       ../src/xff.h
 test_runner_CFLAGS = -g -O0 --coverage $(CHECK_CFLAGS)
-test_runner_LDADD = $(CHECK_LIBS) -lhiredis -lpcre -lm
+test_runner_LDADD = $(CHECK_LIBS) -lhiredis -lm