From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <mike@fly.osdn.org.ua>
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=unavailable version=3.2.5
Date: Tue, 12 Jan 2010 21:27:23 +0200
From: Michael Shigorin <mike@osdn.org.ua>
To: Denis Smirnov <mithraen@freesource.info>
Message-ID: <20100112192723.GH11686@osdn.org.ua>
Mail-Followup-To: Denis Smirnov <mithraen@freesource.info>, shaba@altlinux.ru,
	ALT Linux Sisyphus discussions <sisyphus@lists.altlinux.org>
References: <b966c1e41001120355t736bd0d0k81e61c2f4073b674@mail.gmail.com>
	<b6fe84cf1001120958n5cb00159y7ae32668e5d46a90@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="MIdTMoZhcV1D07fI"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <b6fe84cf1001120958n5cb00159y7ae32668e5d46a90@mail.gmail.com>
User-Agent: Mutt/1.4.2.1i
Cc: ALT Linux Sisyphus discussions <sisyphus@lists.altlinux.org>
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 <sisyphus@lists.altlinux.org>
List-Id: ALT Linux Sisyphus discussions <sisyphus.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/sisyphus>,
	<mailto:sisyphus-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/sisyphus>
List-Post: <mailto:sisyphus@lists.altlinux.org>
List-Help: <mailto:sisyphus-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/sisyphus>,
	<mailto:sisyphus-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jan 2010 19:27:38 -0000
Archived-At: <http://lore.altlinux.org/sisyphus/20100112192723.GH11686@osdn.org.ua/>
List-Archive: <http://lore.altlinux.org/sisyphus/>
List-Post: <mailto:sisyphus@altlinux.ru>


--MIdTMoZhcV1D07fI
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

On Tue, Jan 12, 2010 at 08:58:00PM +0300, Denis Smirnov wrote:
> Предлагаю все, что сейчас лежит в .gear не по делу, переложить
> в каталог, скажем, с названием 'altlinux'.

Подожди, я уже работаю над upstream отдельно, master без патчей,
а только с ppp.{spec,control,сотоварищи}:

tar: v@version@:.
copy: *.control
copy: *.pamd
copy: *.logrotate
diff: v2.4.5:. patches/alt-fix:. name=ppp-2.4.5-alt-fix.patch
diff: v2.4.5:. patches/cbcp:. name=ppp-2.4.5-cbcp.patch
diff: v2.4.5:. patches/cifdefroute:. name=ppp-2.4.5-cifdefroute.patch
diff: v2.4.5:. patches/dhcp:. name=ppp-2.4.5-dhcp.patch
diff: v2.4.5:. patches/eaptls:. name=ppp-2.4.5-eaptls.patch
diff: v2.4.5:. patches/openssl:. name=ppp-2.4.5-openssl.patch
diff: v2.4.5:. patches/sample:. name=ppp-2.4.5-sample.patch
diff: v2.4.5:. patches/sigterm:. name=ppp-2.4.5-sigterm.patch

Пока застрял на приложенных реджектах от patches/eaptls, не могу
врубиться по gitk shaba/master -- за что он зацепился.

Придётся пока домой двигать.

-- 
 ---- WBR, Michael Shigorin <mike@altlinux.ru>
  ------ Linux.Kiev http://www.linux.kiev.ua/

--MIdTMoZhcV1D07fI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="chap-md5.c.rej"

***************
*** 36,42 ****
  #include "chap-new.h"
  #include "chap-md5.h"
  #include "magic.h"
  #include "md5.h"
  
  #define MD5_HASH_SIZE		16
  #define MD5_MIN_CHALLENGE	16
--- 36,46 ----
  #include "chap-new.h"
  #include "chap-md5.h"
  #include "magic.h"
+ #ifdef USE_OPENSSL
+ #include <openssl/md5.h>
+ #else
  #include "md5.h"
+ #endif
  
  #define MD5_HASH_SIZE		16
  #define MD5_MIN_CHALLENGE	16

--MIdTMoZhcV1D07fI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="eap.c.rej"

***************
*** 62,68 ****
  
  #include "pppd.h"
  #include "pathnames.h"
  #include "md5.h"
  #include "eap.h"
  
  #ifdef USE_SRP
--- 62,72 ----
  
  #include "pppd.h"
  #include "pathnames.h"
+ #ifdef USE_OPENSSL
+ #include <openssl/md5.h>
+ #else
  #include "md5.h"
+ #endif
  #include "eap.h"
  
  #ifdef USE_SRP

--MIdTMoZhcV1D07fI--