Setup build to release 1.5.1 (#524)

* debian: add missing changelog entry for 1.5

* debian,rpm: cleanup provided packaging examples

The spec file from distro/redhat is preferred over the one from suse,
because it seems more up to date. Ideally, there should be a single
spec file for both. Now given under /rpm.

For debian, we remove the Makefile.am as the contents don't need any
building.

* build: don't force -Werror on build

Warnings should definitely be fixed better than ignored, but given
that it's usual for compilers to introduce new warnings in newer
versions, it should not be a requirement to build releases.

A better approach would have been to explicitly detect release builds
and avoid -Werror if so (e.g. with AX_IS_RELEASE() from
autoconf-archive) but for now just disable -Werror to make users
happy.

Fixes #521

* build: update version to 1.6

ChangeLog

@@ -1,3 +1,8 @@
+== ChangeLog (CoovaChilli-v1.6) ==
+* Fix build with musl libc.
+* Updated build to avoid making warnings fatal.
+* Updated debian and rpm packaging sources.
+
 == ChangeLog (CoovaChilli-v1.5) ==
 * Deal with the differing levels of support for 64 bit time_t by casting to long (#325)
 * Drop the incomplete support for Sun Solaris. (#326)

Makefile.am

@@ -1,11 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = bstring 
-EXTRA_DIST = CREDITS LICENSE acsite.m4
+SUBDIRS = bstring
+EXTRA_DIST = CREDITS LICENSE acsite.m4 debian rpm
 if WITH_JSONLIB
 SUBDIRS += json
 endif
-SUBDIRS += src doc www conf debian distro
+SUBDIRS += src doc www conf
 if WITH_MINIPORTAL
 SUBDIRS += miniportal
 endif

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
-AC_INIT([coova-chilli],[1.4],[https://github.com/coova/coova-chilli/issues])
+AC_INIT([coova-chilli],[1.6],[https://github.com/coova/coova-chilli/issues])
 AC_CONFIG_SRCDIR([src/chilli.c])
 
 AM_INIT_AUTOMAKE
@@ -830,18 +830,14 @@ fi
 AM_CONDITIONAL(WITH_CONFIG, [test x"$enable_config" = xyes])
 
 AC_SUBST(sysconfdir)
-AC_CONFIG_FILES([Makefile 
-		 bstring/Makefile 
+AC_CONFIG_FILES([Makefile
+		 bstring/Makefile
 		 conf/Makefile
-		 debian/Makefile
-		 distro/Makefile
 		 doc/Makefile
 		 json/Makefile
 		 miniportal/Makefile
-		 src/Makefile 
-		 src/mssl/Makefile 
-		 www/Makefile 
-		 distro/suse/coova-chilli.spec
-		 distro/redhat/coova-chilli.spec])
+		 src/Makefile
+		 src/mssl/Makefile
+		 www/Makefile])
 
 AC_OUTPUT

debian/changelog

@@ -1,4 +1,16 @@
-coova-chilli (1.4) UNRELEASED; urgency=medium
+coova-chilli (1.6) unstable; urgency=medium
+
+  * See ChangeLog
+
+ -- Sevan Janiyan <[email protected]>  Sat, 20 Feb 2021 00:00:00 +0100
+
+coova-chilli (1.5) unstable; urgency=medium
+
+  * See ChangeLog
+
+ -- Sevan Janiyan <[email protected]>  Sun, 24 Nov 2019 00:00:00 +0100
+
+coova-chilli (1.4) unstable; urgency=medium
 
    * See ChangeLog
 

distro/redhat/coova-chilli.spec.in → rpm/coova-chilli.spec

@@ -1,6 +1,6 @@
 Summary:   Coova-Chilli is a Wireless LAN Access Point Controller
 Name:      coova-chilli
-Version:   1.3.1.3
+Version:   1.6
 Release:   1%{?dist}
 URL:       http://coova.github.io/
 Source0:   %{name}-%{version}.tar.gz
@@ -92,6 +92,10 @@ fi
 %{_mandir}/man8/*.8*
 
 %changelog
+
+* Sat Feb 20 2021 Sevan Janiyan <[email protected]>
+- 1.6 release
+
 * Fri Jun 26 2015 Giovanni Bezicheri <[email protected]>
 * Fix json encoding for radius reply.
 

src/Makefile.am

@@ -25,7 +25,7 @@ chilli.c tun.c ippool.c radius.c md5.c redir.c dhcp.c \
 iphash.c lookup.c system.h util.c options.c statusfile.c conn.c sig.c \
 garden.c dns.c session.c pkt.c chksum.c net.c safe.c
 
-AM_CFLAGS = -D_GNU_SOURCE -Wall -Werror -fno-builtin -fno-strict-aliasing \
+AM_CFLAGS = -D_GNU_SOURCE -Wall -fno-builtin -fno-strict-aliasing \
   -fomit-frame-pointer -funroll-loops -pipe -I$(top_builddir)/bstring \
  -DDEFCHILLICONF='"$(sysconfdir)/chilli.conf"'\
  -DDEFPIDFILE='"$(localstatedir)/run/chilli.pid"'\