January 2009 - openSUSE Commits - openSUSE Mailing Lists

commit blocxx for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package blocxx for openSUSE:Factory checked in at Fri Jan 30 00:02:28 CET 2009. -------- --- blocxx/blocxx.changes 2008-12-10 13:49:54.000000000 +0100 +++ blocxx/blocxx.changes 2009-01-29 11:33:23.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 29 10:57:01 CET 2009 - olh(a)suse.de + +- obsolete libblocxx-XXbit in the library subpackage + +------------------------------------------------------------------- --- blocxx/libblocxx4.changes 2008-11-11 16:58:16.000000000 +0100 +++ blocxx/libblocxx4.changes 2009-01-29 11:33:32.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 29 10:57:01 CET 2009 - olh(a)suse.de + +- obsolete libblocxx-XXbit in the library subpackage (bnc#437293) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blocxx-doc.spec ++++++ --- /var/tmp/diff_new_pack.R10882/_old 2009-01-29 23:58:31.000000000 +0100 +++ /var/tmp/diff_new_pack.R10882/_new 2009-01-29 23:58:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package blocxx-doc (Version 2.1.0.342) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: blocxx-doc %define blocxx_version 2.1.0 Version: 2.1.0.342 -Release: 120 +Release: 121 License: BSD 3-Clause Group: Documentation/HTML AutoReqProv: on ++++++ blocxx.spec ++++++ --- /var/tmp/diff_new_pack.R10882/_old 2009-01-29 23:58:31.000000000 +0100 +++ /var/tmp/diff_new_pack.R10882/_new 2009-01-29 23:58:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package blocxx (Version 2.1.0.342) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,10 @@ Name: blocxx %define blocxx_version 2.1.0 Version: 2.1.0.342 -Release: 12 +Release: 13 License: BSD 3-Clause Group: Development/Libraries/C and C++ AutoReqProv: on -# bug437293 -%ifarch ppc64 -Obsoletes: blocxx-64bit -%endif -# Summary: BloCXX--C++ Framework for Application Development Url: http://sourceforge.net/projects/blocxx/ # current blocxx sources @@ -183,6 +178,11 @@ License: BSD 3-Clause Summary: BloCXX--C++ Framework for Application Development Group: Development/Libraries/C and C++ +# bug437293 +%ifarch ppc64 +Obsoletes: blocxx-64bit +%endif +# #satisfy debuginfo package Provides: blocxx = %{version}-%{release} Obsoletes: blocxx < %{version} @@ -343,6 +343,8 @@ %_libdir/libblocxx.so.6.%{blocxx_version} %changelog +* Thu Jan 29 2009 olh(a)suse.de +- obsolete libblocxx-XXbit in the library subpackage * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) ++++++ libblocxx4.spec ++++++ --- /var/tmp/diff_new_pack.R10882/_old 2009-01-29 23:58:31.000000000 +0100 +++ /var/tmp/diff_new_pack.R10882/_new 2009-01-29 23:58:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libblocxx4 (Version 1.0.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: libblocxx4 Version: 1.0.0 -Release: 76 +Release: 77 License: BSD 3-Clause Group: Development/Libraries/C and C++ AutoReqProv: on @@ -38,6 +38,11 @@ %else BuildRequires: openssl-devel %endif +# bug437293 +%ifarch ppc64 +Obsoletes: blocxx-64bit +%endif +# Provides: blocxx <= %{version} Obsoletes: blocxx <= %{version} @@ -162,6 +167,8 @@ #%_datadir/aclocal/blocxx.m4 %changelog +* Thu Jan 29 2009 olh(a)suse.de +- obsolete libblocxx-XXbit in the library subpackage (bnc#437293) * Tue Nov 11 2008 ro(a)suse.de - SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf * Fri Nov 09 2007 mt(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vpnc for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package vpnc for openSUSE:Factory checked in at Thu Jan 29 23:57:19 CET 2009. -------- --- vpnc/vpnc.changes 2009-01-18 13:09:34.000000000 +0100 +++ vpnc/vpnc.changes 2009-01-29 16:07:26.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Jan 29 16:06:19 CET 2009 - seife(a)suse.de + +- fix segfault in the non-nortel case (bnc#468789) + +------------------------------------------------------------------- +Thu Jan 29 15:13:34 CET 2009 - seife(a)suse.de + +- update the nortel-grouppasswdauth patch. + ATTENTION! nortel users have to change "Nortel Auth Mode" to + "IKE Authmode" in their config file. +- add a patch to send initial packages twice, makes connection + setup more robust against packet loss + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- vpnc-patch_nortel_auth_378_correct.txt.diff New: ---- vpnc-nortel-fix-segfault.diff vpnc-patch_nortel_auth_394.txt.diff vpnc-patch_send_twice.txt.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vpnc.spec ++++++ --- /var/tmp/diff_new_pack.xS2088/_old 2009-01-29 23:53:22.000000000 +0100 +++ /var/tmp/diff_new_pack.xS2088/_new 2009-01-29 23:53:22.000000000 +0100 @@ -21,7 +21,7 @@ Name: vpnc BuildRequires: libgcrypt-devel Version: 0.5.2r394 -Release: 3 +Release: 4 License: BSD 3-Clause; GPL v2 or later Group: Productivity/Networking/Security Url: http://www.unix-ag.uni-kl.de/~massar/vpnc/ @@ -29,9 +29,10 @@ Summary: A Client for Cisco VPN concentrator Requires: /usr/bin/sed /sbin/ip Source: %{name}-%{version}.tar.bz2 -#Patch: vpnc-nortel-grouppasswordauth.diff -Patch: vpnc-patch_nortel_auth_378_correct.txt.diff -Patch1: vpnc-nortel-attributes.diff +Patch0: vpnc-patch_send_twice.txt.diff +Patch1: vpnc-patch_nortel_auth_394.txt.diff +Patch2: vpnc-nortel-attributes.diff +Patch3: vpnc-nortel-fix-segfault.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,7 +58,9 @@ %prep %setup -n %{name}-%{version} %patch0 -p0 -%patch1 -p1 +%patch1 -p0 +%patch2 -p1 +%patch3 -p1 %build %{?suse_update_config:%{suse_update_config -f}} @@ -97,6 +100,14 @@ %doc ChangeLog COPYING README TODO VERSION %changelog +* Thu Jan 29 2009 seife(a)suse.de +- fix segfault in the non-nortel case (bnc#468789) +* Thu Jan 29 2009 seife(a)suse.de +- update the nortel-grouppasswdauth patch. + ATTENTION! nortel users have to change "Nortel Auth Mode" to + "IKE Authmode" in their config file. +- add a patch to send initial packages twice, makes connection + setup more robust against packet loss * Sun Jan 18 2009 seife(a)suse.de - replace vpnc-nortel-grouppasswordauth.diff with the patch that's scheduled for upstream inclusion ++++++ vpnc-nortel-fix-segfault.diff ++++++ Index: b/vpnc.c =================================================================== --- a/vpnc.c +++ b/vpnc.c @@ -1712,10 +1712,12 @@ static void do_phase1(const char *key_id gcry_md_setkey(skeyid_ctx, key, key_len); gcry_md_write(skeyid_ctx, dh_shared_secret, dh_getlen(dh_grp)); gcry_md_final(skeyid_ctx); } else error(1, 0, "SKEYID could not be computed: %s", "the selected authentication method is not supported"); + skeyid = gcry_md_read(skeyid_ctx, 0); + hex_dump("skeyid", skeyid, s->ike.md_len, NULL); } else { skeyid = gcry_md_read(skeyid_ctx, 0); hex_dump("skeyid", skeyid, s->ike.md_len, NULL); } if (opt_vendor == VENDOR_NORTEL) ++++++ vpnc-patch_nortel_auth_378_correct.txt.diff -> vpnc-patch_nortel_auth_394.txt.diff ++++++ --- vpnc/vpnc-patch_nortel_auth_378_correct.txt.diff 2009-01-18 13:09:33.000000000 +0100 +++ vpnc/vpnc-patch_nortel_auth_394.txt.diff 2009-01-29 15:18:02.000000000 +0100 @@ -1,8 +1,8 @@ Index: isakmp.h =================================================================== ---- isakmp.h (revision 378) +--- isakmp.h (revision 394) +++ isakmp.h (working copy) -@@ -463,4 +463,23 @@ +@@ -486,4 +486,23 @@ ISAKMP_XAUTH_ATTRIB_CISCOEXT_VENDOR = 0x7d88 /* strange cisco things ... need docs! */ }; @@ -28,9 +28,9 @@ #endif Index: config.h =================================================================== ---- config.h (revision 378) +--- config.h (revision 394) +++ config.h (working copy) -@@ -48,6 +48,7 @@ +@@ -49,6 +49,7 @@ CONFIG_IPSEC_SECRET, CONFIG_IPSEC_SECRET_OBF, CONFIG_XAUTH_USERNAME, @@ -38,63 +38,40 @@ CONFIG_XAUTH_PASSWORD, CONFIG_XAUTH_PASSWORD_OBF, CONFIG_XAUTH_INTERACTIVE, -@@ -58,6 +59,7 @@ - CONFIG_AUTH_MODE, - CONFIG_CA_FILE, - CONFIG_CA_DIR, -+ CONFIG_NORTEL_AUTH_MODE, - LAST_CONFIG +@@ -87,11 +88,16 @@ }; -@@ -93,6 +95,15 @@ - AUTH_MODE_HYBRID + enum auth_mode_enum { +- AUTH_MODE_PSK, ++ AUTH_MODE_PSK, /* pre-shared key */ + AUTH_MODE_RSA1, + AUTH_MODE_RSA2, +- AUTH_MODE_CERT, +- AUTH_MODE_HYBRID ++ AUTH_MODE_CERT, /* Digital Certificate Authentication */ ++ AUTH_MODE_HYBRID, /* server certificate + xauth */ ++ AUTH_MODE_NORTEL_USERNAME, /* User Name and Password Authentication */ ++ AUTH_MODE_NORTEL_TOKEN, /* Group Security - Response Only Token - Use Passcode */ ++ AUTH_MODE_NORTEL_PINTOKEN, /* Group Security - Response Only Token - Use Two-Factor Card */ ++ AUTH_MODE_NORTEL_TOKENSW, /* Group Security - Response Only Token - Use SoftID Software */ ++ AUTH_MODE_NORTEL_GPASSWORD /* Group Security - Group Password Authentication */ }; -+enum nortel_auth_mode_enum { -+ NORTEL_AUTH_MODE_USERNAME, /* User Name and Password Authentication */ -+ NORTEL_AUTH_MODE_CERT, /* Digital Certificate Authentication */ -+ NORTEL_AUTH_MODE_TOKEN, /* Group Security - Response Only Token - Use Passcode */ -+ NORTEL_AUTH_MODE_PINTOKEN, /* Group Security - Response Only Token - Use Two-Factor Card */ -+ NORTEL_AUTH_MODE_TOKENSW, /* Group Security - Response Only Token - Use SoftID Software */ -+ NORTEL_AUTH_MODE_GPASSWORD, /* Group Security - Group Password Authentication */ -+}; -+ extern const char *config[LAST_CONFIG]; - - extern enum vendor_enum opt_vendor; -@@ -101,6 +112,7 @@ - extern int opt_1des, opt_no_encryption, opt_auth_mode; - extern enum natt_mode_enum opt_natt_mode; - extern enum if_mode_enum opt_if_mode; -+extern enum nortel_auth_mode_enum opt_nortel_auth_mode; - extern uint16_t opt_udpencapport; - - #define TIMESTAMP() ({ \ Index: config.c =================================================================== ---- config.c (revision 378) +--- config.c (revision 394) +++ config.c (working copy) -@@ -44,6 +44,7 @@ - enum natt_mode_enum opt_natt_mode; - enum vendor_enum opt_vendor; - enum if_mode_enum opt_if_mode; -+enum nortel_auth_mode_enum opt_nortel_auth_mode; - uint16_t opt_udpencapport; - - void hex_dump(const char *str, const void *data, ssize_t len, const struct debug_strings *decode) -@@ -191,6 +192,11 @@ - return "0.0.0.0/0.0.0.0"; +@@ -159,7 +159,7 @@ + + static const char *config_def_auth_mode(void) + { +- return "psk"; ++ return "default"; } -+static const char *config_def_nortel_auth_mode(void) -+{ -+ return "token"; -+} -+ - static const struct config_names_s { - enum config_enum nm; - const int needsArgument; -@@ -241,6 +247,13 @@ + static const char *config_def_nortel_client_id(void) +@@ -247,6 +247,13 @@ "your username", NULL }, { @@ -108,70 +85,141 @@ CONFIG_XAUTH_PASSWORD, 1, 0, NULL, "Xauth password ", -@@ -448,6 +461,19 @@ - "Target network in dotted decimal or CIDR notation\n", - config_def_target_network +@@ -434,11 +441,17 @@ + CONFIG_AUTH_MODE, 1, 1, + "--auth-mode", + "IKE Authmode ", +- "<psk/cert/hybrid>", ++ "<default/cert/psk/hybrid/username/token/PIN-token/token-SW/gpassword>", + "Authentication mode:\n" +- " * psk: pre-shared key (default)\n" +- " * cert: server + client certificate (not implemented yet)\n" +- " * hybrid: server certificate + xauth (if built with openssl support)\n", ++ " * default: maps to vendor specific default mode\n" ++ " * cert: server + client certificate (not implemented yet)\n" ++ " * psk: Cisco pre-shared key (default for Cisco)\n" ++ " * hybrid: Cisco server certificate + xauth (if built with openssl support)\n" ++ " * username: Nortel User Name and Password Authentication\n" ++ " * token: Nortel Group Security - Response Only Token - Use Passcode (default for Nortel)\n" ++ " * PIN-token: Nortel Group Security - Response Only Token - Use Two-Factor Card\n" ++ " * token-SW: Nortel Group Security - Response Only Token - Use SoftID Software\n" ++ " * gpassword: Nortel Group Security - Group Password Authentication", + config_def_auth_mode }, { -+ CONFIG_NORTEL_AUTH_MODE, 1, 1, -+ "--nortel-auth-mode", -+ "Nortel Auth Mode ", -+ "<username/cert/token/PIN-token/token-SW/gpassword>", -+ "Nortel Authentication Mode:\n" -+ " * username: User Name and Password Authentication\n" -+ " * cert: Digital Certificate Authentication\n" -+ " * token: Group Security - Response Only Token - Use Passcode (default)\n" -+ " * PIN-token: Group Security - Response Only Token - Use Two-Factor Card\n" -+ " * token-SW: Group Security - Response Only Token - Use SoftID Software\n" -+ " * gpassword: Group Security - Group Password Authentication", -+ config_def_nortel_auth_mode -+ }, { - 0, 0, 0, NULL, NULL, NULL, NULL, NULL - } - }; -@@ -741,6 +767,29 @@ - printf("%s: unknown vendor %s\nknown vendors: cisco netscreen nortel\n", argv[0], config[CONFIG_VENDOR]); + CONFIG_CA_FILE, 1, 1, +@@ -703,16 +716,79 @@ + opt_nd = (config[CONFIG_ND]) ? 1 : 0; + opt_1des = (config[CONFIG_ENABLE_1DES]) ? 1 : 0; + ++ if (!strcmp(config[CONFIG_VENDOR], "cisco")) { ++ opt_vendor = VENDOR_CISCO; ++ } else if (!strcmp(config[CONFIG_VENDOR], "netscreen")) { ++ opt_vendor = VENDOR_NETSCREEN; ++ } else if (!strcmp(config[CONFIG_VENDOR], "nortel")) { ++ opt_vendor = VENDOR_NORTEL; ++ } else { ++ printf("%s: unknown vendor %s\nknown vendors: cisco netscreen nortel\n", ++ argv[0], config[CONFIG_VENDOR]); ++ exit(1); ++ } ++ + if (!strcmp(config[CONFIG_AUTH_MODE], "psk")) { + opt_auth_mode = AUTH_MODE_PSK; + } else if (!strcmp(config[CONFIG_AUTH_MODE], "cert")) { + opt_auth_mode = AUTH_MODE_CERT; + } else if (!strcmp(config[CONFIG_AUTH_MODE], "hybrid")) { + opt_auth_mode = AUTH_MODE_HYBRID; ++ } else if (!strcmp(config[CONFIG_AUTH_MODE], "username")) { ++ opt_auth_mode = AUTH_MODE_NORTEL_USERNAME; ++ } else if (!strcmp(config[CONFIG_AUTH_MODE], "token")) { ++ opt_auth_mode = AUTH_MODE_NORTEL_TOKEN; ++ } else if (!strcmp(config[CONFIG_AUTH_MODE], "PIN-token")) { ++ opt_auth_mode = AUTH_MODE_NORTEL_PINTOKEN; ++ } else if (!strcmp(config[CONFIG_AUTH_MODE], "token-SW")) { ++ opt_auth_mode = AUTH_MODE_NORTEL_TOKENSW; ++ } else if (!strcmp(config[CONFIG_AUTH_MODE], "gpassword")) { ++ opt_auth_mode = AUTH_MODE_NORTEL_GPASSWORD; ++ } else if (!strcmp(config[CONFIG_AUTH_MODE], "default")) { ++ switch (opt_vendor) { ++ case VENDOR_NORTEL: ++ opt_auth_mode = AUTH_MODE_NORTEL_TOKEN; ++ break; ++ case VENDOR_NETSCREEN: ++ case VENDOR_CISCO: ++ default: ++ opt_auth_mode = AUTH_MODE_PSK; ++ break; ++ } + } else { +- printf("%s: unknown authentication mode %s\nknown modes: psk cert hybrid\n", argv[0], config[CONFIG_AUTH_MODE]); ++ printf("%s: unknown authentication mode \"%s\"\nknown modes: " ++ "default/cert/psk/hybrid/username/token/PIN-token/token-SW/gpassword\n", ++ argv[0], config[CONFIG_AUTH_MODE]); exit(1); } + -+ if (!strcmp(config[CONFIG_NORTEL_AUTH_MODE], "username")) { -+ opt_nortel_auth_mode = NORTEL_AUTH_MODE_USERNAME; -+ } else if (!strcmp(config[CONFIG_NORTEL_AUTH_MODE], "cert")) { -+ opt_nortel_auth_mode = NORTEL_AUTH_MODE_CERT; -+ printf("%s: unimplemented Nortel Auth Mode %s\n", argv[0], config[CONFIG_NORTEL_AUTH_MODE]); ++ if (((opt_vendor == VENDOR_NORTEL) && ++ ((opt_auth_mode != AUTH_MODE_CERT) && ++ (opt_auth_mode != AUTH_MODE_NORTEL_USERNAME) && ++ (opt_auth_mode != AUTH_MODE_NORTEL_TOKEN) && ++ (opt_auth_mode != AUTH_MODE_NORTEL_PINTOKEN) && ++ (opt_auth_mode != AUTH_MODE_NORTEL_TOKENSW) && ++ (opt_auth_mode != AUTH_MODE_NORTEL_GPASSWORD))) || ++ ((opt_vendor == VENDOR_CISCO) && ++ ((opt_auth_mode != AUTH_MODE_CERT) && ++ (opt_auth_mode != AUTH_MODE_PSK) && ++ (opt_auth_mode != AUTH_MODE_HYBRID))) || ++ ((opt_vendor == VENDOR_NETSCREEN) && ++ ((opt_auth_mode != AUTH_MODE_CERT) && ++ (opt_auth_mode != AUTH_MODE_PSK) && ++ (opt_auth_mode != AUTH_MODE_HYBRID)))) { ++ printf("%s: Auth Mode \"%s\" not valid for Vendor \"%s\"\n", ++ argv[0], config[CONFIG_AUTH_MODE], config[CONFIG_VENDOR]); + exit(1); -+ } else if (!strcmp(config[CONFIG_NORTEL_AUTH_MODE], "token")) { -+ opt_nortel_auth_mode = NORTEL_AUTH_MODE_TOKEN; -+ } else if (!strcmp(config[CONFIG_NORTEL_AUTH_MODE], "PIN-token")) { -+ opt_nortel_auth_mode = NORTEL_AUTH_MODE_PINTOKEN; -+ } else if (!strcmp(config[CONFIG_NORTEL_AUTH_MODE], "token-SW")) { -+ opt_nortel_auth_mode = NORTEL_AUTH_MODE_TOKENSW; -+ printf("%s: unimplemented Nortel Auth Mode %s\n", argv[0], config[CONFIG_NORTEL_AUTH_MODE]); -+ exit(1); -+ } else if (!strcmp(config[CONFIG_NORTEL_AUTH_MODE], "gpassword")) { -+ opt_nortel_auth_mode = NORTEL_AUTH_MODE_GPASSWORD; -+ } else { -+ printf("%s: unknown Nortel Authenticate Mode %s\n" -+ "known modes: username cert token PIN-token token-SW gpassword\n", -+ argv[0], config[CONFIG_NORTEL_AUTH_MODE]); ++ } ++ ++ if (opt_auth_mode == AUTH_MODE_CERT || ++ opt_auth_mode == AUTH_MODE_NORTEL_TOKENSW) { ++ printf("%s: unimplemented Auth Mode \"%s\"\n", ++ argv[0], config[CONFIG_AUTH_MODE]); + exit(1); + } ++ + #ifndef OPENSSL_GPL_VIOLATION + if (opt_auth_mode == AUTH_MODE_HYBRID || + opt_auth_mode == AUTH_MODE_CERT) { +@@ -783,17 +859,6 @@ + } + opt_nortel_client_id = tmp; + } +- +- if (!strcmp(config[CONFIG_VENDOR], "cisco")) { +- opt_vendor = VENDOR_CISCO; +- } else if (!strcmp(config[CONFIG_VENDOR], "netscreen")) { +- opt_vendor = VENDOR_NETSCREEN; +- } else if (!strcmp(config[CONFIG_VENDOR], "nortel")) { +- opt_vendor = VENDOR_NORTEL; +- } else { +- printf("%s: unknown vendor %s\nknown vendors: cisco netscreen nortel\n", argv[0], config[CONFIG_VENDOR]); +- exit(1); +- } } if (opt_debug >= 99) { -@@ -757,6 +806,12 @@ +@@ -810,6 +875,12 @@ continue; if (config[CONFIG_XAUTH_INTERACTIVE] && i == CONFIG_XAUTH_PASSWORD) continue; -+ if (opt_vendor == VENDOR_NORTEL && opt_nortel_auth_mode == NORTEL_AUTH_MODE_USERNAME ++ if (opt_auth_mode == AUTH_MODE_NORTEL_USERNAME + && (i == CONFIG_XAUTH_USERNAME || i == CONFIG_XAUTH_PASSWORD)) + continue; -+ if (opt_vendor == VENDOR_NORTEL && opt_nortel_auth_mode != NORTEL_AUTH_MODE_PINTOKEN ++ if (opt_auth_mode != AUTH_MODE_NORTEL_PINTOKEN + && i == CONFIG_XAUTH_PIN) + continue; s = NULL; s_len = 0; -@@ -775,6 +830,11 @@ +@@ -828,6 +899,11 @@ case CONFIG_XAUTH_USERNAME: printf("Enter username for %s: ", config[CONFIG_IPSEC_GATEWAY]); break; @@ -183,7 +231,7 @@ case CONFIG_XAUTH_PASSWORD: printf("Enter password for %s@%s: ", config[CONFIG_XAUTH_USERNAME], -@@ -784,6 +844,7 @@ +@@ -839,6 +915,7 @@ fflush(stdout); switch (i) { case CONFIG_IPSEC_SECRET: @@ -191,7 +239,7 @@ case CONFIG_XAUTH_PASSWORD: s = strdup(getpass("")); break; -@@ -815,10 +876,14 @@ +@@ -870,10 +947,14 @@ error(1, 0, "missing IPSec ID"); if (!config[CONFIG_IPSEC_SECRET]) error(1, 0, "missing IPSec secret"); @@ -199,34 +247,75 @@ - error(1, 0, "missing Xauth username"); - if (!config[CONFIG_XAUTH_PASSWORD] && !config[CONFIG_XAUTH_INTERACTIVE]) - error(1, 0, "missing Xauth password"); -+ if (!(opt_vendor == VENDOR_NORTEL && opt_nortel_auth_mode == NORTEL_AUTH_MODE_USERNAME)) { ++ if (opt_auth_mode != AUTH_MODE_NORTEL_USERNAME) { + if (!config[CONFIG_XAUTH_USERNAME]) + error(1, 0, "missing Xauth username"); + if (!config[CONFIG_XAUTH_PASSWORD] && !config[CONFIG_XAUTH_INTERACTIVE]) + error(1, 0, "missing Xauth password"); + } -+ if (opt_vendor == VENDOR_NORTEL && opt_nortel_auth_mode == NORTEL_AUTH_MODE_PINTOKEN && !config[CONFIG_XAUTH_PIN]) ++ if (opt_auth_mode == AUTH_MODE_NORTEL_PINTOKEN && !config[CONFIG_XAUTH_PIN]) + error(1, 0, "missing Xauth PIN"); if (get_dh_group_ike() == NULL) error(1, 0, "IKE DH Group \"%s\" unsupported\n", config[CONFIG_IKE_DH]); if (get_dh_group_ipsec(-1) == NULL) Index: vpnc.c =================================================================== ---- vpnc.c (revision 378) +--- vpnc.c (revision 394) +++ vpnc.c (working copy) -@@ -1284,7 +1284,10 @@ +@@ -1110,17 +1110,10 @@ + r->u.sa.proposals->u.p.prot_id = ISAKMP_IPSEC_PROTO_ISAKMP; + + if (opt_vendor == VENDOR_NORTEL) { +- auth = 0; ++ auth = 0; + if ((opt_auth_mode == AUTH_MODE_CERT) && + (supp_auth[auth].ike_sa_id != IKE_AUTH_RSA_SIG) && + (supp_auth[auth].ike_sa_id != IKE_AUTH_DSS)) { +- } else if ((opt_auth_mode == AUTH_MODE_HYBRID) && +- (supp_auth[auth].ike_sa_id != IKE_AUTH_HybridInitRSA) && +- (supp_auth[auth].ike_sa_id != IKE_AUTH_HybridInitDSS)) { +- } else if (supp_auth[auth].ike_sa_id == IKE_AUTH_HybridInitRSA || +- supp_auth[auth].ike_sa_id == IKE_AUTH_HybridInitDSS || +- supp_auth[auth].ike_sa_id == IKE_AUTH_RSA_SIG || +- supp_auth[auth].ike_sa_id == IKE_AUTH_DSS) { + } else { + for (crypt = 0; supp_crypt[crypt].name != NULL; crypt++) { + keylen = supp_crypt[crypt].keylen; +@@ -1284,7 +1277,10 @@ l->u.id.protocol = IPPROTO_UDP; l->u.id.port = ISAKMP_PORT; /* this must be 500, see rfc2407, 4.6.2 */ if (opt_vendor == VENDOR_NORTEL) { - l->u.id.length = 24; -+ if (opt_nortel_auth_mode == NORTEL_AUTH_MODE_USERNAME) ++ if (opt_auth_mode == AUTH_MODE_NORTEL_USERNAME) + l->u.id.length = 20; + else + l->u.id.length = 24; l->u.id.data = xallocc(l->u.id.length); gcry_md_hash_buffer(GCRY_MD_SHA1, l->u.id.data, key_id, strlen(key_id)); /* memcpy(l->u.id.data, key_id, strlen(key_id)); */ -@@ -2228,7 +2231,6 @@ +@@ -1629,7 +1625,10 @@ + reject = ISAKMP_N_INVALID_ID_INFORMATION; + + /* Decide if signature or hash is expected (sig only if vpnc is initiator of hybrid-auth */ +- if (reject == 0 && opt_auth_mode == AUTH_MODE_PSK && (hash == NULL || hash->u.hash.length != s->ike.md_len)) ++ if (reject == 0 && ++ ((opt_auth_mode == AUTH_MODE_PSK) || ++ (opt_vendor == VENDOR_NORTEL && opt_auth_mode != AUTH_MODE_CERT)) && ++ (hash == NULL || hash->u.hash.length != s->ike.md_len)) + reject = ISAKMP_N_INVALID_HASH_INFORMATION; + if (reject == 0 && sig == NULL && + (opt_auth_mode == AUTH_MODE_CERT || +@@ -1744,7 +1743,8 @@ + expected_hash = gcry_md_read(hm, 0); + hex_dump("expected hash", expected_hash, s->ike.md_len, NULL); + +- if (opt_auth_mode == AUTH_MODE_PSK) { ++ if ((opt_auth_mode == AUTH_MODE_PSK) || ++ (opt_vendor == VENDOR_NORTEL && opt_auth_mode != AUTH_MODE_CERT)) { + if (memcmp(expected_hash, hash->u.hash.data, s->ike.md_len) != 0) + error(2, 0, "hash comparison failed: %s(%d)\ncheck group password!", + val_to_string(ISAKMP_N_AUTHENTICATION_FAILED, isakmp_notify_enum_array), +@@ -2228,7 +2228,6 @@ DEBUGTOP(2, printf("S5.1 xauth_start\n")); /* This can go around for a while. */ for (loopcount = 0;; loopcount++) { @@ -234,12 +323,12 @@ struct isakmp_payload *rp; struct isakmp_attribute *a, *ap, *reply_attr; char ntop_buf[32]; -@@ -2341,6 +2343,12 @@ +@@ -2343,6 +2342,12 @@ reply_attr = NULL; for (ap = a; ap && reject == 0; ap = ap->next) switch (ap->type) { + case ISAKMP_XAUTH_02_ATTRIB_TYPE: -+ if (opt_vendor == VENDOR_NORTEL && opt_nortel_auth_mode == NORTEL_AUTH_MODE_GPASSWORD) ++ if (opt_auth_mode == AUTH_MODE_NORTEL_GPASSWORD) + reply_attr = new_isakmp_attribute_16(ISAKMP_XAUTH_02_ATTRIB_TYPE, ISAKMP_MODECFG_TYPE_RADIUS, reply_attr); + else + reply_attr = new_isakmp_attribute_16(ISAKMP_XAUTH_02_ATTRIB_TYPE, ISAKMP_MODECFG_TYPE_SECURID, reply_attr); @@ -247,26 +336,20 @@ case ISAKMP_XAUTH_06_ATTRIB_DOMAIN: case ISAKMP_XAUTH_02_ATTRIB_DOMAIN: { -@@ -2403,16 +2411,29 @@ +@@ -2416,16 +2421,27 @@ memset(pass, 0, na->u.lots.length); } else { struct isakmp_attribute *na; - if (opt_vendor == VENDOR_NORTEL) { - na = reply_attr->next = new_isakmp_attribute(ISAKMP_XAUTH_02_ATTRIB_PASSCODE, /* reply_attr */ NULL); + if (opt_vendor == VENDOR_NORTEL -+ && opt_nortel_auth_mode != NORTEL_AUTH_MODE_GPASSWORD) { ++ && opt_auth_mode != AUTH_MODE_NORTEL_GPASSWORD) + na = new_isakmp_attribute(ISAKMP_XAUTH_02_ATTRIB_PASSCODE, reply_attr); -+ reply_attr = na; - } else { - na = new_isakmp_attribute(ap->type, reply_attr); - reply_attr = na; - } -- na->u.lots.length = strlen(config[CONFIG_XAUTH_PASSWORD]); -- na->u.lots.data = xallocc(na->u.lots.length); -- memcpy(na->u.lots.data, config[CONFIG_XAUTH_PASSWORD], -- na->u.lots.length); ++ else ++ na = new_isakmp_attribute(ap->type, reply_attr); ++ reply_attr = na; + if (opt_vendor == VENDOR_NORTEL -+ && opt_nortel_auth_mode == NORTEL_AUTH_MODE_PINTOKEN) { ++ && opt_auth_mode == AUTH_MODE_NORTEL_PINTOKEN) { + int l_pin, l_pas; + l_pin = strlen(config[CONFIG_XAUTH_PIN]); + l_pas = strlen(config[CONFIG_XAUTH_PASSWORD]); @@ -274,16 +357,22 @@ + na->u.lots.data = xallocc(na->u.lots.length); + memcpy(na->u.lots.data, config[CONFIG_XAUTH_PIN], l_pin); + memcpy(na->u.lots.data + l_pin, config[CONFIG_XAUTH_PASSWORD], l_pas); -+ } else { + } else { +- na = new_isakmp_attribute(ap->type, reply_attr); +- reply_attr = na; + na->u.lots.length = strlen(config[CONFIG_XAUTH_PASSWORD]); + na->u.lots.data = xallocc(na->u.lots.length); + memcpy(na->u.lots.data, config[CONFIG_XAUTH_PASSWORD], + na->u.lots.length); -+ } + } +- na->u.lots.length = strlen(config[CONFIG_XAUTH_PASSWORD]); +- na->u.lots.data = xallocc(na->u.lots.length); +- memcpy(na->u.lots.data, config[CONFIG_XAUTH_PASSWORD], +- na->u.lots.length); passwd_used = 1; /* Provide canned password at most once */ } break; -@@ -2420,10 +2441,6 @@ +@@ -2433,10 +2449,6 @@ ; } @@ -294,17 +383,17 @@ /* Send the response. */ rp = new_isakmp_payload(ISAKMP_PAYLOAD_MODECFG_ATTR); rp->u.modecfg.type = ISAKMP_MODECFG_CFG_REPLY; -@@ -2538,7 +2555,8 @@ +@@ -2551,7 +2563,8 @@ rp->u.modecfg.attributes = a; sendrecv_phase2(s, rp, ISAKMP_EXCHANGE_MODECFG_TRANSACTION, msgid, 0, 0, 0, 0, 0, 0, 0); } else { - r_length = sendrecv(s,r_packet, sizeof(r_packet), NULL, 0, 0); -+ if (opt_nortel_auth_mode != NORTEL_AUTH_MODE_USERNAME) ++ if (opt_auth_mode != AUTH_MODE_NORTEL_USERNAME) + r_length = sendrecv(s,r_packet, sizeof(r_packet), NULL, 0, 0); } /* recv and check for notices */ -@@ -3789,18 +3807,22 @@ +@@ -3802,18 +3815,22 @@ do { DEBUGTOP(2, printf("S4 do_phase1\n")); do_phase1(group_id, config[CONFIG_IPSEC_SECRET], s); @@ -312,7 +401,7 @@ if (opt_vendor == VENDOR_NORTEL) { - do_load_balance = do_phase2_xauth(s); -+ if (opt_nortel_auth_mode != NORTEL_AUTH_MODE_USERNAME) { ++ if (opt_auth_mode != AUTH_MODE_NORTEL_USERNAME) { + DEBUGTOP(2, printf("S5 do_phase2_xauth\n")); + do_load_balance = do_phase2_xauth(s); + } ++++++ vpnc-patch_send_twice.txt.diff ++++++ Index: config.h =================================================================== --- config.h (revision 394) +++ config.h (working copy) @@ -55,6 +55,7 @@ CONFIG_VENDOR, CONFIG_NATT_MODE, CONFIG_UDP_ENCAP_PORT, + CONFIG_SEND_TWICE, CONFIG_DPD_IDLE, CONFIG_AUTH_MODE, CONFIG_CA_FILE, Index: config.c =================================================================== --- config.c (revision 394) +++ config.c (working copy) @@ -416,6 +416,14 @@ "It is especially not the cisco-tcp port.\n", config_def_udp_port }, { + CONFIG_SEND_TWICE, 0, 1, + "--send-twice", + "Send twice", + NULL, + "Send twice each IKE UDP packet. In case of high packet lost rate, this option\n" + "improves network performance during authentication.", + NULL + }, { CONFIG_DPD_IDLE, 1, 1, "--dpd-idle", "DPD idle timeout (our side) ", Index: vpnc.c =================================================================== --- vpnc.c (revision 394) +++ vpnc.c (working copy) @@ -442,9 +442,13 @@ for (;;) { int pollresult; - if (realtosend != NULL) + if (realtosend != NULL) { if (write(s->ike_fd, realtosend, sendsize) != (int)sendsize) - error(1, errno, "can't send packet"); + error(1, errno, "can't send packet [1]"); + if (config[CONFIG_SEND_TWICE]) + if (write(s->ike_fd, realtosend, sendsize) != (int)sendsize) + error(1, errno, "can't send packet [2]"); + } if (sendonly) break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemtap for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at Thu Jan 29 23:53:14 CET 2009. -------- --- systemtap/systemtap.changes 2009-01-15 08:22:43.000000000 +0100 +++ systemtap/systemtap.changes 2009-01-29 12:59:40.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 29 12:58:42 CET 2009 - tiwai(a)suse.de + +- Fix procfs dir_entry count warning (bnc#470526) +- Improve the parsing of lineno checks (bnc#468247) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- stap-fix-procfs-dir_entry-count.diff stap-pr6905-weaken-lineno-checks.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.Q18045/_old 2009-01-29 23:51:34.000000000 +0100 +++ /var/tmp/diff_new_pack.Q18045/_new 2009-01-29 23:51:34.000000000 +0100 @@ -25,7 +25,7 @@ %define package_version 20080906 License: GPL v2 or later Version: 0.7.1 -Release: 32 +Release: 34 Summary: Instrumentation System Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ @@ -43,6 +43,8 @@ Patch9: systemtap-use-send_signal.diff Patch10: systemtap-tcl-send_log-syntax-fix.diff Patch11: systemtap-tcl-quote-fix.diff +Patch12: stap-fix-procfs-dir_entry-count.diff +Patch13: stap-pr6905-weaken-lineno-checks.diff Requires: libebl1 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,6 +76,8 @@ %patch9 -p1 %patch10 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %build autoreconf -fi @@ -102,6 +106,9 @@ %dir %attr(0755,root,root) /var/cache/systemtap %changelog +* Thu Jan 29 2009 tiwai(a)suse.de +- Fix procfs dir_entry count warning (bnc#470526) +- Improve the parsing of lineno checks (bnc#468247) * Thu Jan 15 2009 tiwai(a)suse.de - Fix quoting in Tcl scripts (bnc#461588) * Mon Jan 12 2009 tiwai(a)suse.de ++++++ stap-fix-procfs-dir_entry-count.diff ++++++ Index: src/runtime/procfs.c =================================================================== --- src.orig/runtime/procfs.c +++ src/runtime/procfs.c @@ -24,13 +24,20 @@ static struct proc_dir_entry *_stp_proc_ void _stp_close_procfs(void); +// 2.6.24 fixed proc_dir_entry refcounting. +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) +#define LAST_ENTRY_COUNT 0 +#else +#define LAST_ENTRY_COUNT 1 +#endif + /* * Removes /proc/systemtap/{module_name} and /proc/systemtap (if empty) */ void _stp_rmdir_proc_module(void) { if (_stp_proc_root && _stp_proc_root->subdir == NULL) { - if (atomic_read(&_stp_proc_root->count)) + if (atomic_read(&_stp_proc_root->count) != LAST_ENTRY_COUNT) _stp_warn("Removal of /proc/systemtap/%s\nis deferred until it is no longer in use.\n" "Systemtap module removal will block.\n", THIS_MODULE->name); remove_proc_entry(THIS_MODULE->name, _stp_proc_stap); ++++++ stap-pr6905-weaken-lineno-checks.diff ++++++ >From 2d4a8f7a704619f1df32a24cfb284cf0fe936e5d Mon Sep 17 00:00:00 2001 From: wenji huang <wjhuang(a)localhost.localdomain> Date: Sun, 14 Dec 2008 23:54:05 -0500 Subject: [PATCH 1/1] PR6905: Weaken the checking of line number for WILDCARD and make RANGE smart. --- tapsets.cxx | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tapsets.cxx b/tapsets.cxx index 4d9a021..391e54e 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -1242,18 +1242,33 @@ struct dwflpp } else if (line_type == WILDCARD) function_line (&lineno); + else if (line_type == RANGE) { + int start_lineno; + function_line (&start_lineno); + lineno = start_lineno > lineno ? start_lineno : lineno; + if (lineno > lines[1]) { /* invalid line range */ + stringstream advice; + advice << "Starting line number for " << srcfile << " : " << lineno; + throw semantic_error (advice.str()); + } + } + for (int l = lineno; ; l = l + 1) { set<int> lines_probed; pair<set<int>::iterator,bool> line_probed; - dwarf_assert ("dwarf_getsrc_file", - dwarf_getsrc_file (module_dwarf, - srcfile, l, 0, - &srcsp, &nsrcs)); + int ret = 0; + + ret = dwarf_getsrc_file (module_dwarf, srcfile, l, 0, + &srcsp, &nsrcs); if (line_type == WILDCARD || line_type == RANGE) { Dwarf_Addr line_addr; + + if (ret != 0) /* tolerate invalid line number out of assert */ + break; + dwarf_lineno (srcsp [0], &lineno); line_probed = lines_probed.insert(lineno); if (lineno != l || line_probed.second == false || nsrcs > 1) @@ -1263,6 +1278,7 @@ struct dwflpp break; } + dwarf_assert ("dwarf_getsrc_file", ret); // NB: Formerly, we used to filter, because: // dwarf_getsrc_file gets one *near hits* for line numbers, not -- 1.5.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit polkit-default-privs for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package polkit-default-privs for openSUSE:Factory checked in at Thu Jan 29 23:49:59 CET 2009. -------- --- polkit-default-privs/polkit-default-privs.changes 2008-12-11 14:31:49.000000000 +0100 +++ polkit-default-privs/polkit-default-privs.changes 2009-01-29 11:37:19.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 29 11:37:15 CET 2009 - olh(a)suse.de + +- obsolete old -XXbit packages (bnc#437293) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit-default-privs.spec ++++++ --- /var/tmp/diff_new_pack.X22269/_old 2009-01-29 23:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.X22269/_new 2009-01-29 23:47:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package polkit-default-privs (Version 0.1_200812111413) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ License: GPL v2 or later Group: Productivity/Security Version: 0.1_200812111413 -Release: 1 +Release: 2 Summary: SUSE PolicyKit default permissions Source: polkit-default-privs-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,6 +34,11 @@ %if %suse_version > 1100 Obsoletes: hal-resmgr < 0.2 Obsoletes: resmgr < 1.1.1 +# bug437293 +%ifarch ppc64 +Obsoletes: resmgr-64bit +%endif +# %endif %description @@ -71,6 +76,8 @@ /var/adm/fillup-templates/sysconfig.security-polkit_default_privs %changelog +* Thu Jan 29 2009 olh(a)suse.de +- obsolete old -XXbit packages (bnc#437293) * Thu Dec 11 2008 lnussel(a)suse.de - PreReq on PolicyKit to avoid errors from %%post * Thu Dec 11 2008 lnussel(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pam_krb5 for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package pam_krb5 for openSUSE:Factory checked in at Thu Jan 29 23:46:05 CET 2009. -------- --- pam_krb5/pam_krb5.changes 2008-11-21 13:10:56.000000000 +0100 +++ pam_krb5/pam_krb5.changes 2009-01-29 11:00:54.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 13 12:34:56 CET 2009 - olh(a)suse.de + +- obsolete old -XXbit packages (bnc#437293) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_krb5.spec ++++++ --- /var/tmp/diff_new_pack.B29850/_old 2009-01-29 23:43:59.000000000 +0100 +++ /var/tmp/diff_new_pack.B29850/_new 2009-01-29 23:43:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pam_krb5 (Version 2.3.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,8 +25,13 @@ Group: Productivity/Networking/Security Provides: pam_krb AutoReqProv: on +# bug437293 +%ifarch ppc64 +Obsoletes: pam_krb5-64bit +%endif +# Version: 2.3.1 -Release: 42 +Release: 43 Summary: PAM Module for Kerberos Authentication Url: http://sourceforge.net/projects/pam-krb5/ Source: pam_krb5-%{version}-%{PAM_RELEASE}.tar.bz2 @@ -97,6 +102,8 @@ %attr(755,root,root) /usr/bin/afs5log %changelog +* Tue Jan 13 2009 olh(a)suse.de +- obsolete old -XXbit packages (bnc#437293) * Fri Nov 21 2008 mc(a)suse.de - update translations * Wed Nov 05 2008 mc(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nut for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at Thu Jan 29 23:43:51 CET 2009. -------- --- nut/nut.changes 2009-01-27 00:38:13.000000000 +0100 +++ nut/nut.changes 2009-01-28 15:52:11.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 28 15:51:40 CET 2009 - crrodriguez(a)suse.de + +- remove static libraries and "la" files +- add missing openssl-devel to Requires of -devel package + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.I24904/_old 2009-01-29 23:43:16.000000000 +0100 +++ /var/tmp/diff_new_pack.I24904/_new 2009-01-29 23:43:16.000000000 +0100 @@ -28,7 +28,7 @@ Conflicts: apcupsd Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) Version: 2.2.2 -Release: 66 +Release: 68 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -422,7 +422,7 @@ License: GPL v2 or later Summary: Network UPS Tools (Unbreakable Power Supply Monitoring) Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{name} = %{version} openssl-devel %description devel Network UPS Tools is a collection of programs which provide a common @@ -493,7 +493,7 @@ %build autoreconf -f -i -%configure\ +%configure --disable-static --with-pic\ --sysconfdir=%{CONFPATH}\ --datadir=%{_datadir}/nut\ --with-all\ @@ -544,6 +544,7 @@ mkdir $RPM_BUILD_ROOT%{HTMLPATH}/nut $RPM_BUILD_ROOT%{CGIPATH}/nut mv $RPM_BUILD_ROOT%{HTMLPATH}/*.{html,png} $RPM_BUILD_ROOT%{HTMLPATH}/nut/ mv $RPM_BUILD_ROOT%{CGIPATH}/*.cgi $RPM_BUILD_ROOT%{CGIPATH}/nut +%{__rm} -f %{buildroot}%{_libdir}/*.la %pre usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ @@ -694,11 +695,13 @@ %defattr(-,root,root) %{_includedir}/*.h %{_libdir}/*.so -%{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc %doc %{_mandir}/man3/*.* %changelog +* Wed Jan 28 2009 crrodriguez(a)suse.de +- remove static libraries and "la" files +- add missing openssl-devel to Requires of -devel package * Tue Jan 27 2009 ro(a)suse.de - pass --with-udev-dir to configure to fix build (hal does not own /etc/udev anymore) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkinitrd for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Thu Jan 29 23:42:51 CET 2009. -------- --- mkinitrd/mkinitrd.changes 2009-01-23 11:31:59.000000000 +0100 +++ mkinitrd/mkinitrd.changes 2009-01-29 16:54:38.911318190 +0100 @@ -1,0 +2,6 @@ +Thu Jan 29 16:41:15 CET 2009 - bwalle(a)suse.de + +- Don't use the 'ip' from environment (bnc #450680). +- Update version to 2.5.6. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.X21698/_old 2009-01-29 23:42:15.000000000 +0100 +++ /var/tmp/diff_new_pack.X21698/_new 2009-01-29 23:42:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mkinitrd (Version 2.5.5) +# spec file for package mkinitrd (Version @@VERSION@@) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ BuildRequires: asciidoc Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on -Version: 2.5.5 +Version: @@VERSION@@ Release: 1 Conflicts: udev < 118 Requires: dhcpcd @@ -123,6 +123,9 @@ %doc %{_mandir}/man8/lsinitrd.8.gz %changelog +* Thu Jan 29 2009 bwalle(a)suse.de +- Don't use the 'ip' from environment (bnc #450680). +- Update version to 2.5.6. * Fri Jan 23 2009 bwalle(a)suse.de - Fix compiled-in module detection, mostly for PPC (bnc #449123). - Update version to 2.5.5. ++++++ mkinitrd.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.5.5/mkinitrd.changes new/mkinitrd-2.4/mkinitrd.changes --- old/mkinitrd-2.5.5/mkinitrd.changes 2009-01-23 11:31:30.000000000 +0100 +++ new/mkinitrd-2.4/mkinitrd.changes 2009-01-29 16:42:34.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 29 16:41:15 CET 2009 - bwalle(a)suse.de + +- Don't use the 'ip' from environment (bnc #450680). +- Update version to 2.5.6. + +------------------------------------------------------------------- Fri Jan 23 11:31:02 CET 2009 - bwalle(a)suse.de - Fix compiled-in module detection, mostly for PPC (bnc #449123). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.5.5/sbin/mkinitrd new/mkinitrd-2.4/sbin/mkinitrd --- old/mkinitrd-2.5.5/sbin/mkinitrd 2009-01-23 11:31:30.000000000 +0100 +++ new/mkinitrd-2.4/sbin/mkinitrd 2009-01-29 16:42:34.000000000 +0100 @@ -25,7 +25,7 @@ # git://git.opensuse.org/projects/mkinitrd.git # -VERSION=2.5.5 +VERSION=2.5.6 LOGDIR=/var/log/YaST2 LOGFILE=$LOGDIR/mkinitrd.log declare -a cmd_option diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.5.5/scripts/setup-network.sh new/mkinitrd-2.4/scripts/setup-network.sh --- old/mkinitrd-2.5.5/scripts/setup-network.sh 2009-01-23 11:31:30.000000000 +0100 +++ new/mkinitrd-2.4/scripts/setup-network.sh 2009-01-29 16:42:34.000000000 +0100 @@ -167,6 +167,7 @@ done fi +ip= interface=${interface#/dev/} [ "$param_D" ] && nettype=dhcp [ "$param_I" ] && nettype=static ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mercurial for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at Thu Jan 29 23:42:05 CET 2009. -------- --- mercurial/mercurial.changes 2009-01-08 15:59:24.000000000 +0100 +++ mercurial/mercurial.changes 2009-01-29 14:26:24.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 29 14:24:21 CET 2009 - tiwai(a)suse.de + +- disable all extensions as default, as requested by mercurial + developer (bnc#466300) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hgext.rc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.On7509/_old 2009-01-29 23:36:59.000000000 +0100 +++ /var/tmp/diff_new_pack.On7509/_new 2009-01-29 23:36:59.000000000 +0100 @@ -25,13 +25,12 @@ %endif Summary: Scalable Distributed SCM Version: 1.1.2 -Release: 1 +Release: 2 License: GPL v2 or later Group: Development/Tools/Version Control BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.selenic.com/mercurial/ Source: %{name}-%{version}.tar.bz2 -Source2: hgext.rc Patch: mercurial-hgk-path-fix.diff # require rcs for 3-way "merge" command. Requires: rcs @@ -82,9 +81,7 @@ install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp mkdir -p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp -# install default hgext.rc mkdir -p $RPM_BUILD_ROOT/etc/mercurial/hgrc.d -install -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/mercurial/hgrc.d %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT %endif @@ -103,11 +100,13 @@ # /etc/bash_completion.d/* %dir /etc/mercurial %dir /etc/mercurial/hgrc.d -%config /etc/mercurial/hgrc.d/hgext.rc %{_datadir}/emacs %{_datadir}/xemacs %changelog +* Thu Jan 29 2009 tiwai(a)suse.de +- disable all extensions as default, as requested by mercurial + developer (bnc#466300) * Thu Jan 08 2009 tiwai(a)suse.de - updated to version 1.1.1: This is a bugfix release ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ktoblzcheck for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package ktoblzcheck for openSUSE:Factory checked in at Thu Jan 29 23:36:51 CET 2009. -------- --- KDE/ktoblzcheck/ktoblzcheck.changes 2008-08-17 18:49:38.000000000 +0200 +++ ktoblzcheck/ktoblzcheck.changes 2009-01-29 01:38:41.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 29 01:38:31 CET 2009 - crrodriguez(a)suse.de + +- remove static libraries and "la" files + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktoblzcheck.spec ++++++ --- /var/tmp/diff_new_pack.l28493/_old 2009-01-29 23:35:28.000000000 +0100 +++ /var/tmp/diff_new_pack.l28493/_new 2009-01-29 23:35:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ktoblzcheck (Version 1.19) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Group: System/Libraries AutoReqProv: on Version: 1.19 -Release: 1 +Release: 12 Summary: Library to check account numbers and bank codes of German banks documents Source: %name-%{version}.tar.bz2 Url: http://ktoblzcheck.sourceforge.net/ @@ -68,7 +68,7 @@ License: LGPL v2.1 or later Group: Productivity/Office/Finance Summary: Tools to check account numbers and bank codes -Requires: %{name} = %{version} libstdc++-devel +Requires: %{name} = %{version} %description tools KtoBLZCheck is a library to check account numbers and bank codes of @@ -88,12 +88,8 @@ %setup -q %build - CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=%_prefix \ - --disable-debug \ - --libdir=%_libdir - make +%configure --disable-debug --disable-static --with-pic +%{__make} %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -101,27 +97,26 @@ # mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 # mv $RPM_BUILD_ROOT/usr/man/man1/ktoblzcheck.1 $RPM_BUILD_ROOT/usr/share/man/man1/ cp -p AUTHORS ChangeLog COPYING INSTALL NEWS README README.WIN32 TODO $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} +%{__rm} -f %{buildroot}%{_libdir}/*.la -%post - %run_ldconfig +%post -p /sbin/ldconfig -%postun - %run_ldconfig +%postun -p /sbin/ldconfig %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%_libdir/libktoblzcheck.so* +%_libdir/libktoblzcheck.so.* /usr/share/ktoblzcheck /usr/share/doc/packages/ktoblzcheck %files devel %defattr (-, root, root) +%_libdir/libktoblzcheck.so /usr/include/iban.h /usr/include/ktoblzcheck.h -%_libdir/libktoblzcheck.la %_libdir/pkgconfig/ktoblzcheck.pc %files tools @@ -130,6 +125,8 @@ /usr/share/man/man1/ktoblzcheck.1.gz %changelog +* Thu Jan 29 2009 crrodriguez(a)suse.de +- remove static libraries and "la" files * Sun Aug 17 2008 stbinner(a)suse.de - update to version 1.19: * Two new calculation methods have been added. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgnomecanvas for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '09

29 Jan '09

Hello community, here is the log from the commit of package libgnomecanvas for openSUSE:Factory checked in at Thu Jan 29 23:34:47 CET 2009. -------- --- GNOME/libgnomecanvas/libgnomecanvas.changes 2009-01-07 10:09:33.000000000 +0100 +++ libgnomecanvas/libgnomecanvas.changes 2009-01-26 23:52:21.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 26 23:52:04 CET 2009 - crrodriguez(a)suse.de + +- remove "la" files [BNC#357465] + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomecanvas.spec ++++++ --- /var/tmp/diff_new_pack.D24218/_old 2009-01-29 23:34:34.000000000 +0100 +++ /var/tmp/diff_new_pack.D24218/_new 2009-01-29 23:34:34.000000000 +0100 @@ -29,7 +29,7 @@ %endif # Version: 2.20.1.1 -Release: 83 +Release: 85 Summary: An Add-On for the GNOME User Interface Libraries Source: ftp://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.20/%{name}-%{version… Patch1: libgnomecanvas-no-tearing.diff @@ -96,24 +96,22 @@ %build autoreconf -f -i -%configure\ +%configure --with-pic\ --disable-static make %{?jobs:-j%jobs} %install %makeinstall %find_lang %{name}-2.0 -rm $RPM_BUILD_ROOT/%{_libdir}/*/*/*.*a +find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + %fdupes $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) @@ -127,7 +125,6 @@ %defattr(-,root,root) %{_includedir}/libgnomecanvas-2.0 %{_libdir}/*.so -%{_libdir}/*.*a %{_libdir}/pkgconfig/libgnomecanvas-2.0.pc %files doc @@ -135,6 +132,8 @@ %{_datadir}/gtk-doc/html/libgnomecanvas %changelog +* Mon Jan 26 2009 crrodriguez(a)suse.de +- remove "la" files [BNC#357465] * Wed Jan 07 2009 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) * Thu Apr 10 2008 ro(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0