From b9e967b3cde6af41cd0e863e9ff073897019625a Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 6 May 2013 14:45:33 +0200 Subject: Bump library interface revision. Commit edf4c047 claimed it did this but didn't really do it. Should really have been done as part of bumping the library version (0.0.2.dev in configure.ac). --- lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 46f573a..597f6dd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -50,5 +50,5 @@ endif EXTRA_DIST = HACKING LICENSE libradsec_la_LIBADD = radsecproxy/libradsec-radsecproxy.la radius/libradsec-radius.la -libradsec_la_LDFLAGS = -version-info 0:0:0 -export-symbols radsec.sym +libradsec_la_LDFLAGS = -version-info 1:0:0 -export-symbols radsec.sym libradsec_la_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -Werror # -DDEBUG -DDEBUG_LEVENT -- cgit v1.1 From 147f8ab3277afdbe9f63676539a95aaaa48de336 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 7 May 2013 10:09:53 +0200 Subject: Build include before building '.' Patch by Sam Hartman (ff1af013 in moonshot). --- lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 597f6dd..547fc14 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -17,7 +17,7 @@ ACLOCAL_AMFLAGS = -I m4 # library interface is _changed_. -SUBDIRS = radius radsecproxy . include examples +SUBDIRS = radius radsecproxy include . examples INCLUDES = -I$(srcdir)/include AM_CFLAGS = -Wall -Werror -g -- cgit v1.1 From 591a8ea24d0e2426ff34a3ccc549fee8cc70c323 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 8 May 2013 20:23:06 +0200 Subject: Add 'tests' to SUBDIRS to make 'make check' work. --- lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 547fc14..3de4657 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -17,7 +17,7 @@ ACLOCAL_AMFLAGS = -I m4 # library interface is _changed_. -SUBDIRS = radius radsecproxy include . examples +SUBDIRS = radius radsecproxy include . examples tests INCLUDES = -I$(srcdir)/include AM_CFLAGS = -Wall -Werror -g -- cgit v1.1 From f2626416d939c08f3eab5091582af558ce23b472 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 8 May 2013 21:42:17 +0200 Subject: Initial RPM packaging Adapted from commit 8ff4e9ab2308fc6ee1e9b140d85ba45eff5287ce Author: Sam hartman Date: Mon Oct 10 15:25:11 2011 +0100 Conflicts: lib/Makefile.am lib/configure.ac --- lib/Makefile.am | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 3de4657..5fad0b0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -47,7 +47,22 @@ else libradsec_la_SOURCES += md5.c endif -EXTRA_DIST = HACKING LICENSE +libradsec_la_SOURCES += \ + compat.h \ + conn.h \ + debug.h \ + err.h \ + event.h \ + md5.h \ + packet.h \ + peer.h \ + radsec.h \ + tcp.h \ + tls.h \ + udp.h \ + util.h + +EXTRA_DIST = HACKING LICENSE libradsec.spec radsec.sym libradsec_la_LIBADD = radsecproxy/libradsec-radsecproxy.la radius/libradsec-radius.la libradsec_la_LDFLAGS = -version-info 1:0:0 -export-symbols radsec.sym -- cgit v1.1 From f08d4effdb7fb0dbe63b73d4fa4e3310d3b3e0ca Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 8 May 2013 22:17:32 +0200 Subject: Don't include tests in SUBIDRS after all. It requires a running radius server. That's not a nice thing to require for something like distcheck. --- lib/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 5fad0b0..292451f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -17,7 +17,8 @@ ACLOCAL_AMFLAGS = -I m4 # library interface is _changed_. -SUBDIRS = radius radsecproxy include . examples tests +SUBDIRS = radius radsecproxy include . examples +DIST_SUBDIRS = $(SUBDIRS) tests INCLUDES = -I$(srcdir)/include AM_CFLAGS = -Wall -Werror -g -- cgit v1.1 From b73a7432ab85d5ca8d0683166c2c7cc75553db69 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 8 May 2013 22:18:27 +0200 Subject: Pass make distcheck. --- lib/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 292451f..2e8401a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -64,7 +64,8 @@ libradsec_la_SOURCES += \ util.h EXTRA_DIST = HACKING LICENSE libradsec.spec radsec.sym +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tls --enable-tls-psk libradsec_la_LIBADD = radsecproxy/libradsec-radsecproxy.la radius/libradsec-radius.la -libradsec_la_LDFLAGS = -version-info 1:0:0 -export-symbols radsec.sym +libradsec_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(srcdir)/radsec.sym libradsec_la_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -Werror # -DDEBUG -DDEBUG_LEVENT -- cgit v1.1 From f4608111b51edf1744cef31306d6bf06129dd591 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 8 May 2013 22:42:00 +0200 Subject: Clarify and reformat comments on how to use Libtool's -version-info. --- lib/Makefile.am | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 2e8401a..8f86aa4 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -3,18 +3,18 @@ ACLOCAL_AMFLAGS = -I m4 # Shared library interface version, i.e. -version-info to Libtool, # expressed as three integers CURRENT:REVISION:AGE. - -# CURRENT is the version number of the current interface. Increment -# CURRENT when the library interface changes. - +# +# CURRENT is the version number of the current interface. Increment +# CURRENT when the library interface has changed or has been extended. +# # REVISION is the version number of the _implementation_ of the -# CURRENT interface. Set REVISION to 0 when CURRENT changes, -# else increment. - +# CURRENT interface. Set REVISION to 0 when CURRENT changes, else +# increment. +# # AGE is the number of interfaces this library implements, i.e. how -# many versions before CURRENT that are supported. Increment AGE -# when the library interface is _extended_. Set AGE to 0 when the -# library interface is _changed_. +# many versions before CURRENT that are supported. Increment AGE when +# the library interface is _extended_. Set AGE to 0 when the library +# interface is _changed_. SUBDIRS = radius radsecproxy include . examples -- cgit v1.1 From de670651b8d513c3956fc8618bca303ba55a04f4 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 8 May 2013 23:10:11 +0200 Subject: Revert "Bump library interface revision." So there were two things wrong with that commit. 1. Library interface revision should be bumped only immediately before a public release. 2. Given the changes in the library, it should change to 0:1:0 since the interface didn't change (including not being extended). This reverts commit b9e967b3cde6af41cd0e863e9ff073897019625a. Conflicts: lib/Makefile.am --- lib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index 8f86aa4..237294a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -67,5 +67,5 @@ EXTRA_DIST = HACKING LICENSE libradsec.spec radsec.sym AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tls --enable-tls-psk libradsec_la_LIBADD = radsecproxy/libradsec-radsecproxy.la radius/libradsec-radius.la -libradsec_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(srcdir)/radsec.sym +libradsec_la_LDFLAGS = -version-info 0:0:0 -export-symbols $(srcdir)/radsec.sym libradsec_la_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -Werror # -DDEBUG -DDEBUG_LEVENT -- cgit v1.1