diff -Nru t50-5.8.2/CHANGELOG t50-5.8.3/CHANGELOG --- t50-5.8.2/CHANGELOG 2018-09-10 21:58:33.000000000 +0000 +++ t50-5.8.3/CHANGELOG 2018-11-24 10:42:44.000000000 +0000 @@ -6,6 +6,9 @@ - Bug fixed ! Known issue / missing feature +T50 5.8.3 - Nov 24th, 2018 + - Makefile now checks GCC version (5 or greater needed!) + T50 5.8.2 - Sep 10th, 2018 - cksum() RFC 1071 compliance and endianess fixes. diff -Nru t50-5.8.2/debian/changelog t50-5.8.3/debian/changelog --- t50-5.8.2/debian/changelog 2018-11-12 14:39:00.000000000 +0000 +++ t50-5.8.3/debian/changelog 2018-11-29 23:10:19.000000000 +0000 @@ -1,3 +1,10 @@ +t50 (5.8.3-1) unstable; urgency=medium + + * New upstream version 5.8.3 + * Rework patches for new upstream version. + + -- Marcos Fouces Fri, 30 Nov 2018 00:10:19 +0100 + t50 (5.8.2-3) unstable; urgency=high * d/p/01_Fix-Makefile.patch: Update to remove march-native flag, diff -Nru t50-5.8.2/debian/patches/01_Fix-Makefile.patch t50-5.8.3/debian/patches/01_Fix-Makefile.patch --- t50-5.8.2/debian/patches/01_Fix-Makefile.patch 2018-11-12 14:39:00.000000000 +0000 +++ t50-5.8.3/debian/patches/01_Fix-Makefile.patch 2018-11-29 23:10:19.000000000 +0000 @@ -3,14 +3,12 @@ --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: t50/Makefile -=================================================================== ---- t50.orig/Makefile -+++ t50/Makefile -@@ -13,13 +13,16 @@ - VERSION=5.8.2 +--- a/Makefile ++++ b/Makefile +@@ -12,13 +12,15 @@ + + VERSION=5.8.3 - # Change it to clang if you feel lucky! -CC=gcc +CC ?= gcc LD=$(CC) @@ -20,15 +18,14 @@ -LDFLAGS= -LDLIBS= +CFLAGS +=-std=gnu11 -+LDFLAGS += ++#LDFLAGS= +#LDLIBS= -+ +MANDIR = $(DESTDIR)/usr/share/man/man8/ +BINDIR = $(DESTDIR)/usr/sbin/ - # Just define DEBUG environment var to compile for debugging: - # -@@ -35,12 +38,12 @@ else + # Check GCC version (must be 5 or greater) + # OBS: This makes compilation GCC dependent (cannot use clang). +@@ -42,12 +44,12 @@ # Options for x86-64 ifeq ($(ARCHITECTURE),x86_64) @@ -43,7 +40,7 @@ LDFLAGS += -flto endif -@@ -67,7 +70,7 @@ ifdef USE_ANSI +@@ -74,7 +76,7 @@ CFLAGS += -DUSE_ANSI endif @@ -52,7 +49,7 @@ OBJECTS=\ src/cidr.o \ -@@ -141,21 +144,15 @@ define checkifroot +@@ -148,21 +150,15 @@ endef # install and uninstall rules are very simple! diff -Nru t50-5.8.2/Makefile t50-5.8.3/Makefile --- t50-5.8.2/Makefile 2018-09-10 21:57:02.000000000 +0000 +++ t50-5.8.3/Makefile 2018-11-24 12:19:55.000000000 +0000 @@ -10,9 +10,8 @@ # This way you don't need anything other than this makefile to # compile the project. -VERSION=5.8.2 +VERSION=5.8.3 -# Change it to clang if you feel lucky! CC=gcc LD=$(CC) @@ -21,6 +20,14 @@ LDFLAGS= LDLIBS= +# Check GCC version (must be 5 or greater) +# OBS: This makes compilation GCC dependent (cannot use clang). +# If you are feeling lucky, comment these lines and change CC to 'clang'. +GCCVERSION=$(shell expr "`gcc -dumpversion | sed -n 's/^\([0-9]\+\)\.*.*$$/\1/p'`" \>= 5) +ifeq "$(GCCVERSION)" "0" + $(error "T50 will compile only with GCC 5 or greater") +endif + # Just define DEBUG environment var to compile for debugging: # # $ DEBUG=1 make diff -Nru t50-5.8.2/src/include/configuration.h t50-5.8.3/src/include/configuration.h --- t50-5.8.2/src/include/configuration.h 2018-09-10 21:57:02.000000000 +0000 +++ t50-5.8.3/src/include/configuration.h 2018-11-24 10:28:05.000000000 +0000 @@ -1,11 +1,15 @@ #ifndef __CONFIGURATION_H_INCLUDED__ #define __CONFIGURATION_H_INCLUDED__ +#if !defined(__GNUC__) && (__GNUC__ < 5) && (__STDC_VERSION__ < 201112) + #error "Need GCC 5 or greater, with C11 standard support, to compile!" +#endif + /* Name of package */ #define PACKAGE "t50" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.8.2" +#define PACKAGE_VERSION "5.8.3" /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "t50-dev@googlegroups.com" diff -Nru t50-5.8.2/src/include/t50_randomizer.h t50-5.8.3/src/include/t50_randomizer.h --- t50-5.8.2/src/include/t50_randomizer.h 2018-09-03 12:55:58.000000000 +0000 +++ t50-5.8.3/src/include/t50_randomizer.h 2018-11-24 10:25:53.000000000 +0000 @@ -2,10 +2,7 @@ #define __RANDOMIZER_H__ #include - -#if !defined(__GNUC__) || (__STDC_VERSION__ < 201112) - #error "Need GCC with C11 standard support to compile!" -#endif +#include /* Randomizer macros and function */ /* NOTE: int8_t, int16_t, int32_t are synonimous of @@ -14,6 +11,7 @@ /* Sometipes, v is a bitfield and NOT compatible with primitive types. Because of this, the default selector is necessary! */ /* RANDOM call results have not endianess! */ + #define __RND(v) _Generic((v), \ _Bool: (!!(v) ? (v) : RANDOM()), \ int8_t: (!!(v) ? (v) : RANDOM()), \