rpms/iproute/F-8 iproute2-2.6.25-aead.patch, NONE, 1.1 iproute2-2.6.25-segfault.patch, NONE, 1.1 iproute2-movelib.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 iproute-ip-man.patch, 1.1, 1.2 iproute.spec, 1.71, 1.72 iproute2-2.6.9-kernel.patch, 1.1, 1.2 iproute2-ss050901-opt_flags.patch, 1.3, 1.4 sources, 1.22, 1.23
Marcela Mašláňová (mmaslano)
fedora-extras-commits at redhat.com
Tue Aug 12 14:19:35 UTC 2008
Author: mmaslano
Update of /cvs/pkgs/rpms/iproute/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32420
Modified Files:
.cvsignore iproute-ip-man.patch iproute.spec
iproute2-2.6.9-kernel.patch iproute2-ss050901-opt_flags.patch
sources
Added Files:
iproute2-2.6.25-aead.patch iproute2-2.6.25-segfault.patch
iproute2-movelib.patch
Log Message:
* Tue Aug 12 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.26-1
- update to 2.6.26
- clean patches
iproute2-2.6.25-aead.patch:
--- NEW FILE iproute2-2.6.25-aead.patch ---
diff -up iproute-2.6.26/iproute2-2.6.26/include/linux/xfrm.h.aead iproute-2.6.26/iproute2-2.6.26/include/linux/xfrm.h
--- iproute-2.6.26/iproute2-2.6.26/include/linux/xfrm.h.aead 2008-07-25 22:46:07.000000000 +0200
+++ iproute-2.6.26/iproute2-2.6.26/include/linux/xfrm.h 2008-08-12 15:16:13.000000000 +0200
@@ -428,12 +428,14 @@ struct xfrm_user_migrate {
__u16 new_family;
};
+#ifndef __KERNEL__
/* backwards compatibility for userspace */
#define XFRMGRP_ACQUIRE 1
#define XFRMGRP_EXPIRE 2
#define XFRMGRP_SA 4
#define XFRMGRP_POLICY 8
#define XFRMGRP_REPORT 0x20
+#endif
enum xfrm_nlgroups {
XFRMNLGRP_NONE,
diff -up iproute-2.6.26/iproute2-2.6.26/ip/ipxfrm.c.aead iproute-2.6.26/iproute2-2.6.26/ip/ipxfrm.c
--- iproute-2.6.26/iproute2-2.6.26/ip/ipxfrm.c.aead 2008-07-25 22:46:07.000000000 +0200
+++ iproute-2.6.26/iproute2-2.6.26/ip/ipxfrm.c 2008-08-12 15:16:13.000000000 +0200
@@ -154,7 +154,8 @@ const char *strxf_xfrmproto(__u8 proto)
static const struct typeent algo_types[]= {
{ "enc", XFRMA_ALG_CRYPT }, { "auth", XFRMA_ALG_AUTH },
- { "comp", XFRMA_ALG_COMP }, { NULL, -1 }
+ { "comp", XFRMA_ALG_COMP }, { "aead", XFRMA_ALG_AEAD },
+ { NULL, -1 }
};
int xfrm_algotype_getbyname(char *name)
@@ -525,8 +526,8 @@ void xfrm_selector_print(struct xfrm_sel
fprintf(fp, "%s", _SL_);
}
-static void xfrm_algo_print(struct xfrm_algo *algo, int type, int len,
- FILE *fp, const char *prefix)
+static void __xfrm_algo_print(struct xfrm_algo *algo, int type, int len,
+ FILE *fp, const char *prefix, int newline)
{
int keylen;
int i;
@@ -558,6 +559,32 @@ static void xfrm_algo_print(struct xfrm_
fprintf(fp, " (%d bits)", algo->alg_key_len);
fin:
+ if (newline)
+ fprintf(fp, "%s", _SL_);
+}
+
+static inline void xfrm_algo_print(struct xfrm_algo *algo, int type, int len,
+ FILE *fp, const char *prefix)
+{
+ return __xfrm_algo_print(algo, type, len, fp, prefix, 1);
+}
+
+static void xfrm_aead_print(struct xfrm_algo_aead *algo, int len,
+ FILE *fp, const char *prefix)
+{
+ struct {
+ struct xfrm_algo algo;
+ char key[algo->alg_key_len / 8];
+ } base;
+
+ memcpy(base.algo.alg_name, algo->alg_name, sizeof(base.algo.alg_name));
+ base.algo.alg_key_len = algo->alg_key_len;
+ memcpy(base.algo.alg_key, algo->alg_key, algo->alg_key_len / 8);
+
+ __xfrm_algo_print(&base.algo, XFRMA_ALG_AEAD, len, fp, prefix, 0);
+
+ fprintf(fp, " %d", algo->alg_icv_len);
+
fprintf(fp, "%s", _SL_);
}
@@ -635,6 +662,12 @@ void xfrm_xfrma_print(struct rtattr *tb[
XFRMA_ALG_AUTH, RTA_PAYLOAD(rta), fp, prefix);
}
+ if (tb[XFRMA_ALG_AEAD]) {
+ struct rtattr *rta = tb[XFRMA_ALG_AEAD];
+ xfrm_aead_print((struct xfrm_algo_aead *)RTA_DATA(rta),
+ RTA_PAYLOAD(rta), fp, prefix);
+ }
+
if (tb[XFRMA_ALG_CRYPT]) {
struct rtattr *rta = tb[XFRMA_ALG_CRYPT];
xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta),
diff -up iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c.aead iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c
--- iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c.aead 2008-07-25 22:46:07.000000000 +0200
+++ iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c 2008-08-12 15:16:13.000000000 +0200
@@ -89,8 +89,10 @@ static void usage(void)
fprintf(stderr, "ENCAP-TYPE := espinudp | espinudp-nonike\n");
fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] | [ ALGO ]\n");
- fprintf(stderr, "ALGO := ALGO_TYPE ALGO_NAME ALGO_KEY\n");
+ fprintf(stderr, "ALGO := ALGO_TYPE ALGO_NAME ALGO_KEY "
+ "[ ALGO_ICV_LEN ]\n");
fprintf(stderr, "ALGO_TYPE := [ ");
+ fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_AEAD));
fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_CRYPT));
fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_AUTH));
fprintf(stderr, "%s ", strxf_algotype(XFRMA_ALG_COMP));
@@ -113,7 +115,7 @@ static void usage(void)
}
static int xfrm_algo_parse(struct xfrm_algo *alg, enum xfrm_attr_type_t type,
- char *name, char *key, int max)
+ char *name, char *key, char *buf, int max)
{
int len;
int slen = strlen(key);
@@ -153,7 +155,7 @@ static int xfrm_algo_parse(struct xfrm_a
if (get_u8(&val, vbuf, 16))
invarg("\"ALGOKEY\" is invalid", key);
- alg->alg_key[j] = val;
+ buf[j] = val;
}
} else {
len = slen;
@@ -161,7 +163,7 @@ static int xfrm_algo_parse(struct xfrm_a
if (len > max)
invarg("\"ALGOKEY\" makes buffer overflow\n", key);
- strncpy(alg->alg_key, key, len);
+ strncpy(buf, key, len);
}
}
@@ -235,6 +237,7 @@ static int xfrm_state_modify(int cmd, un
} req;
struct xfrm_replay_state replay;
char *idp = NULL;
+ char *aeadop = NULL;
char *ealgop = NULL;
char *aalgop = NULL;
char *calgop = NULL;
@@ -327,20 +330,31 @@ static int xfrm_state_modify(int cmd, un
/* try to assume ALGO */
int type = xfrm_algotype_getbyname(*argv);
switch (type) {
+ case XFRMA_ALG_AEAD:
case XFRMA_ALG_CRYPT:
case XFRMA_ALG_AUTH:
case XFRMA_ALG_COMP:
{
/* ALGO */
struct {
- struct xfrm_algo alg;
+ union {
+ struct xfrm_algo alg;
+ struct xfrm_algo_aead aead;
+ } u;
char buf[XFRM_ALGO_KEY_BUF_SIZE];
- } alg;
+ } alg = {};
int len;
+ __u32 icvlen;
char *name;
char *key;
+ char *buf;
switch (type) {
+ case XFRMA_ALG_AEAD:
+ if (aeadop)
+ duparg("ALGOTYPE", *argv);
+ aeadop = *argv;
+ break;
case XFRMA_ALG_CRYPT:
if (ealgop)
duparg("ALGOTYPE", *argv);
@@ -371,11 +385,27 @@ static int xfrm_state_modify(int cmd, un
NEXT_ARG();
key = *argv;
- memset(&alg, 0, sizeof(alg));
+ buf = alg.u.alg.alg_key;
+ len = sizeof(alg.u.alg);
+
+ if (type != XFRMA_ALG_AEAD)
+ goto parse_algo;
+
+ if (!NEXT_ARG_OK())
+ missarg("ALGOICVLEN");
+ NEXT_ARG();
+ if (get_u32(&icvlen, *argv, 0))
+ invarg("\"aead\" ICV length is invalid",
+ *argv);
+ alg.u.aead.alg_icv_len = icvlen;
+
+ buf = alg.u.aead.alg_key;
+ len = sizeof(alg.u.aead);
+parse_algo:
xfrm_algo_parse((void *)&alg, type, name, key,
- sizeof(alg.buf));
- len = sizeof(struct xfrm_algo) + alg.alg.alg_key_len;
+ buf, sizeof(alg.buf));
+ len += alg.u.alg.alg_key_len;
addattr_l(&req.n, sizeof(req.buf), type,
(void *)&alg, len);
@@ -432,7 +462,7 @@ static int xfrm_state_modify(int cmd, un
break;
}
- if (ealgop || aalgop || calgop) {
+ if (aeadop || ealgop || aalgop || calgop) {
if (!xfrm_xfrmproto_is_ipsec(req.xsinfo.id.proto)) {
fprintf(stderr, "\"ALGO\" is invalid with proto=%s\n",
strxf_xfrmproto(req.xsinfo.id.proto));
iproute2-2.6.25-segfault.patch:
--- NEW FILE iproute2-2.6.25-segfault.patch ---
diff -up iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c.seg iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c
--- iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c.seg 2008-07-21 17:23:12.000000000 +0200
+++ iproute-2.6.26/iproute2-2.6.26/ip/xfrm_state.c 2008-07-22 09:27:12.000000000 +0200
@@ -158,12 +158,16 @@ static int xfrm_algo_parse(struct xfrm_a
buf[j] = val;
}
} else {
+ int i;
len = slen;
if (len > 0) {
if (len > max)
invarg("\"ALGOKEY\" makes buffer overflow\n", key);
- strncpy(buf, key, len);
+ for (i = 0 ; i < len && key[i] != '\0'; i++)
+ buf[i] = key[i];
+ for ( ; i < len; i++)
+ buf[i] = '\0';
}
}
iproute2-movelib.patch:
--- NEW FILE iproute2-movelib.patch ---
diff -up iproute-2.6.26/iproute2-2.6.26/netem/Makefile.lib iproute-2.6.26/iproute2-2.6.26/netem/Makefile
--- iproute-2.6.26/iproute2-2.6.26/netem/Makefile.lib 2008-07-25 22:46:07.000000000 +0200
+++ iproute-2.6.26/iproute2-2.6.26/netem/Makefile 2008-08-12 14:31:54.000000000 +0200
@@ -20,9 +20,9 @@ stats: stats.c
$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
install: all
- mkdir -p $(DESTDIR)/lib/tc
+ mkdir -p $(DESTDIR)/share/tc
for i in $(DISTDATA); \
- do install -m 755 $$i $(DESTDIR)/lib/tc; \
+ do install -m 755 $$i $(DESTDIR)/share/tc; \
done
clean:
diff -up iproute-2.6.26/iproute2-2.6.26/tc/tc_util.c.lib iproute-2.6.26/iproute2-2.6.26/tc/tc_util.c
--- iproute-2.6.26/iproute2-2.6.26/tc/tc_util.c.lib 2008-07-25 22:46:07.000000000 +0200
+++ iproute-2.6.26/iproute2-2.6.26/tc/tc_util.c 2008-08-12 14:32:54.000000000 +0200
@@ -34,7 +34,7 @@ const char *get_tc_lib(void)
lib_dir = getenv("TC_LIB_DIR");
if (!lib_dir)
- lib_dir = DESTDIR "/lib/tc";
+ lib_dir = DESTDIR "/share/tc";
return lib_dir;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-8/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 11 Jul 2007 10:08:09 -0000 1.22
+++ .cvsignore 12 Aug 2008 14:19:05 -0000 1.23
@@ -1 +1 @@
-iproute2-2.6.22-070710.tar.gz
+iproute2-2.6.26.tar.bz2
iproute-ip-man.patch:
Index: iproute-ip-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-8/iproute-ip-man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iproute-ip-man.patch 2 Oct 2006 13:31:17 -0000 1.1
+++ iproute-ip-man.patch 12 Aug 2008 14:19:05 -0000 1.2
@@ -1,6 +1,7 @@
---- iproute2-2.6.16-060323/man/man8/ip.8.old 2006-01-03 20:25:29.000000000 +0100
-+++ iproute2-2.6.16-060323/man/man8/ip.8 2006-10-02 15:13:05.000000000 +0200
-@@ -176,6 +176,8 @@ replace " | " monitor " } "
+diff -up iproute-2.6.26/iproute2-2.6.26/man/man8/ip.8.mm iproute-2.6.26/iproute2-2.6.26/man/man8/ip.8
+--- iproute-2.6.26/iproute2-2.6.26/man/man8/ip.8.mm 2008-07-25 22:46:07.000000000 +0200
++++ iproute-2.6.26/iproute2-2.6.26/man/man8/ip.8 2008-08-12 14:24:01.000000000 +0200
+@@ -190,6 +190,8 @@ replace " | " monitor " } "
.IR NUMBER " ] [ "
.B cwnd
.IR NUMBER " ] [ "
@@ -9,12 +10,12 @@
.B ssthresh
.IR REALM " ] [ "
.B realms
-@@ -1080,6 +1079,11 @@ the clamp for congestion window. It is
+@@ -1480,6 +1482,11 @@ the clamp for congestion window. It is
flag is not used.
.TP
-+.BI initcwnd " NUMBER "
-+The maximum initial congestion window (cwnd) size in MSS of a
++.BI initcwnd " NUMBER "
++the maximum initial congestion window (cwnd) size in MSS of a
+TCP connection.
+
+.TP
Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-8/iproute.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- iproute.spec 12 Sep 2007 10:31:09 -0000 1.71
+++ iproute.spec 12 Aug 2008 14:19:05 -0000 1.72
@@ -1,17 +1,18 @@
-%define date_version 070710
%define cbq_version v0.7.3
Summary: Advanced IP routing and network device configuration tools
Name: iproute
-Version: 2.6.22
-Release: 3%{?dist}
+Version: 2.6.26
+Release: 1%{?dist}
Group: Applications/System
-Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-%{date_version}.tar.gz
+Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
URL: http://linux-net.osdl.org/index.php/Iproute2
Patch1: iproute2-2.6.9-kernel.patch
Patch2: iproute2-ss050901-opt_flags.patch
-Patch3: iproute2-2.6.16-ip_resolve_crash.patch
-Patch4: iproute-ip-man.patch
+Patch3: iproute-ip-man.patch
+Patch4: iproute2-movelib.patch
+Patch5: iproute2-2.6.25-aead.patch
+Patch6: iproute2-2.6.25-segfault.patch
License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,15 +25,18 @@
capabilities of the Linux 2.4.x and 2.6.x kernel.
%prep
-%setup -q -c iproute-%{version}-%{date_version}
+%setup -q -c iproute-%{version}
%patch1 -p1 -b .kernel
%patch2 -p1 -b .opt_flags
-%patch3 -p1 -b .ip_resolve
-%patch4 -p1
+%patch3 -p1
+%patch4 -p1 -b .movelib
+%patch5 -p1 -b .aead
+%patch6 -p1 -b .seg
%build
export LIBDIR=%{_libdir}
+cd iproute2-%{version}
make %{?_smp_mflags}
make -C doc
@@ -43,8 +47,10 @@
$RPM_BUILD_ROOT%{_sbindir} \
$RPM_BUILD_ROOT%{_mandir}/man8 \
$RPM_BUILD_ROOT/%{_sysconfdir}/iproute2 \
+ $RPM_BUILD_ROOT%{_datadir}/tc \
$RPM_BUILD_ROOT%{_libdir}/tc
+cd iproute2-%{version}
install -m 755 ip/ip ip/ifcfg ip/rtmon tc/tc $RPM_BUILD_ROOT/sbin
install -m 755 misc/ss misc/nstat misc/rtacct misc/lnstat misc/arpd $RPM_BUILD_ROOT%{_sbindir}
#install -m 755 tc/q_netem.so $RPM_BUILD_ROOT%{_libdir}/tc
@@ -77,8 +83,9 @@
%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/iproute2
-%doc README.decnet README.iproute2+tc RELNOTES examples/README.cbq
-%doc doc/*.ps examples
+%doc iproute2-%{version}/README.decnet iproute2-%{version}/README.iproute2+tc iproute2-%{version}/RELNOTES iproute2-%{version}/examples/README.cbq
+%doc iproute2-%{version}/doc/*.ps
+%doc iproute2-%{version}/examples
/sbin/*
%{_mandir}/man8/*
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
@@ -90,6 +97,10 @@
%config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
%changelog
+* Tue Aug 12 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.26-1
+- update to 2.6.26
+- clean patches
+
* Fri Aug 30 2007 Marcela Maslanova <mmaslano at redhat.com> - 2.6.22-3
- package review #225903
iproute2-2.6.9-kernel.patch:
Index: iproute2-2.6.9-kernel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-8/iproute2-2.6.9-kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iproute2-2.6.9-kernel.patch 9 Sep 2004 06:23:33 -0000 1.1
+++ iproute2-2.6.9-kernel.patch 12 Aug 2008 14:19:05 -0000 1.2
@@ -1,9 +1,10 @@
---- iproute2-2.6.9/Makefile.kernel 2004-09-01 12:42:33.000000000 +0200
-+++ iproute2-2.6.9/Makefile 2004-09-01 12:48:19.076463088 +0200
-@@ -3,6 +3,7 @@
+diff -up iproute-2.6.26/iproute2-2.6.26/Makefile.kernel iproute-2.6.26/iproute2-2.6.26/Makefile
+--- iproute-2.6.26/iproute2-2.6.26/Makefile.kernel 2008-07-25 22:46:07.000000000 +0200
++++ iproute-2.6.26/iproute2-2.6.26/Makefile 2008-08-12 14:19:58.000000000 +0200
+@@ -3,6 +3,7 @@ SBINDIR=/sbin
CONFDIR=/etc/iproute2
- DOCDIR=/usr/doc/iproute2
- MANDIR=/usr/share/man
+ DOCDIR=/share/doc/iproute2
+ MANDIR=/share/man
+KERNEL_INCLUDE=/usr/include
# Path to db_185.h include
iproute2-ss050901-opt_flags.patch:
Index: iproute2-ss050901-opt_flags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-8/iproute2-ss050901-opt_flags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iproute2-ss050901-opt_flags.patch 19 Sep 2007 15:09:09 -0000 1.3
+++ iproute2-ss050901-opt_flags.patch 12 Aug 2008 14:19:05 -0000 1.4
@@ -1,6 +1,7 @@
---- iproute2-ss050901/Makefile.opt_flags 2005-09-23 11:49:01.000000000 +0200
-+++ iproute2-ss050901/Makefile 2005-09-23 11:49:31.000000000 +0200
-@@ -22,7 +22,7 @@
+diff -up iproute-2.6.26/iproute2-2.6.26/Makefile.opt iproute-2.6.26/iproute2-2.6.26/Makefile
+--- iproute-2.6.26/iproute2-2.6.26/Makefile.opt 2008-08-12 14:19:58.000000000 +0200
++++ iproute-2.6.26/iproute2-2.6.26/Makefile 2008-08-12 14:21:42.000000000 +0200
+@@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
CC = gcc
HOSTCC = gcc
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-8/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 11 Jul 2007 10:08:09 -0000 1.22
+++ sources 12 Aug 2008 14:19:05 -0000 1.23
@@ -1 +1 @@
-20ef2767896a0f156b6fbabd47936f79 iproute2-2.6.22-070710.tar.gz
+7d221e735cba05709341cd46401c4ecd iproute2-2.6.26.tar.bz2
More information about the fedora-extras-commits
mailing list