From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [APPLIED] at: version bump 3.1.12 -> 3.2.5
Date: Fri, 10 Jun 2022 08:49:19 +0200 [thread overview]
Message-ID: <20220610064919.2823604-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220525083752.5881-2-ada@thorsis.com>
Thanks, applied as deace2a0967cd948105dc383290f79b744d9545e.
Michael
[sent from post-receive hook]
On Fri, 10 Jun 2022 08:49:19 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Old version 3.1.12 was released 13 years ago back in 2009.
> Upstream changed in 2015, tarballs are available at a new URL now.
>
> Patches could all be removed, issues where addressed upstream in a
> different way however.
>
> Changes in Copyright file where updating an e-mail address and adding a
> note on new maintainership.
>
> Link: http://blog.calhariz.com/index.php/post/2015/12/06/Taking-over-the-developement-of-at-daemon.
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220525083752.5881-2-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/at-3.1.12/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch b/patches/at-3.1.12/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch
> deleted file mode 100644
> index 9e69922945a6..000000000000
> --- a/patches/at-3.1.12/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/patches/at-3.1.12/0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch b/patches/at-3.1.12/0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch
> deleted file mode 100644
> index ab6de442838d..000000000000
> --- a/patches/at-3.1.12/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/patches/at-3.1.12/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch b/patches/at-3.1.12/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch
> deleted file mode 100644
> index e1ab3d376676..000000000000
> --- a/patches/at-3.1.12/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/patches/at-3.1.12/0005-Makefile.in-replace-IROOT-by-DESTDIR.patch b/patches/at-3.1.12/0005-Makefile.in-replace-IROOT-by-DESTDIR.patch
> deleted file mode 100644
> index 6a295e37cfd1..000000000000
> --- a/patches/at-3.1.12/0005-Makefile.in-replace-IROOT-by-DESTDIR.patch
> +++ /dev/null
> @@ -1,97 +0,0 @@
> -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
> -
> -This patch replaces IROOT by DESTDIR, which is the autotools standard
> -variable. For backwards compatibilty IROOT overwrites the DESTDIR.
> -
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ----
> - Makefile.in | 64 +++++++++++++++++++++++++++++++-----------------------------
> - 1 file changed, 34 insertions(+), 30 deletions(-)
> -
> -Index: at-3.1.12/Makefile.in
> -===================================================================
> ---- at-3.1.12.orig/Makefile.in
> -+++ at-3.1.12/Makefile.in
> -@@ -16,6 +16,10 @@ docdir = $(prefix)/doc
> - atdocdir = $(docdir)/at
> - etcdir = @ETCDIR@
> -
> -+ifdef IROOT
> -+DESTDIR = $(IROOT)
> -+endif
> -+
> - DAEMON_USERNAME = @DAEMON_USERNAME@
> - DAEMON_GROUPNAME= @DAEMON_GROUPNAME@
> - LOADAVG_MX = @LOADAVG_MX@
> -@@ -86,38 +90,38 @@ atrun: atrun.in
> - $(CC) -c $(CFLAGS) $(DEFS) $*.c
> -
> - install: all
> -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir)
> -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir)
> -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir)
> -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir)
> -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir)
> -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
> -- chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
> -- touch $(IROOT)$(LFILE)
> -- chmod 600 $(IROOT)$(LFILE)
> -- chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
> -- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
> -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir)
> -- $(LN_S) -f at $(IROOT)$(bindir)/atq
> -- $(LN_S) -f at $(IROOT)$(bindir)/atrm
> -- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
> -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
> -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
> -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
> -- $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir)
> -- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
> -- $(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)
> -+ 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)$(etcdir)/
> -+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s 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)/
> -+ 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)/
> - 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
> - 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
> -- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir)
> -- 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)/
> -+ cd $(DESTDIR)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5
> -+ $(INSTALL) -g root -o root -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*
> -
> - dist: checkin $(DIST) $(LIST) Filelist.asc
> - (cd ..; tar cf - `for a in $(DIST) $(LIST); do echo at-$(VERSION)/$$a; done` |\
> diff --git a/patches/at-3.1.12/autogen.sh b/patches/at-3.1.12/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7ddcb..000000000000
> --- a/patches/at-3.1.12/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/at-3.1.12/series b/patches/at-3.1.12/series
> deleted file mode 100644
> index 18e752288b44..000000000000
> --- a/patches/at-3.1.12/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -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
> -0005-Makefile.in-replace-IROOT-by-DESTDIR.patch
> diff --git a/rules/at.make b/rules/at.make
> index 5a105e271652..7a4da8f5a9b8 100644
> --- a/rules/at.make
> +++ b/rules/at.make
> @@ -14,18 +14,18 @@ PACKAGES-$(PTXCONF_AT) += at
> #
> # Paths and names
> #
> -AT_VERSION := 3.1.12
> -AT_MD5 := 1e67991776148fb319fd77a2e599a765
> +AT_VERSION := 3.2.5
> +AT_MD5 := ca3657a1c90d7c3d252e0bc17feddc6e
> AT_SUFFIX := tar.gz
> AT := at-$(AT_VERSION)
> AT_TARBALL := at_$(AT_VERSION).orig.$(AT_SUFFIX)
> -AT_URL := http://snapshot.debian.org/archive/debian/20091130T214753Z/pool/main/a/at/$(AT_TARBALL)
> +AT_URL := http://software.calhariz.com/at/$(AT_TARBALL)
> AT_SOURCE := $(SRCDIR)/$(AT_TARBALL)
> AT_DIR := $(BUILDDIR)/$(AT)
> AT_LICENSE := GPL-2.0-or-later AND GPL-3.0-or-later AND ISC
> AT_LICENSE_FILES := \
> file://COPYING;md5=4325afd396febcb659c36b49533135d4 \
> - file://Copyright;md5=dffa11c636884752fbf0b2a159b2883a
> + file://Copyright;md5=7532282502653b5282e013ffe944d993
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -47,10 +47,11 @@ endif
> AT_CONF_TOOL := autoconf
> AT_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> - --with-loadavg_mx=1.5 \
> --with-jobdir=/var/spool/cron/atjobs \
> --with-atspool=/var/spool/cron/atspool \
> + --with-loadavg_mx=1.5 \
> --with-daemon_username=root \
> + --$(call ptx/wwo, PTXCONF_GLOBAL_SELINUX)-selinux \
> --with-daemon_groupname=root \
> SENDMAIL=$(AT_SENDMAIL)
>
next prev parent reply other threads:[~2022-06-10 6:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-25 8:37 [ptxdist] [PATCH v2 0/2] at: version bump and remove from staging Alexander Dahl
2022-05-25 8:37 ` [ptxdist] [PATCH v2 1/2] at: version bump 3.1.12 -> 3.2.5 Alexander Dahl
2022-06-10 6:49 ` Michael Olbrich [this message]
2022-05-25 8:37 ` [ptxdist] [PATCH v2 2/2] Revert "at: move to staging" Alexander Dahl
2022-06-10 6:49 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220610064919.2823604-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox