From 77493aa990d9bfa99055f427abc20e120ae29bf9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Jan 2021 22:25:24 +0000 Subject: at: Upgrade 3.1.23 -> 3.2.1 This fixes flex issues with autoconf 2.70 rather than backporting patches. Patches refreshed. (From OE-Core rev: 3ca412ed7fc5a9d525d4ba7922e7e3e179904380) Signed-off-by: Richard Purdie --- .../at/at/0001-remove-glibc-assumption.patch | 23 ++++++++++------------ .../at/at/file_replacement_with_gplv2.patch | 8 ++++---- .../at/at/fix_parallel_build_error.patch | 11 ++++------- .../at/at/makefile-fix-parallel.patch | 8 ++++---- 4 files changed, 22 insertions(+), 28 deletions(-) (limited to 'meta/recipes-extended/at/at') diff --git a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch b/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch index 7fdecc7fd1..fd57f94cd5 100644 --- a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch +++ b/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch @@ -18,21 +18,21 @@ Signed-off-by: Dengke Du parsetime.y | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -diff --git a/parsetime.y b/parsetime.y -index 7005e88..324e6d3 100644 ---- a/parsetime.y -+++ b/parsetime.y -@@ -8,6 +8,9 @@ - - #define YYDEBUG 1 +Index: at-3.2.1/parsetime.y +=================================================================== +--- at-3.2.1.orig/parsetime.y ++++ at-3.2.1/parsetime.y +@@ -14,6 +14,9 @@ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + #endif +#define is_leap_year(y) \ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + struct tm exectm; static int isgmt; - static int yearspec; -@@ -217,8 +220,8 @@ date : month_name day_number + static char *tz = NULL; +@@ -230,8 +233,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -43,7 +43,7 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); -@@ -261,8 +264,8 @@ date : month_name day_number +@@ -274,8 +277,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -54,6 +54,3 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); --- -2.8.1 - diff --git a/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch b/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch index d5ef0032be..11023bdf52 100644 --- a/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch +++ b/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch @@ -10,11 +10,11 @@ update the Copyright file information to reflect the replaced files. Date: 2010/08/31 Nitin A Kamble nitin.a.kamble@intel.com -Index: at-3.1.12/Copyright +Index: at-3.2.1/Copyright =================================================================== ---- at-3.1.12.orig/Copyright -+++ at-3.1.12/Copyright -@@ -31,10 +31,10 @@ The files posixtm.c and posixtm.h have t +--- at-3.2.1.orig/Copyright ++++ at-3.2.1/Copyright +@@ -34,10 +34,10 @@ The files posixtm.c and posixtm.h have t Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation Inc. diff --git a/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/meta/recipes-extended/at/at/fix_parallel_build_error.patch index 30d2324126..e4f32b82b6 100644 --- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch +++ b/meta/recipes-extended/at/at/fix_parallel_build_error.patch @@ -22,10 +22,10 @@ Signed-off-by: Chen Qi Makefile.in | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/Makefile.in b/Makefile.in -index 4c11913..18ecc23 100644 ---- a/Makefile.in -+++ b/Makefile.in +Index: at-3.2.1/Makefile.in +=================================================================== +--- at-3.2.1.orig/Makefile.in ++++ at-3.2.1/Makefile.in @@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y lex.yy.c: parsetime.l $(LEX) -i parsetime.l @@ -35,6 +35,3 @@ index 4c11913..18ecc23 100644 atd.service: atd.service.in cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ --- -2.7.4 - diff --git a/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/meta/recipes-extended/at/at/makefile-fix-parallel.patch index d6056dceff..adb8652053 100644 --- a/meta/recipes-extended/at/at/makefile-fix-parallel.patch +++ b/meta/recipes-extended/at/at/makefile-fix-parallel.patch @@ -15,11 +15,11 @@ Signed-off-by: Robert Yang Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: at-3.1.20/Makefile.in +Index: at-3.2.1/Makefile.in =================================================================== ---- at-3.1.20.orig/Makefile.in -+++ at-3.1.20/Makefile.in -@@ -76,7 +76,9 @@ at: $(ATOBJECTS) +--- at-3.2.1.orig/Makefile.in ++++ at-3.2.1/Makefile.in +@@ -77,7 +77,9 @@ at: $(ATOBJECTS) atd: $(RUNOBJECTS) $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) -- cgit v1.2.3-54-g00ecf