From: Michael Shigorin <mike@osdn.org.ua>
To: Denis Smirnov <mithraen@freesource.info>
Cc: ALT Linux Sisyphus discussions <sisyphus@lists.altlinux.org>
Subject: Re: [sisyphus] ppp-2.4.5-alt1
Date: Tue, 12 Jan 2010 21:27:23 +0200
Message-ID: <20100112192723.GH11686@osdn.org.ua> (raw)
In-Reply-To: <b6fe84cf1001120958n5cb00159y7ae32668e5d46a90@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]
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/
[-- Attachment #2: chap-md5.c.rej --]
[-- Type: text/plain, Size: 411 bytes --]
***************
*** 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
[-- Attachment #3: eap.c.rej --]
[-- Type: text/plain, Size: 323 bytes --]
***************
*** 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
next prev parent reply other threads:[~2010-01-12 19:27 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-12 11:55 Alexey Shabalin
2010-01-12 12:43 ` Afanasov Dmitry
2010-01-12 13:42 ` Alexey Shabalin
2010-01-12 17:17 ` Michael Shigorin
2010-01-12 22:57 ` Michael Shigorin
2010-01-13 8:44 ` Alexey Shabalin
2010-01-13 13:47 ` [sisyphus] [git] ppp-2.4.5-alt1 Michael Shigorin
2010-01-16 18:03 ` Alexey Shabalin
2010-01-16 18:09 ` [sisyphus] git hideoustory heirloom (was: [git] Re: ppp-2.4.5-alt1) Michael Shigorin
2010-01-12 17:42 ` [sisyphus] ppp-2.4.5-alt1 Denis Smirnov
2010-01-12 17:58 ` Denis Smirnov
2010-01-12 19:27 ` Michael Shigorin [this message]
2010-01-12 20:24 ` Alexey Shabalin
2010-01-12 22:25 ` Michael Shigorin
2010-01-12 19:36 ` [sisyphus] [JT] .gear/ vs altinux/ (was: ppp-2.4.5-alt1) Afanasov Dmitry
2010-01-28 15:20 ` Денис Смирнов
2010-01-13 15:07 ` [sisyphus] ppp-2.4.5-alt1 Mikhail Efremov
2010-01-13 15:59 ` Michael Shigorin
2010-01-13 17:50 ` Mikhail Efremov
2010-01-15 10:06 ` Alexey Shabalin
2010-01-15 16:42 ` Michael Shigorin
2010-01-15 16:56 ` Alexey Shabalin
2010-01-15 17:01 ` Michael Shigorin
2010-01-15 17:35 ` Mikhail Efremov
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=20100112192723.GH11686@osdn.org.ua \
--to=mike@osdn.org.ua \
--cc=mithraen@freesource.info \
--cc=shigorin@gmail.com \
--cc=sisyphus@lists.altlinux.org \
/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
ALT Linux Sisyphus discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/sisyphus/0 sisyphus/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 sisyphus sisyphus/ http://lore.altlinux.org/sisyphus \
sisyphus@altlinux.ru sisyphus@altlinux.org sisyphus@lists.altlinux.org sisyphus@lists.altlinux.ru sisyphus@lists.altlinux.com sisyphus@linuxteam.iplabs.ru sisyphus@list.linux-os.ru
public-inbox-index sisyphus
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.sisyphus
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git