diff mbox

[v3,1/1] package/at: updated version from 3.1.13 to 3.1.16

Message ID 1473000.Q0pm3JyGrD@deathstar
State Changes Requested
Headers show

Commit Message

Francesco Nwokeka Sept. 8, 2015, 12:13 p.m. UTC 
Version 3 of the patch to update the "at" package.

The following changes were made:

* removed old patches from v3.1.13
* Merged previous Makefile.in patches into one.
* Leave only necessary patches and remove those already applied upstream

The following patches were removed because already applied upstream:

0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
0008-remove-glibc-__isleap-assumption.patch

Whilst the following were kept (and numbered accordingly):

0006-getloadavg.c-fix.patch
0007-parsetime.l-include-config-h.patch



Signed-off-by: Francesco Nwokeka <francesco.nwokeka@gmail.com>
---
 ...replace-IROOT-by-DESTDIR-and-fix-the-ins.patch} | 82 +++++++++++++---------
 ...c-remove-manual-compiler-check-with-AC_TR.patch | 33 ---------
 ...c-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch | 34 ---------
 ...avg.c-fix.patch => 0002-getloadavg.c-fix.patch} |  0
 ...-Makefile.in-add-LDFLAGS-to-linking-stage.patch | 38 ----------
 ...tch => 0003-parsetime.l-include-config-h.patch} |  0
 package/at/0005-Makefile.in-make-install-fix.patch | 69 ------------------
 .../at/0008-remove-glibc-__isleap-assumption.patch | 59 ----------------
 package/at/at.hash                                 |  9 +--
 package/at/at.mk                                   |  2 +-
 10 files changed, 53 insertions(+), 273 deletions(-)
 rename package/at/{0004-Makefile.in-replace-IROOT-by-DESTDIR.patch => 0001-Makefile.in-replace-IROOT-by-DESTDIR-and-fix-the-ins.patch} (56%)
 delete mode 100644 package/at/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
 delete mode 100644 package/at/0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
 rename package/at/{0006-getloadavg.c-fix.patch => 0002-getloadavg.c-fix.patch} (100%)
 delete mode 100644 package/at/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
 rename package/at/{0007-parsetime.l-include-config-h.patch => 0003-parsetime.l-include-config-h.patch} (100%)
 delete mode 100644 package/at/0005-Makefile.in-make-install-fix.patch
 delete mode 100644 package/at/0008-remove-glibc-__isleap-assumption.patch

Comments

Arnout Vandecappelle Sept. 8, 2015, 1:57 p.m. UTC | #1 
On 08-09-15 14:13, Francesco Nwokeka wrote:
> Version 3 of the patch to update the "at" package.

 This part should be in the patch changelog, not as part of the commit message
(cfr. below).

> 
> The following changes were made:
> 
> * removed old patches from v3.1.13

 This duplicates the "The following patches were removed" statement.

> * Merged previous Makefile.in patches into one.

 Ick, that's not what I intended! We want a separate patch file for each
separate change. The two patches that you squashed into one do two distinct changes:

 - change IROOT into DESTDIR
 - don't try to install as root

So it's good to keep them separate.

 My proposal was to drop the first patch and just use IROOT. In buildroot, we
can easily use IROOT instead of DESTDIR by setting

AT_INSTALL_TARGET_OPTS = IROOT=$(TARGET_DIR) install


> * Leave only necessary patches and remove those already applied upstream

 Again, this commit message is a duplicate of the ones below.


 So basically you should just mention here that patch 0005 is refreshed and
renumbered.

> 
> The following patches were removed because already applied upstream:
> 
> 0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
> 0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
> 0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
> 0008-remove-glibc-__isleap-assumption.patch
> 
> Whilst the following were kept (and numbered accordingly):
> 
> 0006-getloadavg.c-fix.patch
> 0007-parsetime.l-include-config-h.patch
> 
> 
> 

 Too many empty lines.

> Signed-off-by: Francesco Nwokeka <francesco.nwokeka@gmail.com>

 There should be a patch changelog here (after the Signed-off-by), like so:

---
v2 -> v3: squash patch 0004 and 0005 into a single patch
v1 -> v2: do everything in a single commit instead of 5 commits


 Regards,
 Arnout

[snip]
Thomas Petazzoni Sept. 20, 2015, 1:08 p.m. UTC | #2 
Dear Francesco Nwokeka,

On Tue, 08 Sep 2015 14:13:59 +0200, Francesco Nwokeka wrote:
> Version 3 of the patch to update the "at" package.

You received some comments from Arnout Vandecappelle on September 8th
on this patch. Could you take them into account and send an updated
version of the patch?

I was going to apply by fixing the problems pointed by Arnout, but one
requires a bit more work:

"""
> * Merged previous Makefile.in patches into one.  

 Ick, that's not what I intended! We want a separate patch file for each
separate change. The two patches that you squashed into one do two
 distinct changes:

 - change IROOT into DESTDIR
 - don't try to install as root

So it's good to keep them separate.

 My proposal was to drop the first patch and just use IROOT. In
 buildroot, we can easily use IROOT instead of DESTDIR by setting

AT_INSTALL_TARGET_OPTS = IROOT=$(TARGET_DIR) install
"""

Could you fix that and send a new version?

Thanks,

Thomas
Francesco Nwokeka Oct. 22, 2015, 10:31 a.m. UTC | #3 
On Sunday 20 September 2015 15:08:38 Thomas Petazzoni wrote:
> Dear Francesco Nwokeka,
> 
> On Tue, 08 Sep 2015 14:13:59 +0200, Francesco Nwokeka wrote:
> > Version 3 of the patch to update the "at" package.
> 
> You received some comments from Arnout Vandecappelle on September 8th
> on this patch. Could you take them into account and send an updated
> version of the patch?
> 
> I was going to apply by fixing the problems pointed by Arnout, but one
> requires a bit more work:
> 
> """
> > * Merged previous Makefile.in patches into one.  
> 
>  Ick, that's not what I intended! We want a separate patch file for each
> separate change. The two patches that you squashed into one do two
>  distinct changes:
> 
>  - change IROOT into DESTDIR
>  - don't try to install as root
> 
> So it's good to keep them separate.
> 
>  My proposal was to drop the first patch and just use IROOT. In
>  buildroot, we can easily use IROOT instead of DESTDIR by setting
> 
> AT_INSTALL_TARGET_OPTS = IROOT=$(TARGET_DIR) install
> """
> 
> Could you fix that and send a new version?


Hi Thomas!
	Sorry for the late reply but I've been 100% busy during this period. I'll get the patch back up and running ASAP. Sorry for the delay


Thanks,
	Francesco

> Thanks,
> 
> Thomas
>
diff mbox

Patch

diff --git a/package/at/0004-Makefile.in-replace-IROOT-by-DESTDIR.patch b/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR-and-fix-the-ins.patch
similarity index 56%
rename from package/at/0004-Makefile.in-replace-IROOT-by-DESTDIR.patch
rename to package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR-and-fix-the-ins.patch
index 0d1d5f6..14b65dd 100644
--- a/package/at/0004-Makefile.in-replace-IROOT-by-DESTDIR.patch
+++ b/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR-and-fix-the-ins.patch
@@ -1,23 +1,28 @@ 
-From 195d30e2e01fe2f91ed3bdaeec3982aa66b309dd Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Tue, 1 Dec 2009 20:57:45 +0100
-Subject: [PATCH 5/5] Makefile.in: replace IROOT by DESTDIR
+From da2895de020deaf836fb24c3af821608fe5fc29a Mon Sep 17 00:00:00 2001
+From: Francesco Nwokeka <francesco.nwokeka@gmail.com>
+Date: Fri, 4 Sep 2015 19:15:19 +0200
+Subject: [PATCH 1/1] Makefile.in: replace IROOT by DESTDIR and fix the install
+ for non-root, don't strip
 
-This patch replaces IROOT by DESTDIR, which is the autotools standard
+This patch was adjusted from previous patches made by Marc Kleine-Budde in order to update to v3.1.16
+
+The patch replaces IROOT by DESTDIR, which is the autotools standard
 variable. For backwards compatibilty IROOT overwrites the DESTDIR.
+Plus the install is made for non-root giving 755 permissions to installed files
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Francesco Nwokeka <francesco.nwokeka@gmail.com>
 ---
- Makefile.in |   64 +++++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 34 insertions(+), 30 deletions(-)
+ Makefile.in | 67 ++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 35 insertions(+), 32 deletions(-)
 
-Index: at-3.1.13/Makefile.in
-===================================================================
---- at-3.1.13.orig/Makefile.in
-+++ at-3.1.13/Makefile.in
-@@ -16,6 +16,10 @@ docdir		= $(prefix)/doc
- atdocdir	= $(docdir)/at
+diff --git a/Makefile.in b/Makefile.in
+index 5dd2767..5d82f18 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -17,6 +17,10 @@ atdocdir	= $(docdir)/at
  etcdir		= @ETCDIR@
+ systemdsystemunitdir = @systemdsystemunitdir@
  
 +ifdef IROOT
 +DESTDIR		= $(IROOT)
@@ -26,7 +31,7 @@  Index: at-3.1.13/Makefile.in
  DAEMON_USERNAME	= @DAEMON_USERNAME@
  DAEMON_GROUPNAME= @DAEMON_GROUPNAME@
  LOADAVG_MX	= @LOADAVG_MX@
-@@ -86,38 +90,38 @@ atrun: atrun.in
+@@ -91,41 +95,40 @@ atrun: atrun.in
  	$(CC) -c $(CFLAGS) $(DEFS) $*.c
  
  install: all
@@ -53,32 +58,31 @@  Index: at-3.1.13/Makefile.in
 -	$(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
 -	cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
 -	$(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/
-+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir)
-+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir)
-+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir)
-+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir)
-+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir)
-+	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
++	$(INSTALL) -m 755 -d $(DESTDIR)$(etcdir)
++	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
++	$(INSTALL) -m 755 -d $(DESTDIR)$(sbindir)
++	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
++	$(INSTALL) -m 755 -d $(DESTDIR)$(atdocdir)
++	$(INSTALL) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
 +	chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
 +	touch $(DESTDIR)$(LFILE)
 +	chmod 600 $(DESTDIR)$(LFILE)
-+	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
-+	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR$
-+	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir)
++	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 640 at.deny $(DESTDIR)$(etcdir)/
++	$(INSTALL) -m 6755 at $(DESTDIR)$(bindir)
 +	$(LN_S) -f at $(DESTDIR)$(bindir)/atq
 +	$(LN_S) -f at $(DESTDIR)$(bindir)/atrm
-+	$(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir)
-+	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir)
-+	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir)
-+	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir)
-+	$(INSTALL) -g root -o root -m 755 -s atd $(DESTDIR)$(sbindir)
-+	$(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir)
-+	$(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/
++	$(INSTALL) -m 755 batch $(DESTDIR)$(bindir)
++	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
++	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
++	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
++	$(INSTALL) -m 755 atd $(DESTDIR)$(sbindir)
++	$(INSTALL) -m 755 atrun $(DESTDIR)$(sbindir)
++	$(INSTALL) -m 644 at.1 $(DESTDIR)$(man1dir)/
 +	cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
-+	$(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/
++	$(INSTALL) -m 644 atd.8 $(DESTDIR)$(man8dir)/
  	sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
 -	$(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
-+	$(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
++	$(INSTALL) -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
  	rm -f tmpman
 -	$(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/
 -	cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
@@ -86,12 +90,20 @@  Index: at-3.1.13/Makefile.in
 -	rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
 -		$(IROOT)$(mandir)/cat1/atq.1*
 -	rm -f $(IROOT)$(mandir)/cat1/atd.8*
-+	$(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
++	$(INSTALL) -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
 +	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
-+	$(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
++	$(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
 +	rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
 +		$(DESTDIR)$(mandir)/cat1/atq.1*
 +	rm -f $(DESTDIR)$(mandir)/cat1/atd.8*
+ 	if test x"$(systemdsystemunitdir)" != xno; then \
+-		$(INSTALL) -o root -g root -m 755 -d $(IROOT)$(systemdsystemunitdir); \
+-		$(INSTALL) -o root -g root -m 644 atd.service $(IROOT)$(systemdsystemunitdir); \
++		$(INSTALL) -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \
++		$(INSTALL) -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \
+ 	fi
  
  dist: checkin $(DIST) $(LIST) Filelist.asc
- 	(cd ..; tar cf - `for a in $(DIST) $(LIST); do echo at-$(VERSION)/$$a; done` |\
+-- 
+2.5.1
+
diff --git a/package/at/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch b/package/at/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
deleted file mode 100644
index 9e69922..0000000
--- a/package/at/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-From a182f18fa3b9fb3dd817b601b51c758f9a77f407 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Tue, 1 Dec 2009 17:08:14 +0100
-Subject: [PATCH 1/5] configure.ac: remove manual compiler check with AC_TRY_RUN
-
-AC_TRY_RUN breaks cross compilation, so remove it. autotools will take
-care about a working (cross-) compiler.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- configure.ac |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a8c2a14..997a37f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,12 +38,6 @@ case "$host" in
-     AC_MSG_RESULT(no)
-     ;;
- esac
--AC_MSG_CHECKING(Trying to compile a trivial ANSI C program)
--AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
--    AC_MSG_RESULT(yes),
--    AC_MSG_RESULT(no)
--    AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),
--    AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.))
- 
- AC_MSG_CHECKING(__attribute__((noreturn)))
- AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
--- 
-1.6.5.3
-
diff --git a/package/at/0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch b/package/at/0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
deleted file mode 100644
index e4276ac..0000000
--- a/package/at/0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From e12c96cccab550eda31cf7bb1dedddd3670ffe69 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Tue, 1 Dec 2009 17:22:22 +0100
-Subject: [PATCH 2/5] configure.ac: convert AC_TRY_COMPILE -> AC_COMPILE_IFELSE
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- configure.ac |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 997a37f..cab80ed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,11 +40,11 @@ case "$host" in
- esac
- 
- AC_MSG_CHECKING(__attribute__((noreturn)))
--AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
--    AC_MSG_RESULT(yes)
--    AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1,
--              [Define to 1 if compiler supports __attribute__((noreturn))]),
--    AC_MSG_RESULT(no)
-+AC_COMPILE_IFELSE(
-+       [AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])],
-+       [AC_MSG_RESULT(yes)
-+        AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, Define to 1 if compiler supports __attribute__((noreturn)))],
-+       [AC_MSG_RESULT(no)]
- )
- dnl Checks for libraries.
- 
--- 
-1.6.5.3
-
diff --git a/package/at/0006-getloadavg.c-fix.patch b/package/at/0002-getloadavg.c-fix.patch
similarity index 100%
rename from package/at/0006-getloadavg.c-fix.patch
rename to package/at/0002-getloadavg.c-fix.patch
diff --git a/package/at/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch b/package/at/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
deleted file mode 100644
index e1ab3d3..0000000
--- a/package/at/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
+++ /dev/null
@@ -1,38 +0,0 @@ 
-From 8720a71757f3626bf3bbc3a7aa2185e6387e5689 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Tue, 1 Dec 2009 20:37:31 +0100
-Subject: [PATCH 3/5] Makefile.in: add LDFLAGS to linking stage
-
-The linking stage ignores the LDFLAGS, this breaks if the flex library
-lives in a non standard location.
-
-This patch add LDFLAGS to both "at" and "atd" linking stage.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- Makefile.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index dae6b7d..b766bbb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -65,13 +65,13 @@ LIST = Filelist Filelist.asc
- all: at atd atrun
- 
- at: $(ATOBJECTS)
--	$(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
- 	rm -f $(CLONES)
- 	$(LN_S) -f at atq
- 	$(LN_S) -f at atrm
- 
- atd: $(RUNOBJECTS)
--	$(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
- 
- y.tab.c y.tab.h: parsetime.y
- 	$(YACC) -d parsetime.y
--- 
-1.6.5.3
-
diff --git a/package/at/0007-parsetime.l-include-config-h.patch b/package/at/0003-parsetime.l-include config-h.patch
similarity index 100%
rename from package/at/0007-parsetime.l-include-config-h.patch
rename to package/at/0003-parsetime.l-include-config-h.patch
diff --git a/package/at/0005-Makefile.in-make-install-fix.patch b/package/at/0005-Makefile.in-make-install-fix.patch
deleted file mode 100644
index ad84344..0000000
--- a/package/at/0005-Makefile.in-make-install-fix.patch
+++ /dev/null
@@ -1,69 +0,0 @@ 
-[PATCH]: Makefile.in: fix make install for non-root, don't strip
-
-Buildroot will ensure all files are owned by root and stripped anyway
-(if needed) before the rootfs is created.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Makefile.in |   39 +++++++++++++++++++--------------------
- 1 file changed, 19 insertions(+), 20 deletions(-)
-
-Index: at-3.1.13/Makefile.in
-===================================================================
---- at-3.1.13.orig/Makefile.in
-+++ at-3.1.13/Makefile.in
-@@ -90,35 +90,34 @@ atrun: atrun.in
- 	$(CC) -c $(CFLAGS) $(DEFS) $*.c
- 
- install: all
--	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir)
--	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir)
--	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir)
--	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir)
--	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir)
--	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(etcdir)
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(sbindir)
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(atdocdir)
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
- 	chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
- 	touch $(DESTDIR)$(LFILE)
- 	chmod 600 $(DESTDIR)$(LFILE)
--	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
--	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR$
--	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir)
-+	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 640 at.deny $(DESTDIR)$(etcdir)/
-+	$(INSTALL) -m 6755 at $(DESTDIR)$(bindir)
- 	$(LN_S) -f at $(DESTDIR)$(bindir)/atq
- 	$(LN_S) -f at $(DESTDIR)$(bindir)/atrm
--	$(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir)
--	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir)
--	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir)
--	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir)
--	$(INSTALL) -g root -o root -m 755 -s atd $(DESTDIR)$(sbindir)
--	$(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir)
--	$(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/
-+	$(INSTALL) -m 755 batch $(DESTDIR)$(bindir)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
-+	$(INSTALL) -m 755 atd $(DESTDIR)$(sbindir)
-+	$(INSTALL) -m 755 atrun $(DESTDIR)$(sbindir)
-+	$(INSTALL) -m 644 at.1 $(DESTDIR)$(man1dir)/
- 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
--	$(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/
-+	$(INSTALL) -m 644 atd.8 $(DESTDIR)$(man8dir)/
- 	sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
--	$(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
-+	$(INSTALL) -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
- 	rm -f tmpman
--	$(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
-+	$(INSTALL) -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
- 	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
--	$(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
-+	$(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
- 	rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
- 		$(DESTDIR)$(mandir)/cat1/atq.1*
- 	rm -f $(DESTDIR)$(mandir)/cat1/atd.8*
diff --git a/package/at/0008-remove-glibc-__isleap-assumption.patch b/package/at/0008-remove-glibc-__isleap-assumption.patch
deleted file mode 100644
index 2152249..0000000
--- a/package/at/0008-remove-glibc-__isleap-assumption.patch
+++ /dev/null
@@ -1,59 +0,0 @@ 
-From 7f811d9c4ebc9444e613e251c31d6bf537a24dc1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Apr 2015 16:35:30 -0700
-Subject: [PATCH] remove glibc assumption
-
-glibc time.h header has an undocumented __isleap macro
-that we are using anf musl is missing it.
-Since it is undocumented & does not appear
-on any other libc, stop using it and just define the macro in
-locally  instead.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-[patch from: http://patchwork.openembedded.org/patch/91893/ ]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
----
- 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
- 
-+#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
- 				 mnum == 12) && dnum > 31)
- 			    || ((mnum ==  4 || mnum ==  6 || mnum ==  9 ||
- 			         mnum == 11) && dnum > 30)
--			    || (mnum ==  2 && dnum > 29 &&  __isleap(ynum+1900))
--			    || (mnum ==  2 && dnum > 28 && !__isleap(ynum+1900))
-+			    || (mnum ==  2 && dnum > 29 &&  is_leap_year(ynum+1900))
-+			    || (mnum ==  2 && dnum > 28 && !is_leap_year(ynum+1900))
- 			   )
- 			{
- 			    yyerror("Error in day of month");
-@@ -261,8 +264,8 @@ date            : month_name day_number
- 				 mnum == 12) && dnum > 31)
- 			    || ((mnum ==  4 || mnum ==  6 || mnum ==  9 ||
- 			         mnum == 11) && dnum > 30)
--			    || (mnum ==  2 && dnum > 29 &&  __isleap(ynum+1900))
--			    || (mnum ==  2 && dnum > 28 && !__isleap(ynum+1900))
-+			    || (mnum ==  2 && dnum > 29 &&  is_leap_year(ynum+1900))
-+			    || (mnum ==  2 && dnum > 28 && !is_leap_year(ynum+1900))
- 			   )
- 			{
- 			    yyerror("Error in day of month");
--- 
-2.1.4
diff --git a/package/at/at.hash b/package/at/at.hash
index 481c937..40d0ed4 100644
--- a/package/at/at.hash
+++ b/package/at/at.hash
@@ -1,4 +1,5 @@ 
-# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/at/at_3.1.13-2%2Bdeb7u1.dsc
-sha1	9873e0c38403ef58364912d0b505fd20798fd400  at_3.1.13.orig.tar.gz
-sha256	3a8b90868d615d21a92f4986ea9a823886329af8fae8dd7ab4eed9b273bca072  at_3.1.13.orig.tar.gz
-md5	1da61af6c29e323abaaf13ee1a8dad79  at_3.1.13.orig.tar.gz
+# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/at/at_3.1.16-1.dsc
+
+sha1    5ad64a471d0ed9985541e918e096f69dc2963cf0 at_3.1.16.orig.tar.gz
+sha256  cb9af59c6a54edce9536ba629841055409d1f89d8ae26494727a97141fb4d5c1 at_3.1.16.orig.tar.gz
+md5 d05da75d9b75d93917ffb16ab48b1e19 at_3.1.16.orig.tar.gz
diff --git a/package/at/at.mk b/package/at/at.mk
index 1504e32..8865360 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-AT_VERSION = 3.1.13
+AT_VERSION = 3.1.16
 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz
 AT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/at
 # missing deps for parsetime.l