diff mbox

[LEDE-DEV] Syslog-ng Makefile typo

Message ID b776cb38-f2f6-145d-00bd-356bfd681300@gmail.com
State Changes Requested
Headers show

Commit Message

Milan Kočvara Jan. 16, 2017, 11:24 a.m. UTC 
Hello.
I found typo in syslog-ng makefile.

I've upgraded to the newest version and I've made correction of the 
typo. Patch bellow.

Sorry for bad format of everything. I did it never :)


@@ -41,7 +41,7 @@
  CONFIGURE_ARGS += \
    $(call autoconf_bool,CONFIG_IPV6,ipv6) \
           --disable-dependency-tracking \
-         --disable-ampq \
+         --disable-amqp \
           --disable-tcp-wrapper \
           --disable-glibtest \
           --disable-mongodb \

Comments

Philip Prindeville Jan. 16, 2017, 8:45 p.m. UTC | #1 
Looks good to me.


> On Jan 16, 2017, at 4:24 AM, Milan Kočvara <milankocvara@gmail.com> wrote:
> 
> Hello.
> I found typo in syslog-ng makefile.
> 
> I've upgraded to the newest version and I've made correction of the typo. Patch bellow.
> 
> Sorry for bad format of everything. I did it never :)
> 
> --- Makefile-orig       2017-01-16 12:06:44.367684776 +0100
> +++ Makefile~   2017-01-16 12:22:47.198478933 +0100
> @@ -1,14 +1,14 @@
> include  $(TOPDIR)/rules.mk
> 
> PKG_NAME:=syslog-ng
> -PKG_VERSION:=3.8.1
> -PKG_RELEASE:=3
> +PKG_VERSION:=3.9.1
> +PKG_RELEASE:=1
> 
> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
> 
> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
> PKG_SOURCE_URL:=https://github.com/balabit/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
> -PKG_MD5SUM:=acf14563cf5ce435db8db35486ce66af
> +PKG_MD5SUM:=1b48da9ef620cf06e55e481b5abb677a
> 
> PKG_INSTALL:=1
> 
> @@ -41,7 +41,7 @@
> CONFIGURE_ARGS += \
>   $(call autoconf_bool,CONFIG_IPV6,ipv6) \
>          --disable-dependency-tracking \
> -         --disable-ampq \
> +         --disable-amqp \
>          --disable-tcp-wrapper \
>          --disable-glibtest \
>          --disable-mongodb \
Philip Prindeville Jan. 17, 2017, 6:40 p.m. UTC | #2 
Actually, I take that back.

Milan, can you please update the top line of files/syslog-ng.conf also?  It needs to read “3.9” instead (assuming there aren’t any syntactic constructs in that file that are now deprecated from 3.8 to 3.9… if there were, the file would need to be updated as well… like when the log_prefix() filter criteria got replaced by program()).

Thanks


> On Jan 16, 2017, at 1:45 PM, Philip Prindeville <philipp_subx@redfish-solutions.com> wrote:
> 
> Looks good to me.
> 
> 
>> On Jan 16, 2017, at 4:24 AM, Milan Kočvara <milankocvara@gmail.com> wrote:
>> 
>> Hello.
>> I found typo in syslog-ng makefile.
>> 
>> I've upgraded to the newest version and I've made correction of the typo. Patch bellow.
>> 
>> Sorry for bad format of everything. I did it never :)
>> 
>> --- Makefile-orig       2017-01-16 12:06:44.367684776 +0100
>> +++ Makefile~   2017-01-16 12:22:47.198478933 +0100
>> @@ -1,14 +1,14 @@
>> include  $(TOPDIR)/rules.mk
>> 
>> PKG_NAME:=syslog-ng
>> -PKG_VERSION:=3.8.1
>> -PKG_RELEASE:=3
>> +PKG_VERSION:=3.9.1
>> +PKG_RELEASE:=1
>> 
>> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
>> 
>> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
>> PKG_SOURCE_URL:=https://github.com/balabit/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
>> -PKG_MD5SUM:=acf14563cf5ce435db8db35486ce66af
>> +PKG_MD5SUM:=1b48da9ef620cf06e55e481b5abb677a
>> 
>> PKG_INSTALL:=1
>> 
>> @@ -41,7 +41,7 @@
>> CONFIGURE_ARGS += \
>>  $(call autoconf_bool,CONFIG_IPV6,ipv6) \
>>         --disable-dependency-tracking \
>> -         --disable-ampq \
>> +         --disable-amqp \
>>         --disable-tcp-wrapper \
>>         --disable-glibtest \
>>         --disable-mongodb \
> 
> 
> _______________________________________________
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
John Crispin Jan. 18, 2017, 7:39 a.m. UTC | #3 
Hi,

although the content of the patch looks good the format is incorrect.
you really want to generate the patch using git and then use git
format-patch/send-email to export and mail it. we cannot merge it in
this format i am afraid. please also make sure to add a Signed-off-by line

	John

On 16/01/2017 12:24, Milan Kočvara wrote:
> Hello.
> I found typo in syslog-ng makefile.
> 
> I've upgraded to the newest version and I've made correction of the
> typo. Patch bellow.
> 
> Sorry for bad format of everything. I did it never :)
> 
> --- Makefile-orig       2017-01-16 12:06:44.367684776 +0100
> +++ Makefile~   2017-01-16 12:22:47.198478933 +0100
> @@ -1,14 +1,14 @@
>  include  $(TOPDIR)/rules.mk
> 
>  PKG_NAME:=syslog-ng
> -PKG_VERSION:=3.8.1
> -PKG_RELEASE:=3
> +PKG_VERSION:=3.9.1
> +PKG_RELEASE:=1
> 
>  PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
> 
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
> 
> PKG_SOURCE_URL:=https://github.com/balabit/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
> 
> -PKG_MD5SUM:=acf14563cf5ce435db8db35486ce66af
> +PKG_MD5SUM:=1b48da9ef620cf06e55e481b5abb677a
> 
>  PKG_INSTALL:=1
> 
> @@ -41,7 +41,7 @@
>  CONFIGURE_ARGS += \
>    $(call autoconf_bool,CONFIG_IPV6,ipv6) \
>           --disable-dependency-tracking \
> -         --disable-ampq \
> +         --disable-amqp \
>           --disable-tcp-wrapper \
>           --disable-glibtest \
>           --disable-mongodb \
> 
> _______________________________________________
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
Philip Prindeville Jan. 18, 2017, 7:21 p.m. UTC | #4 
You can also add:

Reviewed-by: Philip Prindeville <philipp@redfish-solutions.com>

regarding the unix-stream() vs. unix-dgram(), here’s a bug from Debian (which also uses syslog-ng):

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=384802


> On Jan 18, 2017, at 12:39 AM, John Crispin <john@phrozen.org> wrote:
> 
> Hi,
> 
> although the content of the patch looks good the format is incorrect.
> you really want to generate the patch using git and then use git
> format-patch/send-email to export and mail it. we cannot merge it in
> this format i am afraid. please also make sure to add a Signed-off-by line
> 
> 	John
> 
> On 16/01/2017 12:24, Milan Kočvara wrote:
>> Hello.
>> I found typo in syslog-ng makefile.
>> 
>> I've upgraded to the newest version and I've made correction of the
>> typo. Patch bellow.
>> 
>> Sorry for bad format of everything. I did it never :)
>> 
>> --- Makefile-orig       2017-01-16 12:06:44.367684776 +0100
>> +++ Makefile~   2017-01-16 12:22:47.198478933 +0100
>> @@ -1,14 +1,14 @@
>> include  $(TOPDIR)/rules.mk
>> 
>> PKG_NAME:=syslog-ng
>> -PKG_VERSION:=3.8.1
>> -PKG_RELEASE:=3
>> +PKG_VERSION:=3.9.1
>> +PKG_RELEASE:=1
>> 
>> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
>> 
>> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
>> 
>> PKG_SOURCE_URL:=https://github.com/balabit/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
>> 
>> -PKG_MD5SUM:=acf14563cf5ce435db8db35486ce66af
>> +PKG_MD5SUM:=1b48da9ef620cf06e55e481b5abb677a
>> 
>> PKG_INSTALL:=1
>> 
>> @@ -41,7 +41,7 @@
>> CONFIGURE_ARGS += \
>>   $(call autoconf_bool,CONFIG_IPV6,ipv6) \
>>          --disable-dependency-tracking \
>> -         --disable-ampq \
>> +         --disable-amqp \
>>          --disable-tcp-wrapper \
>>          --disable-glibtest \
>>          --disable-mongodb \
>> 
>> _______________________________________________
>> Lede-dev mailing list
>> Lede-dev@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/lede-dev
> 
> _______________________________________________
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
Philip Prindeville Jan. 23, 2017, 5:31 p.m. UTC | #5 
To make things go a little faster, I’ve put up a PR on github:

https://github.com/openwrt/packages/pull/3894


> On Jan 18, 2017, at 12:39 AM, John Crispin <john@phrozen.org> wrote:
> 
> Hi,
> 
> although the content of the patch looks good the format is incorrect.
> you really want to generate the patch using git and then use git
> format-patch/send-email to export and mail it. we cannot merge it in
> this format i am afraid. please also make sure to add a Signed-off-by line
> 
> 	John
> 
> On 16/01/2017 12:24, Milan Kočvara wrote:
>> Hello.
>> I found typo in syslog-ng makefile.
>> 
>> I've upgraded to the newest version and I've made correction of the
>> typo. Patch bellow.
>> 
>> Sorry for bad format of everything. I did it never :)
>> 
>> --- Makefile-orig       2017-01-16 12:06:44.367684776 +0100
>> +++ Makefile~   2017-01-16 12:22:47.198478933 +0100
>> @@ -1,14 +1,14 @@
>> include  $(TOPDIR)/rules.mk
>> 
>> PKG_NAME:=syslog-ng
>> -PKG_VERSION:=3.8.1
>> -PKG_RELEASE:=3
>> +PKG_VERSION:=3.9.1
>> +PKG_RELEASE:=1
>> 
>> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
>> 
>> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
>> 
>> PKG_SOURCE_URL:=https://github.com/balabit/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
>> 
>> -PKG_MD5SUM:=acf14563cf5ce435db8db35486ce66af
>> +PKG_MD5SUM:=1b48da9ef620cf06e55e481b5abb677a
>> 
>> PKG_INSTALL:=1
>> 
>> @@ -41,7 +41,7 @@
>> CONFIGURE_ARGS += \
>>   $(call autoconf_bool,CONFIG_IPV6,ipv6) \
>>          --disable-dependency-tracking \
>> -         --disable-ampq \
>> +         --disable-amqp \
>>          --disable-tcp-wrapper \
>>          --disable-glibtest \
>>          --disable-mongodb \
>> 
>> _______________________________________________
>> Lede-dev mailing list
>> Lede-dev@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/lede-dev
> 
> _______________________________________________
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
diff mbox

Patch

--- Makefile-orig       2017-01-16 12:06:44.367684776 +0100
+++ Makefile~   2017-01-16 12:22:47.198478933 +0100
@@ -1,14 +1,14 @@ 
  include  $(TOPDIR)/rules.mk

  PKG_NAME:=syslog-ng
-PKG_VERSION:=3.8.1
-PKG_RELEASE:=3
+PKG_VERSION:=3.9.1
+PKG_RELEASE:=1

  PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
PKG_SOURCE_URL:=https://github.com/balabit/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_MD5SUM:=acf14563cf5ce435db8db35486ce66af
+PKG_MD5SUM:=1b48da9ef620cf06e55e481b5abb677a

  PKG_INSTALL:=1