From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 Date: Tue, 12 Jan 2010 19:17:11 +0200 From: Michael Shigorin To: ALT Linux Sisyphus discussions Message-ID: <20100112171711.GF11686@osdn.org.ua> Mail-Followup-To: ALT Linux Sisyphus discussions , Denis Smirnov References: <20100112124344.GF28738@ender.fondinvestrk.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="96YOpH+ONegL0A3E" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.4.2.1i Cc: Denis Smirnov Subject: Re: [sisyphus] ppp-2.4.5-alt1 X-BeenThere: sisyphus@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: shigorin@gmail.com, ALT Linux Sisyphus discussions List-Id: ALT Linux Sisyphus discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 17:17:28 -0000 Archived-At: List-Archive: List-Post: --96YOpH+ONegL0A3E Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit On Tue, Jan 12, 2010 at 04:42:16PM +0300, Alexey Shabalin wrote: > >> Ещё раз прошу проверить работу нового ppp. > >> Сборка выложена на http://ftp.altlinux.org/pub/people/shaba/ > >> если претензий не будет, в таком виде поедет в сизиф. У меня работает (пересобрал для M51). В сизиф просьба обождать, см. ниже и в аттачах (оказывается, забыл пушнуть 2.4.4-alt13. > > а можно попросить напомнить, какие там изменения? > - 2.4.5 > - обновлён eap-tls патч. У меня с ним работает eToken. > - изменена схема сборки из git. Кому не нравится прошу высказать пожелания. Мне не нравится хранить не имеющее ни малейшего отношения к gear в .gear. Для такого IMHO лучше держать чистый master, а исходники -- в бранче upstream. -- ---- WBR, Michael Shigorin ------ Linux.Kiev http://www.linux.kiev.ua/ --96YOpH+ONegL0A3E Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="ppp-2.4.4-rh-closelog.patch" --- ppp-2.4.4/pppd/main.c 2006-06-04 06:52:50.000000000 +0300 +++ ../../ppp/pppd/main.c 2006-12-19 12:22:11.000000000 +0200 @@ -66,7 +66,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: main.c,v 1.153 2006/06/04 03:52:50 paulus Exp $" +#define RCSID "$Id: main.c,v 1.155 2006/12/19 10:22:11 paulus Exp $" #include #include @@ -1567,6 +1567,8 @@ if (errfd == 0 || errfd == 1) errfd = dup(errfd); + closelog(); + /* dup the in, out, err fds to 0, 1, 2 */ if (infd != 0) dup2(infd, 0); @@ -1575,7 +1577,6 @@ if (errfd != 2) dup2(errfd, 2); - closelog(); if (log_to_fd > 2) close(log_to_fd); if (the_channel->close) --96YOpH+ONegL0A3E Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-imported-ppp-2.4.4-rh-closelog.patch-from-RH-222295.patch" >>From 5a2ba7fc83bd5f42c813c20145cecfcf5cf10f6a Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sun, 22 Nov 2009 19:18:27 +0200 Subject: [PATCH 1/2] imported ppp-2.4.4-rh-closelog.patch from RH#222295 --- ppp-2.4.4-rh-closelog.patch | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) create mode 100644 ppp-2.4.4-rh-closelog.patch diff --git a/ppp-2.4.4-rh-closelog.patch b/ppp-2.4.4-rh-closelog.patch new file mode 100644 index 0000000..ea31432 --- /dev/null +++ b/ppp-2.4.4-rh-closelog.patch @@ -0,0 +1,28 @@ +--- ppp-2.4.4/pppd/main.c 2006-06-04 06:52:50.000000000 +0300 ++++ ../../ppp/pppd/main.c 2006-12-19 12:22:11.000000000 +0200 +@@ -66,7 +66,7 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +-#define RCSID "$Id: main.c,v 1.153 2006/06/04 03:52:50 paulus Exp $" ++#define RCSID "$Id: main.c,v 1.155 2006/12/19 10:22:11 paulus Exp $" + +#include +#include +@@ -1567,6 +1567,8 @@ + if (errfd == 0 || errfd == 1) + errfd = dup(errfd); + ++ closelog(); ++ + /* dup the in, out, err fds to 0, 1, 2 */ + if (infd != 0) + dup2(infd, 0); +@@ -1575,7 +1577,6 @@ + if (errfd != 2) + dup2(errfd, 2); + +- closelog(); + if (log_to_fd > 2) + close(log_to_fd); + if (the_channel->close) -- 1.6.5.2 --96YOpH+ONegL0A3E Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-2.4.4-alt13.patch" >>From e660ad07a3425d1f8de11740230fcb0c2ed150c8 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sun, 22 Nov 2009 19:33:47 +0200 Subject: [PATCH 2/2] 2.4.4-alt13 - added patch to fix early closelog() (RH#222295, thx mlists/list.ru for proposal) --- ppp.spec | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ppp.spec b/ppp.spec index 45a4df1..79b99eb 100644 --- a/ppp.spec +++ b/ppp.spec @@ -11,7 +11,7 @@ Name: ppp Version: 2.4.4 -Release: alt12 +Release: alt13 Summary: The PPP daemon and documentation License: distributable Group: System/Servers @@ -89,6 +89,9 @@ Patch54: ppp-2.4.4-alt-ipparam.patch # patch define aligned_u64 directly Patch55: ppp-2.4.4-alt-define-aligned_u64.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=222295 +Patch56: ppp-2.4.4-rh-closelog.patch + Packager: Denis Smirnov PreReq: /var/lock/serial @@ -221,6 +224,7 @@ popd %patch54 -p1 # ugly hack: patch define aligned_u64 directly %patch55 -p1 +%patch56 -p1 # enable the dhcp plugin perl -p -i -e "s|^(PLUGINS :=)|SUBDIRS += dhcp\n\$1|g" pppd/plugins/Makefile.linux @@ -348,6 +352,10 @@ install -pD -m644 %SOURCE5 %buildroot%_sysconfdir/logrotate.d/%name # - more spec cleanup re $RPM_BUILD_ROOT and friends %changelog +* Sun Nov 22 2009 Michael Shigorin 2.4.4-alt13 +- added patch to fix early closelog() + (RH#222295, thx mlists/list.ru for proposal) + * Fri May 15 2009 Michael Shigorin 2.4.4-alt12 - fixed FTBFS with current libtool -- 1.6.5.2 --96YOpH+ONegL0A3E--