From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9af602b59c511590333460cea83d7da118c89951 Date: Tue, 07 Jul 2015 23:11:39 +0200 Message-ID: <20150707211139.5A8F12239D@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4858063017310410520==" List-Id: --===============4858063017310410520== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 9af602b59c511590333460cea83d7da118c89951 (commit) via 3e9e8800e78785bf4842ffeb2a87694cfecff82f (commit) via be2d2d2fb04a76d922a319d1d18f42e4ac98dff5 (commit) from df0bd0e30456401d73641b88bf1ae8e8a36ae20c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9af602b59c511590333460cea83d7da118c89951 Author: Erik Kapfer Date: Tue Jul 7 12:53:45 2015 +0200 Remove all dependencies to libevent2 =20 libevent2 has become a part of the core system and is not a package any more. =20 Signed-off-by: Erik Kapfer Signed-off-by: Michael Tremer commit 3e9e8800e78785bf4842ffeb2a87694cfecff82f Author: Erik Kapfer Date: Tue Jul 7 12:53:44 2015 +0200 libevent2: Move from package to core system =20 The library is used by many other components and it makes more sense to integrate it into the core system like libevent. =20 Signed-off-by: Erik Kapfer Signed-off-by: Michael Tremer commit be2d2d2fb04a76d922a319d1d18f42e4ac98dff5 Author: Erik Kapfer Date: Tue Jul 7 12:53:43 2015 +0200 libevent2: Update to 2.0.22-stable =20 Signed-off-by: Erik Kapfer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{packages =3D> common}/libevent2 | 0 lfs/libevent2 | 19 ++++++++----------- lfs/tmux | 4 ++-- lfs/tor | 4 ++-- lfs/transmission | 4 ++-- 5 files changed, 14 insertions(+), 17 deletions(-) rename config/rootfiles/{packages =3D> common}/libevent2 (100%) Difference in files: diff --git a/config/rootfiles/common/libevent2 b/config/rootfiles/common/libe= vent2 new file mode 100644 index 0000000..5beb5f8 --- /dev/null +++ b/config/rootfiles/common/libevent2 @@ -0,0 +1,45 @@ +#usr/include/event2 +#usr/include/event2/buffer.h +#usr/include/event2/buffer_compat.h +#usr/include/event2/bufferevent.h +#usr/include/event2/bufferevent_compat.h +#usr/include/event2/bufferevent_ssl.h +#usr/include/event2/bufferevent_struct.h +#usr/include/event2/dns.h +#usr/include/event2/dns_compat.h +#usr/include/event2/dns_struct.h +#usr/include/event2/event-config.h +#usr/include/event2/event.h +#usr/include/event2/event_compat.h +#usr/include/event2/event_struct.h +#usr/include/event2/http.h +#usr/include/event2/http_compat.h +#usr/include/event2/http_struct.h +#usr/include/event2/keyvalq_struct.h +#usr/include/event2/listener.h +#usr/include/event2/rpc.h +#usr/include/event2/rpc_compat.h +#usr/include/event2/rpc_struct.h +#usr/include/event2/tag.h +#usr/include/event2/tag_compat.h +#usr/include/event2/thread.h +#usr/include/event2/util.h +usr/lib/libevent-2.0.so.5 +usr/lib/libevent-2.0.so.5.1.9 +usr/lib/libevent_core-2.0.so.5 +usr/lib/libevent_core-2.0.so.5.1.9 +usr/lib/libevent_extra-2.0.so.5 +usr/lib/libevent_extra-2.0.so.5.1.9 +usr/lib/libevent_openssl-2.0.so.5 +usr/lib/libevent_openssl-2.0.so.5.1.9 +#usr/lib/libevent_openssl.a +#usr/lib/libevent_openssl.la +#usr/lib/libevent_openssl.so +usr/lib/libevent_pthreads-2.0.so.5 +usr/lib/libevent_pthreads-2.0.so.5.1.9 +#usr/lib/libevent_pthreads.a +#usr/lib/libevent_pthreads.la +#usr/lib/libevent_pthreads.so +#usr/lib/pkgconfig/libevent.pc +#usr/lib/pkgconfig/libevent_openssl.pc +#usr/lib/pkgconfig/libevent_pthreads.pc diff --git a/config/rootfiles/packages/libevent2 b/config/rootfiles/packages/= libevent2 deleted file mode 100644 index 5beb5f8..0000000 --- a/config/rootfiles/packages/libevent2 +++ /dev/null @@ -1,45 +0,0 @@ -#usr/include/event2 -#usr/include/event2/buffer.h -#usr/include/event2/buffer_compat.h -#usr/include/event2/bufferevent.h -#usr/include/event2/bufferevent_compat.h -#usr/include/event2/bufferevent_ssl.h -#usr/include/event2/bufferevent_struct.h -#usr/include/event2/dns.h -#usr/include/event2/dns_compat.h -#usr/include/event2/dns_struct.h -#usr/include/event2/event-config.h -#usr/include/event2/event.h -#usr/include/event2/event_compat.h -#usr/include/event2/event_struct.h -#usr/include/event2/http.h -#usr/include/event2/http_compat.h -#usr/include/event2/http_struct.h -#usr/include/event2/keyvalq_struct.h -#usr/include/event2/listener.h -#usr/include/event2/rpc.h -#usr/include/event2/rpc_compat.h -#usr/include/event2/rpc_struct.h -#usr/include/event2/tag.h -#usr/include/event2/tag_compat.h -#usr/include/event2/thread.h -#usr/include/event2/util.h -usr/lib/libevent-2.0.so.5 -usr/lib/libevent-2.0.so.5.1.9 -usr/lib/libevent_core-2.0.so.5 -usr/lib/libevent_core-2.0.so.5.1.9 -usr/lib/libevent_extra-2.0.so.5 -usr/lib/libevent_extra-2.0.so.5.1.9 -usr/lib/libevent_openssl-2.0.so.5 -usr/lib/libevent_openssl-2.0.so.5.1.9 -#usr/lib/libevent_openssl.a -#usr/lib/libevent_openssl.la -#usr/lib/libevent_openssl.so -usr/lib/libevent_pthreads-2.0.so.5 -usr/lib/libevent_pthreads-2.0.so.5.1.9 -#usr/lib/libevent_pthreads.a -#usr/lib/libevent_pthreads.la -#usr/lib/libevent_pthreads.so -#usr/lib/pkgconfig/libevent.pc -#usr/lib/pkgconfig/libevent_openssl.pc -#usr/lib/pkgconfig/libevent_pthreads.pc diff --git a/lfs/libevent2 b/lfs/libevent2 index e2ad69f..2482dda 100644 --- a/lfs/libevent2 +++ b/lfs/libevent2 @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2014 IPFire Team = # +# Copyright (C) 2007-2015 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 2.0.21-stable +VER =3D 2.0.22-stable =20 THISAPP =3D libevent-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,11 +32,6 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) =20 -PROG =3D libevent2 -PAK_VER =3D 2 - -DEPS =3D "" - ############################################################################= ### # Top-level Rules ############################################################################= ### @@ -45,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D b2405cc9ebf264aa47ff615d9de527a2 +$(DL_FILE)_MD5 =3D c4c56f986aa985677ca1db89630a2e11 =20 install : $(TARGET) =20 @@ -68,8 +63,6 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) =20 -dist:=20 - @$(PAK) ############################################################################= ### # Installation Details ############################################################################= ### @@ -77,8 +70,12 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=3D/usr + cd $(DIR_APP) && ./configure \ + --prefix=3D/usr \ + --disable-static + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/tmux b/lfs/tmux index ddd5384..2223d13 100644 --- a/lfs/tmux +++ b/lfs/tmux @@ -32,9 +32,9 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D tmux -PAK_VER =3D 2 +PAK_VER =3D 3 =20 -DEPS =3D "libevent2" +DEPS =3D "" =20 ############################################################################= ### # Top-level Rules diff --git a/lfs/tor b/lfs/tor index eb18837..54f3b64 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,9 +32,9 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D tor -PAK_VER =3D 12 +PAK_VER =3D 13 =20 -DEPS =3D "libevent2" +DEPS =3D "" =20 ############################################################################= ### # Top-level Rules diff --git a/lfs/transmission b/lfs/transmission index 3a1cbdd..13b5723 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -32,9 +32,9 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D transmission -PAK_VER =3D 11 +PAK_VER =3D 12 =20 -DEPS =3D "libevent2" +DEPS =3D "" =20 CXXFLAGS +=3D -fno-exceptions =20 hooks/post-receive -- IPFire 2.x development tree --===============4858063017310410520==--