August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit krb5
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package krb5 checked in at Sat Aug 2 01:11:44 CEST 2008. -------- --- krb5/krb5.changes 2008-07-25 12:18:44.000000000 +0200 +++ krb5/krb5.changes 2008-07-28 11:25:57.295918000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 28 10:43:29 CEST 2008 - mc(a)suse.de + +- add new fixes to post 1.6.3 patch + * fix mem leak in krb5_gss_accept_sec_context() + * keep minor_status + * kadm5_decrypt_key: A ktype of -1 is documented as meaning + "to be ignored" + * Reject socket fds > FD_SETSIZE + +------------------------------------------------------------------- krb5-plugins.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-doc.spec ++++++ --- /var/tmp/diff_new_pack.Bb1458/_old 2008-08-02 01:09:17.000000000 +0200 +++ /var/tmp/diff_new_pack.Bb1458/_new 2008-08-02 01:09:17.000000000 +0200 @@ -14,7 +14,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html texlive Version: 1.6.3 -Release: 96 +Release: 101 %define srcRoot krb5-1.6.3 Summary: MIT Kerberos5 Implementation--Documentation License: X11/MIT ++++++ krb5-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Bb1458/_old 2008-08-02 01:09:17.000000000 +0200 +++ /var/tmp/diff_new_pack.Bb1458/_new 2008-08-02 01:09:17.000000000 +0200 @@ -14,7 +14,7 @@ Name: krb5-plugins Version: 1.6.3 -Release: 11 +Release: 12 BuildRequires: bison krb5-devel ncurses-devel openldap2-devel %define srcRoot krb5-1.6.3 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.Bb1458/_old 2008-08-02 01:09:17.000000000 +0200 +++ /var/tmp/diff_new_pack.Bb1458/_new 2008-08-02 01:09:17.000000000 +0200 @@ -13,7 +13,7 @@ Name: krb5 Version: 1.6.3 -Release: 58 +Release: 62 BuildRequires: bison libcom_err-devel ncurses-devel %if %{suse_version} > 1010 BuildRequires: keyutils keyutils-devel @@ -554,6 +554,13 @@ %{_mandir}/man1/krb5-config.1* %changelog +* Mon Jul 28 2008 mc(a)suse.de +- add new fixes to post 1.6.3 patch + * fix mem leak in krb5_gss_accept_sec_context() + * keep minor_status + * kadm5_decrypt_key: A ktype of -1 is documented as meaning + "to be ignored" + * Reject socket fds > FD_SETSIZE * Fri Jul 25 2008 mc(a)suse.de - add patches from SVN post 1.6.3 * krb5_string_to_keysalts: Fix an infinite loop ++++++ krb5-1.6.3-post.dif ++++++ --- /var/tmp/diff_new_pack.Bb1458/_old 2008-08-02 01:09:18.000000000 +0200 +++ /var/tmp/diff_new_pack.Bb1458/_new 2008-08-02 01:09:18.000000000 +0200 @@ -2867,3 +2867,190 @@ for (fs = files; !PROFILE_LAST_FILESPEC(*fs); fs++) { retval = profile_open_file(*fs, &new_file); /* if this file is missing, skip to the next */ +Index: src/kdc/network.c +=================================================================== +--- src/kdc/network.c (Revision 20580) ++++ src/kdc/network.c (Revision 20587) +@@ -277,6 +277,12 @@ + struct connection *newconn; + void *tmp; + ++ if (sock > FD_SETSIZE) { ++ data->retval = EMFILE; /* XXX */ ++ com_err(data->prog, 0, ++ "file descriptor number %d too high", sock); ++ return 0; ++ } + newconn = malloc(sizeof(*newconn)); + if (newconn == 0) { + data->retval = errno; +@@ -360,6 +366,12 @@ + paddr(addr)); + return -1; + } ++ if (sock > FD_SETSIZE) { ++ close(sock); ++ com_err(data->prog, 0, "TCP socket fd number %d (for %s) too high", ++ sock, paddr(addr)); ++ return -1; ++ } + if (setreuseaddr(sock, 1) < 0) + com_err(data->prog, errno, + "Cannot enable SO_REUSEADDR on fd %d", sock); +@@ -791,6 +803,10 @@ + s = accept(conn->fd, addr, &addrlen); + if (s < 0) + return; ++ if (s > FD_SETSIZE) { ++ close(s); ++ return; ++ } + setnbio(s), setnolinger(s); + + sockdata.prog = prog; +Index: src/lib/gssapi/krb5/accept_sec_context.c +=================================================================== +--- src/lib/gssapi/krb5/accept_sec_context.c (Revision 20580) ++++ src/lib/gssapi/krb5/accept_sec_context.c (Revision 20587) +@@ -1,5 +1,5 @@ + /* +- * Copyright 2000, 2004 by the Massachusetts Institute of Technology. ++ * Copyright 2000, 2004, 2008 by the Massachusetts Institute of Technology. + * All Rights Reserved. + * + * Export of this software from the United States of America may +@@ -249,6 +249,7 @@ + krb5_data option; + const gss_OID_desc *mech_used = NULL; + OM_uint32 major_status = GSS_S_FAILURE; ++ OM_uint32 tmp_minor_status; + krb5_error krb_error_data; + krb5_data scratch; + gss_cred_id_t cred_handle = NULL; +@@ -903,13 +904,14 @@ + + if (!GSS_ERROR(major_status) && major_status != GSS_S_CONTINUE_NEEDED) { + ctx->k5_context = context; +- return(major_status); ++ context = NULL; ++ goto done; + } + + /* from here on is the real "fail" code */ + + if (ctx) +- (void) krb5_gss_delete_sec_context(minor_status, ++ (void) krb5_gss_delete_sec_context(&tmp_minor_status, + (gss_ctx_id_t *) &ctx, NULL); + if (deleg_cred) { /* free memory associated with the deleg credential */ + if (deleg_cred->ccache) +@@ -936,10 +938,9 @@ + if (decode_req_message) { + krb5_ap_req * request; + +- if (decode_krb5_ap_req(&ap_req, &request)) { +- krb5_free_context(context); +- return (major_status); +- } ++ if (decode_krb5_ap_req(&ap_req, &request)) ++ goto done; ++ + if (request->ap_options & AP_OPTS_MUTUAL_REQUIRED) + gss_flags |= GSS_C_MUTUAL_FLAG; + krb5_free_ap_req(context, request); +@@ -967,20 +968,16 @@ + krb_error_data.server = cred->princ; + + code = krb5_mk_error(context, &krb_error_data, &scratch); +- if (code) { +- krb5_free_context(context); +- return (major_status); +- } ++ if (code) ++ goto done; + + tmsglen = scratch.length; + toktype = KG_TOK_CTX_ERROR; + + token.length = g_token_size(mech_used, tmsglen); + token.value = (unsigned char *) xmalloc(token.length); +- if (!token.value) { +- krb5_free_context(context); +- return (major_status); +- } ++ if (!token.value) ++ goto done; + + ptr = token.value; + g_make_token_header(mech_used, tmsglen, &ptr, toktype); +@@ -990,9 +987,13 @@ + + *output_token = token; + } ++ ++ done: + if (!verifier_cred_handle && cred_handle) { +- krb5_gss_release_cred(minor_status, &cred_handle); ++ krb5_gss_release_cred(&tmp_minor_status, &cred_handle); + } +- krb5_free_context(context); ++ if (context) { ++ krb5_free_context(context); ++ } + return (major_status); + } +Index: src/lib/comerr32.def +=================================================================== +--- src/lib/comerr32.def (Revision 20580) ++++ src/lib/comerr32.def (Revision 20587) +@@ -3,10 +3,10 @@ + HEAPSIZE 8192 + + EXPORTS +- com_err +- com_err_va +- error_message +- add_error_table +- remove_error_table +- set_com_err_hook +- reset_com_err_hook ++ com_err @2 ++ com_err_va @3 ++ error_message @4 ++ add_error_table @1 ++ remove_error_table @5 ++ set_com_err_hook @6 ++ reset_com_err_hook @7 +Index: src/lib/kadm5/srv/svr_principal.c +=================================================================== +--- src/lib/kadm5/srv/svr_principal.c (Revision 20580) ++++ src/lib/kadm5/srv/svr_principal.c (Revision 20587) +@@ -2099,7 +2099,8 @@ + * inexact match on the enctype; this behavior will go away when + * the key storage architecture gets redesigned for 1.3. + */ +- keyblock->enctype = ktype; ++ if (ktype != -1) ++ keyblock->enctype = ktype; + + if (kvnop) + *kvnop = key_data->key_data_kvno; +Index: src/lib/krb5/os/sendto_kdc.c +=================================================================== +--- src/lib/krb5/os/sendto_kdc.c (Revision 20580) ++++ src/lib/krb5/os/sendto_kdc.c (Revision 20587) +@@ -654,6 +654,12 @@ + dprint("socket: %m creating with af %d\n", state->err, ai->ai_family); + return -1; /* try other hosts */ + } ++ if (fd >= FD_SETSIZE) { ++ close(fd); ++ state->err = EMFILE; ++ dprint("socket: fd %d too high\n", fd); ++ return -1; ++ } + /* Make it non-blocking. */ + if (ai->ai_socktype == SOCK_STREAM) { + static const int one = 1; + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cyrus-sasl
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package cyrus-sasl checked in at Sat Aug 2 01:08:29 CEST 2008. -------- --- cyrus-sasl/cyrus-sasl.changes 2008-04-10 12:57:23.000000000 +0200 +++ cyrus-sasl/cyrus-sasl.changes 2008-07-29 15:17:33.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 29 15:15:25 CEST 2008 - rhafer(a)suse.de + +- Enhance sysconfig file and init script to allow to pass arbitrary + parameters to saslauthd (bnc#397808) +- Fixed description of the SASLAUTHD_THREADS sysconfig option. + +------------------------------------------------------------------- cyrus-sasl-saslauthd.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-sasl-saslauthd.spec ++++++ --- /var/tmp/diff_new_pack.f27460/_old 2008-08-02 01:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.f27460/_new 2008-08-02 01:06:06.000000000 +0200 @@ -21,7 +21,7 @@ Provides: cyrus-sasl2:/usr/sbin/saslauthd Summary: The SASL Authentication Server Version: 2.1.22 -Release: 135 +Release: 159 Source: cyrus-sasl-%{version}.tar.bz2 Source1: cyrus-sasl-rc.tar.bz2 Patch: cyrus-sasl-%{version}.dif @@ -181,6 +181,10 @@ %{_libdir}/sasl2/libldapdb.so* %changelog +* Tue Jul 29 2008 rhafer(a)suse.de +- Enhance sysconfig file and init script to allow to pass arbitrary + parameters to saslauthd (bnc#397808) +- Fixed description of the SASLAUTHD_THREADS sysconfig option. * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support ++++++ cyrus-sasl.spec ++++++ --- /var/tmp/diff_new_pack.f27460/_old 2008-08-02 01:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.f27460/_new 2008-08-02 01:06:06.000000000 +0200 @@ -13,7 +13,7 @@ Name: cyrus-sasl Version: 2.1.22 -Release: 129 +Release: 151 BuildRequires: db-devel krb5-devel openssl-devel opie pam-devel Obsoletes: cyrus-sasl2 <= %{version} Provides: cyrus-sasl2 = %{version} @@ -315,6 +315,10 @@ %{_libdir}/libsasl2.la %changelog +* Tue Jul 29 2008 rhafer(a)suse.de +- Enhance sysconfig file and init script to allow to pass arbitrary + parameters to saslauthd (bnc#397808) +- Fixed description of the SASLAUTHD_THREADS sysconfig option. * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support ++++++ cyrus-sasl-rc.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSE/rc.saslauthd new/SuSE/rc.saslauthd --- old/SuSE/rc.saslauthd 2007-10-26 14:31:17.000000000 +0200 +++ new/SuSE/rc.saslauthd 2008-07-29 15:10:13.000000000 +0200 @@ -59,7 +59,7 @@ # NOTE: startproc return 0, even if service is # already running to match LSB spec. - /sbin/startproc $AUTHD_BIN -a $SASLAUTHD_AUTHMECH -n $SASLAUTHD_THREADS > /dev/null 2>&1 + /sbin/startproc $AUTHD_BIN $SASLAUTHD_PARAMS -a $SASLAUTHD_AUTHMECH -n $SASLAUTHD_THREADS > /dev/null 2>&1 # Remember status and be verbose rc_status -v diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSE/sysconfig.saslauthd new/SuSE/sysconfig.saslauthd --- old/SuSE/sysconfig.saslauthd 2007-03-20 09:43:38.000000000 +0100 +++ new/SuSE/sysconfig.saslauthd 2008-07-29 15:15:08.000000000 +0200 @@ -9,11 +9,22 @@ SASLAUTHD_AUTHMECH=pam ## Path: System/Security/SASL -## Type: integer(1:) +## Type: integer(0:) ## Default: 5 ## ServiceRestart: saslauthd # -# Authentication mechanism to use by saslauthd. -# See man 8 saslauthd for available mechanisms. +# Number of processes that saslauthd should fork to responding to +# authentication queries. A value of zero will indicate that saslauthd +# should fork an individual process for each connection. # SASLAUTHD_THREADS=5 + +## Path: System/Security/SASL +## Type: string +## Default: "" +## ServiceRestart: saslauthd +# +# Additional parameters to use by saslauthd. +# See the saslauthd(8) manpage for available parameters. +# +SASLAUTHD_PARAMS="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ghostscript-library
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package ghostscript-library checked in at Sat Aug 2 01:01:30 CEST 2008. -------- --- ghostscript-library/ghostscript-library.changes 2008-04-07 12:40:43.000000000 +0200 +++ ghostscript-library/ghostscript-library.changes 2008-07-29 13:54:30.818466000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 29 13:53:46 CEST 2008 - werner(a)suse.de + +- Fix crash in bjc driver (bnc#412523) + +------------------------------------------------------------------- +Thu Jul 24 18:12:47 CEST 2008 - werner(a)suse.de + +- Fix crash on null pointer reference (bnc#409605) + +------------------------------------------------------------------- ghostscript-mini.changes: same change Old: ---- ghostscript-8.61-bjc.dif New: ---- ghostscript-8.62-bjc.dif ghostscript-8.62-cos_type.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-library.spec ++++++ --- /var/tmp/diff_new_pack.H21993/_old 2008-08-02 00:53:44.000000000 +0200 +++ /var/tmp/diff_new_pack.H21993/_new 2008-08-02 00:53:44.000000000 +0200 @@ -52,7 +52,7 @@ Summary: Necessary Files for Running Ghostscript %endif Version: 8.62 -Release: 3 +Release: 31 License: GPL v2 or later Source0: ghostscript-8.62.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-st… @@ -81,7 +81,7 @@ Patch1: ghostscript-8.60-pdf.dif Patch2: ghostscript-8.57-sgirdb.dif Patch3: ghostscript-8.61-x11.dif -Patch4: ghostscript-8.61-bjc.dif +Patch4: ghostscript-8.62-bjc.dif Patch5: ghostscript-8.60-alignment.dif Patch6: ghostscript-8.61-broken64.dif Patch7: ghostscript-8.60-cgmout.dif @@ -101,6 +101,7 @@ Patch21: ghostscript-8.62-echogs.patch # Currently not applied, does not fit into revision 8594+ Patch22: ghostscript-8.62-cjk.patch +Patch23: ghostscript-8.62-cos_type.dif Patch24: ghostscript-fonts-std-8.11.patch Patch25: Omni-0.9.2.dif.bz2 Patch26: hpdj-2.6-gs8.60.dif @@ -308,7 +309,7 @@ %package -n libgimpprint License: GPL v2 or later Version: 4.2.7 -Release: 244 +Release: 272 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -324,7 +325,7 @@ %package -n libgimpprint-devel License: GPL v2 or later Version: 4.2.7 -Release: 244 +Release: 272 PreReq: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -422,6 +423,7 @@ %patch20 -p0 -b .bbox %patch21 -p1 -b .echogs #%patch22 -p0 -b .cjk +%patch23 -p0 -b .cos_type %patch0 -p0 %build @@ -1316,6 +1318,10 @@ %endif %changelog +* Tue Jul 29 2008 werner(a)suse.de +- Fix crash in bjc driver (bnc#412523) +* Thu Jul 24 2008 werner(a)suse.de +- Fix crash on null pointer reference (bnc#409605) * Mon Apr 07 2008 werner(a)suse.de - Be sure the disabling of Font API works even without the driver * Thu Apr 03 2008 dmueller(a)suse.de ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.H21993/_old 2008-08-02 00:53:44.000000000 +0200 +++ /var/tmp/diff_new_pack.H21993/_new 2008-08-02 00:53:44.000000000 +0200 @@ -52,7 +52,7 @@ Summary: SuSE internal replacement for ghostscript-library and ghostscript-any (Ghostscript) %endif Version: 8.62 -Release: 3 +Release: 21 License: GPL v2 or later Source0: ghostscript-8.62.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-st… @@ -81,7 +81,7 @@ Patch1: ghostscript-8.60-pdf.dif Patch2: ghostscript-8.57-sgirdb.dif Patch3: ghostscript-8.61-x11.dif -Patch4: ghostscript-8.61-bjc.dif +Patch4: ghostscript-8.62-bjc.dif Patch5: ghostscript-8.60-alignment.dif Patch6: ghostscript-8.61-broken64.dif Patch7: ghostscript-8.60-cgmout.dif @@ -101,6 +101,7 @@ Patch21: ghostscript-8.62-echogs.patch # Currently not applied, does not fit into revision 8594+ Patch22: ghostscript-8.62-cjk.patch +Patch23: ghostscript-8.62-cos_type.dif Patch24: ghostscript-fonts-std-8.11.patch Patch25: Omni-0.9.2.dif.bz2 Patch26: hpdj-2.6-gs8.60.dif @@ -301,7 +302,7 @@ %package -n libgimpprint License: GPL v2 or later Version: 4.2.7 -Release: 244 +Release: 272 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -317,7 +318,7 @@ %package -n libgimpprint-devel License: GPL v2 or later Version: 4.2.7 -Release: 244 +Release: 272 PreReq: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -415,6 +416,7 @@ %patch20 -p0 -b .bbox %patch21 -p1 -b .echogs #%patch22 -p0 -b .cjk +%patch23 -p0 -b .cos_type %patch0 -p0 %build @@ -1309,6 +1311,10 @@ %endif %changelog +* Tue Jul 29 2008 werner(a)suse.de +- Fix crash in bjc driver (bnc#412523) +* Thu Jul 24 2008 werner(a)suse.de +- Fix crash on null pointer reference (bnc#409605) * Mon Apr 07 2008 werner(a)suse.de - Be sure the disabling of Font API works even without the driver * Wed Apr 02 2008 werner(a)suse.de ++++++ ghostscript-8.61-bjc.dif -> ghostscript-8.62-bjc.dif ++++++ --- ghostscript-library/ghostscript-8.61-bjc.dif 2008-02-21 14:48:57.000000000 +0100 +++ ghostscript-library/ghostscript-8.62-bjc.dif 2008-07-29 13:50:38.000000000 +0200 @@ -1,5 +1,5 @@ --- src/gdevbjc.h -+++ src/gdevbjc.h 2007-08-03 00:00:00.000000000 +0200 ++++ src/gdevbjc.h 2008-07-28 13:55:39.000000000 +0000 @@ -41,11 +41,11 @@ #define BJC_BJC600 "bjc600" #define BJC_BJC800 "bjc800" @@ -25,7 +25,7 @@ #define BJC_RESOLUTION_LOW (1 * BJC_RESOLUTION_BASE) #define BJC_RESOLUTION_MEDIUM (2 * BJC_RESOLUTION_BASE) --- src/gdevcdj.c -+++ src/gdevcdj.c 2007-08-06 12:21:01.348790099 +0200 ++++ src/gdevcdj.c 2008-07-29 11:47:54.000000000 +0000 @@ -152,17 +152,16 @@ {\ case 0:\ @@ -47,7 +47,7 @@ case 1:\ pa.data = 0; /* mark as not filled */\ } -@@ -249,6 +248,7 @@ static int cdj_param_check_float(gs_par +@@ -249,6 +248,7 @@ static int cdj_param_check_float(gs_para /* Colour mapping procedures */ static dev_proc_map_cmyk_color (gdev_cmyk_map_cmyk_color); static dev_proc_map_rgb_color (gdev_cmyk_map_rgb_color); @@ -133,7 +133,7 @@ dj500c_print_page, 4, 2, 1); gx_device_cdj far_data gs_cdj500_device = -@@ -684,6 +647,17 @@ static int cdj_set_bpp(gx_device *, int +@@ -684,6 +647,17 @@ static int cdj_set_bpp(gx_device *, int, static void cdj_expand_line(word *, int, short, int, int); static int bjc_fscmyk(byte**, byte*[4][4], int**, int, int); @@ -159,7 +159,7 @@ /* Set up colour params if put_params has not already done so */ if (pdev->color_info.num_components == 0) -@@ -807,22 +782,22 @@ hp_colour_open(gx_device *pdev, int ptyp +@@ -807,35 +782,37 @@ hp_colour_open(gx_device *pdev, int ptyp switch (gdev_pcl_paper_size(pdev)) { case PAPER_SIZE_LEGAL: case PAPER_SIZE_LETTER: @@ -186,15 +186,17 @@ } #endif -@@ -830,12 +805,14 @@ hp_colour_open(gx_device *pdev, int ptyp +- bjc->printLimit = m[3]; /* The real hardware limit. */ ++ bjc->printLimit = bjm[3]; /* The real hardware limit. */ #ifdef BJC_DEFAULT_CENTEREDAREA - if (m[3] < m[1]) { +- if (m[3] < m[1]) { - ((float *) m)[3] = m[1]; /* Top margin = bottom one. */ -+ ((float *) bjm)[3] = m[1]; /* Top margin = bottom one. */ ++ if (bjm[3] < bjm[1]) { ++ ((float *) bjm)[3] = bjm[1]; /* Top margin = bottom one. */ } else { - ((float *) m)[1] = m[3]; /* Bottom margin = top one. */ -+ ((float *) bjm)[1] = m[3]; /* Bottom margin = top one. */ ++ ((float *) bjm)[1] = bjm[3]; /* Bottom margin = top one. */ } #endif ++++++ ghostscript-8.62-cos_type.dif ++++++ --- src/gdevpdfo.c +++ src/gdevpdfo.c 2008-07-24 10:17:47.000000000 +0000 @@ -1069,11 +1069,12 @@ cos_dict_equal(const cos_object_t *pco0, const cos_value_t *v = cos_dict_find(pcd1, pcde0->key.data, pcde0->key.size); int code; + if (v == NULL) + return false; + if (cos_type(v->contents.object) != cos_type_dict) return false; /* Should _never_ happen */ - if (v == NULL) - return false; code = cos_value_equal(&pcde0->value, v, pdev); if (code < 0) return code; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sqlite3
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package sqlite3 checked in at Sat Aug 2 00:49:41 CEST 2008. -------- --- sqlite3/sqlite3.changes 2008-05-08 15:04:11.000000000 +0200 +++ sqlite3/sqlite3.changes 2008-07-25 13:35:18.000000000 +0200 @@ -1,0 +2,30 @@ +Fri Jul 25 13:30:50 CEST 2008 - max(a)suse.de + +- Update to version 3.6.0: + * Modifications to the virtual file system interface to support a + wider range of embedded systems. See 35to36.html for additional + information. *** Potentially incompatible change *** + * The handling of IN and NOT IN operators that contain a NULL on + their right-hand side expression is brought into compliance with + the SQL standard and with other SQL database engines. This is a + bug fix, but as it has the potential to break legacy applications + that depend on the older buggy behavior, we mark that as a + *** Potentially incompatible change *** + * The result column names generated for compound subqueries have + been simplified to show only the name of the column of the + original table and omit the table name. This makes SQLite + operate more like other SQL database engines. + * Added the sqlite3_config() interface for doing run-time + configuration of the entire SQLite library. + * Added the sqlite3_status() interface used for querying run-time + status information about the overall SQLite library and its + subsystems. + * Added the sqlite3_initialize() and sqlite3_shutdown() interfaces. + * The SQLITE_OPEN_NOMUTEX option was added to sqlite3_open_v2(). + * Added the PRAGMA page_count command. + * Added the sqlite3_next_stmt() interface. + * Added a new R*Tree virtual table +- Link libtclsqlite against the Tcl stubs library, so that it can be + used from tclkit. + +------------------------------------------------------------------- Old: ---- disable-check.diff sqlite-3.5.7.tar.bz2 sqlite3-tcl85.diff sqlite.diff sqlite-strcasecmp.patch sqlite-test-notime.diff New: ---- sqlite-3.6.0.tar.bz2 sqlite3-upstream-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqlite3.spec ++++++ --- /var/tmp/diff_new_pack.r11159/_old 2008-08-02 00:48:15.000000000 +0200 +++ /var/tmp/diff_new_pack.r11159/_new 2008-08-02 00:48:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sqlite3 (Version 3.5.7) +# spec file for package sqlite3 (Version 3.6.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,19 +20,15 @@ Group: Productivity/Databases/Servers Summary: Embeddable SQL Database Engine Url: http://www.sqlite.org/ -Version: 3.5.7 -Release: 12 +Version: 3.6.0 +Release: 1 Requires: libsqlite3-0 = %version Provides: sqlite = %version Obsoletes: sqlite < %version Source0: http://www.sqlite.org/sqlite-%version.tar.bz2 Source1: sqlite.desktop Source2: sqlite-check_fsync_dir.c -Patch0: sqlite.diff -Patch2: sqlite-test-notime.diff -Patch8: disable-check.diff -Patch9: sqlite3-tcl85.diff -Patch10: sqlite-strcasecmp.patch +Patch0: sqlite3-upstream-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -129,10 +125,6 @@ %prep %setup -q -n sqlite-%version %patch0 -%patch2 -%patch8 -%patch9 -%patch10 # does not work due to our ulimits in our build system rm test/bigfile.test @@ -201,6 +193,33 @@ %_libdir/pkgconfig/sqlite3.pc %changelog +* Fri Jul 25 2008 max(a)suse.de +- Update to version 3.6.0: + * Modifications to the virtual file system interface to support a + wider range of embedded systems. See 35to36.html for additional + information. *** Potentially incompatible change *** + * The handling of IN and NOT IN operators that contain a NULL on + their right-hand side expression is brought into compliance with + the SQL standard and with other SQL database engines. This is a + bug fix, but as it has the potential to break legacy applications + that depend on the older buggy behavior, we mark that as a + *** Potentially incompatible change *** + * The result column names generated for compound subqueries have + been simplified to show only the name of the column of the + original table and omit the table name. This makes SQLite + operate more like other SQL database engines. + * Added the sqlite3_config() interface for doing run-time + configuration of the entire SQLite library. + * Added the sqlite3_status() interface used for querying run-time + status information about the overall SQLite library and its + subsystems. + * Added the sqlite3_initialize() and sqlite3_shutdown() interfaces. + * The SQLITE_OPEN_NOMUTEX option was added to sqlite3_open_v2(). + * Added the PRAGMA page_count command. + * Added the sqlite3_next_stmt() interface. + * Added a new R*Tree virtual table +- Link libtclsqlite against the Tcl stubs library, so that it can be + used from tclkit. * Thu May 08 2008 max(a)suse.de - Actually apply sqlite-strcasecmp.patch to fix the Tcl extension. - Link the Tcl extension dynamically. ++++++ sqlite-3.5.7.tar.bz2 -> sqlite-3.6.0.tar.bz2 ++++++ ++++ 152925 lines of diff (skipped) ++++++ sqlite3-upstream-fixes.patch ++++++ Index: sqlite/Makefile.in RCS File: /sqlite/sqlite/Makefile.in,v ================================================================================ --- Makefile.in +++ Makefile.in @@ -427,7 +427,7 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -o $@ tclsqlite.lo \ - $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \ + libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ -rpath "$(libdir)/sqlite" \ -version-info "8:6:8" @@ -623,7 +623,7 @@ $(LTCOMPILE) -c $(TOP)/src/table.c tclsqlite.lo: $(TOP)/src/tclsqlite.c $(HDR) - $(LTCOMPILE) -c $(TOP)/src/tclsqlite.c + $(LTCOMPILE) -DUSE_TCL_STUBS=1 -c $(TOP)/src/tclsqlite.c tokenize.lo: $(TOP)/src/tokenize.c keywordhash.h $(HDR) $(LTCOMPILE) -c $(TOP)/src/tokenize.c --- src/test_osinst.c +++ src/test_osinst.c @@ -17,6 +17,7 @@ ** $Id: test_osinst.c,v 1.17 2008/07/12 15:55:55 danielk1977 Exp $ */ +#ifdef SQLITE_ENABLE_INSTVFS /* ** C interface: ** @@ -809,6 +810,7 @@ return pVfs; } +#endif /* SQLITE_ENABLE_INSTVFS */ /************************************************************************** *************************************************************************** @@ -818,6 +820,7 @@ #include <tcl.h> +#ifdef SQLITE_ENABLE_INSTVFS struct InstVfsCall { Tcl_Interp *interp; Tcl_Obj *pScript; @@ -1039,10 +1042,28 @@ return TCL_OK; } +#endif /* SQLITE_ENABLE_INSTVFS */ + +/* Alternative implementation of sqlite3_instvfs when the real +** implementation is unavailable. +*/ +#ifndef SQLITE_ENABLE_INSTVFS +static int test_sqlite3_instvfs( + void * clientData, + Tcl_Interp *interp, + int objc, + Tcl_Obj *CONST objv[] +){ + Tcl_AppendResult(interp, + "not compiled with -DSQLITE_ENABLE_INSTVFS; sqlite3_instvfs is " + "unavailable", (char*)0); + return TCL_ERROR; +} +#endif /* !defined(SQLITE_ENABLE_INSTVFS) */ int SqlitetestOsinst_Init(Tcl_Interp *interp){ Tcl_CreateObjCommand(interp, "sqlite3_instvfs", test_sqlite3_instvfs, 0, 0); return TCL_OK; } -#endif +#endif /* SQLITE_TEST */ --- test/func.test +++ test/func.test @@ -298,10 +298,22 @@ } {0} do_test func-8.6 { execsql { - SELECT sum(x) FROM (SELECT '9223372036' || '854775808' AS x + SELECT typeof(sum(x)) FROM (SELECT '9223372036' || '854775807' AS x UNION ALL SELECT -9223372036854775807) } -} {1.0} +} {integer} +do_test func-8.7 { + execsql { + SELECT typeof(sum(x)) FROM (SELECT '9223372036' || '854775808' AS x + UNION ALL SELECT -9223372036854775807) + } +} {real} +do_test func-8.8 { + execsql { + SELECT sum(x)>0.0 FROM (SELECT '9223372036' || '854775808' AS x + UNION ALL SELECT -9223372036850000000) + } +} {1} # How do you test the random() function in a meaningful, deterministic way? # --- test/memsubsys1.test +++ test/memsubsys1.test @@ -133,7 +133,7 @@ } $max_pagecache do_test memsubsys1-4.5 { set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2] - expr {$maxreq<4096} + expr {$maxreq<7000} } 1 do_test memsubsys1-4.6 { set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2] @@ -211,7 +211,7 @@ } 0 do_test memsubsys1-7.5 { set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2] - expr {$maxreq<2500} + expr {$maxreq<4000} } 1 do_test memsubsys1-7.6 { set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xterm
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package xterm checked in at Sat Aug 2 00:41:39 CEST 2008. -------- --- xterm/xterm.changes 2008-07-08 11:22:18.000000000 +0200 +++ xterm/xterm.changes 2008-07-28 11:19:42.368134084 +0200 @@ -1,0 +2,25 @@ +Mon Jul 28 11:16:08 CEST 2008 - sndirsch(a)suse.de + +- update to release xterm-236 + * correct memory reallocation when handling a paste of UTF-8 + text from [240]patch #225 changes (report/patch by Max + Mikhanosha). + * correct allocation of temporary buffer in xtermFindShell in + case the user's $PATH contains no ":" (report/analysis + by Victor Stinner, Freedesktop.Org Bugzilla #16790). + * modify CF_XOPEN_SOURCE to add case for DragonFly BSD, to fix + new compile problem exposed by fix for fd_mask (patch by + Hasso Tepper). + * add configure-check for ncurses use_extended_names, + (report by Martin Mokrejs). + * correct computation for toolbar height; layout manager + already takes into account borderWidth resource. + * implement VT320-style SCS (select character set) for ISO + Latin-1 supplemental. + * fixes for vt100-style character sets in UTF-8 mode + (Ubuntu #230919). + * fix to make luit work with xterm's -ls option + (report/patch by Marius Tolzmann). + * update config.guess, config.sub + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.c20570/_old 2008-08-02 00:38:03.000000000 +0200 +++ /var/tmp/diff_new_pack.c20570/_new 2008-08-02 00:38:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xterm (Version 235) +# spec file for package xterm (Version 236) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,8 +19,8 @@ Group: System/X11/Utilities Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm AutoReqProv: on -Version: 235 -Release: 16 +Version: 236 +Release: 1 Summary: The basic X terminal program Source: %name.tar.gz Source1: luitx @@ -270,6 +270,28 @@ /usr/share/pixmaps/* %changelog +* Mon Jul 28 2008 sndirsch(a)suse.de +- update to release xterm-236 + * correct memory reallocation when handling a paste of UTF-8 + text from [240]patch #225 changes (report/patch by Max + Mikhanosha). + * correct allocation of temporary buffer in xtermFindShell in + case the user's $PATH contains no ":" (report/analysis + by Victor Stinner, Freedesktop.Org Bugzilla #16790). + * modify CF_XOPEN_SOURCE to add case for DragonFly BSD, to fix + new compile problem exposed by fix for fd_mask (patch by + Hasso Tepper). + * add configure-check for ncurses use_extended_names, + (report by Martin Mokrejs). + * correct computation for toolbar height; layout manager + already takes into account borderWidth resource. + * implement VT320-style SCS (select character set) for ISO + Latin-1 supplemental. + * fixes for vt100-style character sets in UTF-8 mode + (Ubuntu #230919). + * fix to make luit work with xterm's -ls option + (report/patch by Marius Tolzmann). + * update config.guess, config.sub * Tue Jul 08 2008 schwab(a)suse.de - Use correct tty group. * Mon Apr 21 2008 sndirsch(a)suse.de ++++++ xterm.tar.gz ++++++ ++++ 3607 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 upx
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package upx checked in at Sat Aug 2 00:37:54 CEST 2008. -------- --- upx/upx.changes 2008-01-21 16:22:33.000000000 +0100 +++ upx/upx.changes 2008-07-31 17:14:51.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 31 17:14:24 CEST 2008 - pgajdos(a)suse.cz + +- updated to 3.03: + o optional LZMA compression + +------------------------------------------------------------------- Old: ---- upx-3.02_ia64-endianity.patch upx-3.02-src.tar.bz2 New: ---- upx-3.03_ia64-endianity.patch upx-3.03-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ upx.spec ++++++ --- /var/tmp/diff_new_pack.Z19921/_old 2008-08-02 00:37:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Z19921/_new 2008-08-02 00:37:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package upx (Version 3.02 ) +# spec file for package upx (Version 3.03 ) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,12 +10,13 @@ # norootforbuild + Name: upx BuildRequires: gcc-c++ ucl zlib-devel License: GPL v2 or later Group: Development/Tools/Other AutoReqProv: on -Version: 3.02 +Version: 3.03 Release: 1 Source0: %{name}-%{version}-src.tar.bz2 Patch: %{name}-%{version}_ia64-endianity.patch @@ -61,6 +62,9 @@ %{_prefix}/bin/* %changelog +* Thu Jul 31 2008 pgajdos(a)suse.cz +- updated to 3.03: + o optional LZMA compression * Mon Jan 21 2008 pgajdos(a)suse.cz - update to 3.02: * fix unmapping on arm-linux.elf @@ -70,7 +74,7 @@ * new format linux/mipsel supports ELF on [32-bit] R3000 * fix argv[0] on PowerPC with --lzma * another bug fixes -* Thu Oct 04 2007 bg(a)suse.de +* Fri Oct 05 2007 bg(a)suse.de - use ia64 fix for hppa * Mon Jul 23 2007 pgajdos(a)suse.cz - updated to 3.00 (supports some new formats) ++++++ upx-3.02_ia64-endianity.patch -> upx-3.03_ia64-endianity.patch ++++++ ++++++ upx-3.02-src.tar.bz2 -> upx-3.03-src.tar.bz2 ++++++ ++++ 106631 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-proto-devel
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package xorg-x11-proto-devel checked in at Sat Aug 2 00:37:34 CEST 2008. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2008-07-21 14:38:41.000000000 +0200 +++ xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2008-07-29 10:58:44.029315905 +0200 @@ -1,0 +2,9 @@ +Tue Jul 29 10:57:47 CEST 2008 - sndirsch(a)suse.de + +- inputproto 1.4.4 + * C sucks: define XEventClass in terms of unsigned int, not CARD32. + * Typo fix. + * Add DeviceControlChanged define. +- obsoletes inputproto.diff + +------------------------------------------------------------------- Old: ---- inputproto-1.4.3.tar.bz2 inputproto.diff New: ---- inputproto-1.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.j18687/_old 2008-08-02 00:37:03.000000000 +0200 +++ /var/tmp/diff_new_pack.j18687/_new 2008-08-02 00:37:03.000000000 +0200 @@ -14,7 +14,7 @@ Name: xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 53 +Release: 58 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -28,7 +28,7 @@ Source6: fontcacheproto-X11R7.0-0.1.2.tar.bz2 Source7: fontsproto-X11R7.0-2.0.2.tar.bz2 Source8: glproto-1.4.9.tar.bz2 -Source9: inputproto-1.4.3.tar.bz2 +Source9: inputproto-1.4.4.tar.bz2 Source10: kbproto-1.0.3.tar.bz2 Source11: printproto-1.0.4.tar.bz2 Source12: randrproto-1.2.2.tar.bz2 @@ -57,7 +57,6 @@ Source35: vncproto-20070501.tar.bz2 Source36: xcliplistproto-20070501.tar.bz2 Source37: dri2proto-1.1.tar.bz2 -Patch: inputproto.diff %description This package contains all necessary include files and libraries needed @@ -82,9 +81,6 @@ %prep %setup -T -c %{name} for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done -pushd inputproto-* -%patch0 -p1 -popd %build @@ -137,6 +133,12 @@ /usr/share/xcb/ %changelog +* Tue Jul 29 2008 sndirsch(a)suse.de +- inputproto 1.4.4 + * C sucks: define XEventClass in terms of unsigned int, not CARD32. + * Typo fix. + * Add DeviceControlChanged define. +- obsoletes inputproto.diff * Mon Jul 21 2008 sndirsch(a)suse.de - back to xcb-proto 1.1, since xcb-proto 1.2 requires python for building, which requires xorg-x11-proto-devel for building ++++++ inputproto-1.4.3.tar.bz2 -> inputproto-1.4.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/aclocal.m4 new/inputproto-1.4.4/aclocal.m4 --- old/inputproto-1.4.3/aclocal.m4 2008-03-06 04:06:03.000000000 +0100 +++ new/inputproto-1.4.4/aclocal.m4 2008-07-29 01:50:01.000000000 +0200 @@ -65,14 +65,14 @@ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], [`echo $PACKAGE_VERSION | cut -d . -f 1`], [Major version of this package]) - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` if test "x$PVM" = "x"; then PVM="0" fi AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], [$PVM], [Minor version of this package]) - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` if test "x$PVP" = "x"; then PVP="0" fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/ChangeLog new/inputproto-1.4.4/ChangeLog --- old/inputproto-1.4.3/ChangeLog 2008-03-06 04:06:10.000000000 +0100 +++ new/inputproto-1.4.4/ChangeLog 2008-07-29 01:50:03.000000000 +0200 @@ -1,3 +1,41 @@ +commit c109e2ddb9cab22f185a877ab7e48002d1087400 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Jul 29 09:10:09 2008 +0930 + + inputproto 1.4.4 + +commit f41d153886c3519ebaf767f9c0d3281b6adce030 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Jul 29 08:58:53 2008 +0930 + + Add DeviceControlChanged define. + + This value is used for the devchange field in the DevicePresenceNotify event + when a device's control has been modified. + (cherry picked from commit 0daf8328cfa90b038753fc409c5eb05ba3fac6d5) + +commit 852568991b251e9366da167f1b746a0a1db6adf0 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Mar 10 09:31:51 2008 -0400 + + Typo fix. + +commit b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9 +Author: Adam Jackson <ajax(a)redhat.com> +Date: Mon Mar 10 09:08:21 2008 -0400 + + C sucks: define XEventClass in terms of unsigned int, not CARD32. + + Apparently pulling in Xmd.h here breaks qt, since they both define an + INT32 type (and incompatible ones even, since Xmd's is unsigned long on + ILP32 because whoever wrote Xmd.h is a C novice). + +commit 3edc1bf23b07ea47d7e1e32047e15c67333c663e +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Mar 5 22:06:19 2008 -0500 + + inputproto 1.4.3 + commit 096b20bf5492d248b5c8ff0c1c28e221d59db724 Author: Jesse Barnes <jesse.barnes(a)intel.com> Date: Mon Jan 21 15:28:49 2008 -0800 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/configure new/inputproto-1.4.4/configure --- old/inputproto-1.4.3/configure 2008-03-06 04:06:04.000000000 +0100 +++ new/inputproto-1.4.4/configure 2008-07-29 01:50:02.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for InputProto 1.4.3. +# Generated by GNU Autoconf 2.61 for InputProto 1.4.4. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='InputProto' PACKAGE_TARNAME='inputproto' -PACKAGE_VERSION='1.4.3' -PACKAGE_STRING='InputProto 1.4.3' +PACKAGE_VERSION='1.4.4' +PACKAGE_STRING='InputProto 1.4.4' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL @@ -1145,7 +1145,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures InputProto 1.4.3 to adapt to many kinds of systems. +\`configure' configures InputProto 1.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1211,7 +1211,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of InputProto 1.4.3:";; + short | recursive ) echo "Configuration of InputProto 1.4.4:";; esac cat <<\_ACEOF @@ -1282,7 +1282,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -InputProto configure 1.4.3 +InputProto configure 1.4.4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1296,7 +1296,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by InputProto $as_me 1.4.3, which was +It was created by InputProto $as_me 1.4.4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1986,7 +1986,7 @@ # Define the identity of the package. PACKAGE='inputproto' - VERSION='1.4.3' + VERSION='1.4.4' cat >>confdefs.h <<_ACEOF @@ -2153,7 +2153,7 @@ #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` if test "x$PVM" = "x"; then PVM="0" fi @@ -2162,7 +2162,7 @@ #define PACKAGE_VERSION_MINOR $PVM _ACEOF - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` if test "x$PVP" = "x"; then PVP="0" fi @@ -2601,7 +2601,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by InputProto $as_me 1.4.3, which was +This file was extended by InputProto $as_me 1.4.4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2644,7 +2644,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -InputProto config.status 1.4.3 +InputProto config.status 1.4.4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/configure.ac new/inputproto-1.4.4/configure.ac --- old/inputproto-1.4.3/configure.ac 2008-03-06 04:05:48.000000000 +0100 +++ new/inputproto-1.4.4/configure.ac 2008-07-29 01:49:33.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([InputProto], [1.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] +AC_INIT([InputProto], [1.4.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/install-sh new/inputproto-1.4.4/install-sh --- old/inputproto-1.4.3/install-sh 2008-03-06 04:06:05.000000000 +0100 +++ new/inputproto-1.4.4/install-sh 2008-04-16 06:02:08.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2006-10-14.15 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} +doit="${DOITPROG-}" if test -z "$doit"; then doit_exec=exec else @@ -58,49 +58,34 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" +posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 -chgrpcmd= chmodcmd=$chmodprog chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" +chgrpcmd= stripcmd= - +rmcmd="$rmprog -f" +mvcmd="$mvprog" src= dst= dir_arg= -dst_arg= - -copy_on_change=false +dstarg= no_target_directory= -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -110,55 +95,65 @@ In the 4th, create DIRECTORIES. Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) ;; - - -C) copy_on_change=true;; + -c) shift + continue;; - -d) dir_arg=true;; + -d) dir_arg=true + shift + continue;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift + shift + continue;; --help) echo "$usage"; exit $?;; -m) mode=$2 + shift + shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - shift;; + continue;; -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; --version) echo "$0 $scriptversion"; exit $?;; @@ -170,22 +165,21 @@ *) break;; esac - shift done -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dst_arg"; then + if test -n "$dstarg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" + set fnord "$@" "$dstarg" shift # fnord fi shift # arg - dst_arg=$arg + dstarg=$arg done fi @@ -230,7 +224,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src;; + -*) src=./$src ;; esac if test -n "$dir_arg"; then @@ -248,22 +242,22 @@ exit 1 fi - if test -z "$dst_arg"; then + if test -z "$dstarg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg + dst=$dstarg # Protect names starting with `-'. case $dst in - -*) dst=./$dst;; + -*) dst=./$dst ;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 + echo "$0: $dstarg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -384,19 +378,26 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; esac - eval "$initialize_posix_glob" + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac oIFS=$IFS IFS=/ - $posix_glob set -f + $posix_glob && set -f set fnord $dstdir shift - $posix_glob set +f + $posix_glob && set +f IFS=$oIFS prefixes= @@ -458,54 +459,41 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ + || { + echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + } || exit 1 trap '' 0 fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/XI.h new/inputproto-1.4.4/XI.h --- old/inputproto-1.4.3/XI.h 2008-03-06 04:05:38.000000000 +0100 +++ new/inputproto-1.4.4/XI.h 2008-07-29 01:45:06.000000000 +0200 @@ -1,5 +1,3 @@ -/* $Xorg: XI.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,17 +43,14 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XI.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */ /* Definitions used by the server, library and client */ #ifndef _XI_H_ #define _XI_H_ -#include <X11/Xmd.h> /* CARD32 */ - -#define sz_xGetExtensionVersionReq 8 -#define sz_xGetExtensionVersionReply 32 +#define sz_xGetExtensionVersionReq 8 +#define sz_xGetExtensionVersionReply 32 #define sz_xListInputDevicesReq 4 #define sz_xListInputDevicesReply 32 #define sz_xOpenDeviceReq 8 @@ -255,7 +250,8 @@ #define DeviceRemoved 1 #define DeviceEnabled 2 #define DeviceDisabled 3 -#define DeviceUnrecoverable 4 +#define DeviceUnrecoverable 4 +#define DeviceControlChanged 5 #define XI_BadDevice 0 #define XI_BadEvent 1 @@ -263,12 +259,16 @@ #define XI_DeviceBusy 3 #define XI_BadClass 4 -/* Make XEventClass be a CARD32 for 64 bit servers. Don't affect client +/* + * Make XEventClass be a CARD32 for 64 bit servers. Don't affect client * definition of XEventClass since that would be a library interface change. * See the top of X.h for more _XSERVER64 magic. + * + * But, don't actually use the CARD32 type. We can't get it defined here + * without polluting the namespace. */ #ifdef _XSERVER64 -typedef CARD32 XEventClass; +typedef unsigned int XEventClass; #else typedef unsigned long XEventClass; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inputproto-1.4.3/XIproto.h new/inputproto-1.4.4/XIproto.h --- old/inputproto-1.4.3/XIproto.h 2008-03-06 04:05:38.000000000 +0100 +++ new/inputproto-1.4.4/XIproto.h 2008-07-29 01:45:06.000000000 +0200 @@ -1600,7 +1600,7 @@ BYTE pad00; CARD16 sequenceNumber B16; Time time B32; - BYTE devchange; /* Device{Added|Removed|Enabled|Disabled} */ + BYTE devchange; /* Device{Added|Removed|Enabled|Disabled|ControlChanged} */ BYTE deviceid; CARD16 control B16; CARD32 pad02 B32; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 insserv
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package insserv checked in at Sat Aug 2 00:36:35 CEST 2008. -------- --- insserv/insserv.changes 2008-06-11 15:06:41.000000000 +0200 +++ insserv/insserv.changes 2008-07-29 15:32:16.658890000 +0200 @@ -1,0 +2,34 @@ +Tue Jul 29 15:23:43 CEST 2008 - werner(a)suse.de + +- Resolve server minor problems on openSUSE and Debian + * Handle the runlevel bit for system boot in lvl2str() + * Handle dependencies on several script on command line + * Let link scheme overwrite empty default start/stop tags + +------------------------------------------------------------------- +Wed Jul 2 19:38:15 CEST 2008 - werner(a)suse.de + +- Use prefetch from kernels code for lists +- Make start/stop requirements link to the services its self +- Make -pedantic work +- Be sure that the code is optimized + +------------------------------------------------------------------- +Wed Jun 25 19:37:35 CEST 2008 - werner(a)suse.de + +- Handle provides and service lists in parallel, this should + reduce the double efforts. +- Calculate start oder and stop order separately +- Sort targets in the makefile accordingly to their order + +------------------------------------------------------------------- +Wed Jun 18 15:27:16 CEST 2008 - werner(a)suse.de + +- Clean out several provides of one specific script, add therefore + an alias list to the first provide. This makes less work load on + following the full dependcy trees. +- Use aligned memory allocation to avoid memory fragmentation +- Use reference counts to be able to free not needed memory +- Be able to follow not only the start but also the stop dependcies + +------------------------------------------------------------------- Old: ---- insserv-1.11.0.dif insserv-1.11.0.tar.bz2 New: ---- insserv-1.12.0.dif insserv-1.12.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.I13067/_old 2008-08-02 00:34:46.000000000 +0200 +++ /var/tmp/diff_new_pack.I13067/_new 2008-08-02 00:34:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package insserv (Version 1.11.0) +# spec file for package insserv (Version 1.12.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,13 +16,15 @@ Group: System/Base Provides: aaa_base:/sbin/insserv AutoReqProv: on -Version: 1.11.0 -Release: 33 +Version: 1.12.0 +Release: 1 Summary: A Program to Arrange Initialization Scripts Source0: insserv-%{version}.tar.bz2 Source1: insserv.conf Patch: insserv-%{version}.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build +%global _sysconfdir /etc +%global _sbindir /sbin %description Insserv enables an installed system init script (boot script) by @@ -40,21 +42,46 @@ %patch %build -make +make INITDIR=%{_sysconfdir}/init.d INSCONF=%{_sysconfdir}/insserv.conf %install -make install DESTDIR=$RPM_BUILD_ROOT -install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/etc/ +make install DESTDIR=%{buildroot} INITDIR=%{_sysconfdir}/init.d INSCONF=%{_sysconfdir}/insserv.conf +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/ +mkdir -p %{buildroot}%{_datadir}/insserv/overrides %files %defattr(-,root,root) -%config /etc/insserv.conf -/sbin/insserv +%config %{_sysconfdir}/insserv.conf +%{_sbindir}/insserv /lib/lsb/* -/usr/lib/lsb/* +%{_prefix}/lib/lsb/* %{_mandir}/man8/insserv.8.gz +%dir %{_datadir}/insserv +%dir %{_datadir}/insserv/overrides %changelog +* Tue Jul 29 2008 werner(a)suse.de +- Resolve server minor problems on openSUSE and Debian + * Handle the runlevel bit for system boot in lvl2str() + * Handle dependencies on several script on command line + * Let link scheme overwrite empty default start/stop tags +* Wed Jul 02 2008 werner(a)suse.de +- Use prefetch from kernels code for lists +- Make start/stop requirements link to the services its self +- Make -pedantic work +- Be sure that the code is optimized +* Wed Jun 25 2008 werner(a)suse.de +- Handle provides and service lists in parallel, this should + reduce the double efforts. +- Calculate start oder and stop order separately +- Sort targets in the makefile accordingly to their order +* Wed Jun 18 2008 werner(a)suse.de +- Clean out several provides of one specific script, add therefore + an alias list to the first provide. This makes less work load on + following the full dependcy trees. +- Use aligned memory allocation to avoid memory fragmentation +- Use reference counts to be able to free not needed memory +- Be able to follow not only the start but also the stop dependcies * Wed Jun 11 2008 werner(a)suse.de - Make kbd interactive to avoid race during tty resize (bnc#259577) * Wed Jun 04 2008 werner(a)suse.de ++++++ insserv-1.11.0.dif -> insserv-1.12.0.dif ++++++ --- insserv/insserv-1.11.0.dif 2008-06-04 12:33:51.000000000 +0200 +++ insserv/insserv-1.12.0.dif 2008-07-31 18:09:46.805686000 +0200 @@ -1,413 +1,32 @@ ---- Makefile -+++ Makefile 2008-05-15 15:58:47.218346000 +0200 -@@ -31,6 +31,13 @@ endif - CFLAGS = -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ - $(ISSUSE) -DINITDIR=\"$(INITDIR)\" -DINSCONF=\"$(INSCONF)\" -pipe - CLOOP = -falign-loops=0 -+ LDFLAGS = -Wl,-O,3,--relax -+ LIBS = -+ifdef USE_RPMLIB -+ CFLAGS += -DUSE_RPMLIB=1 -+ LDFLAGS += -Wl,--as-needed -+ LIBS += -lrpm -+endif - CC = gcc - RM = rm -f - MKDIR = mkdir -p -@@ -64,7 +71,7 @@ insserv.o: insserv.c listing.h .system - $(CC) $(CFLAGS) $(CLOOP) -c $< - - insserv: insserv.o listing.o -- $(CC) $(CFLAGS) -Wl,-O,3,--relax -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - - ifeq ($(ISSUSE),-DSUSE) - insserv.8: insserv.8.in .system --- insserv.c -+++ insserv.c 2008-06-04 12:32:19.514155760 +0200 -@@ -35,6 +35,10 @@ - #include <limits.h> - #include <getopt.h> - #include "listing.h" -+#if defined(USE_RPMLIB) && (USE_RPMLIB > 0) -+# include <rpm/rpmlib.h> -+# include <rpm/rpmmacro.h> -+#endif - - static const char *map_runlevel_to_location(const int runlevel); - #ifndef SUSE -@@ -166,7 +170,7 @@ typedef struct pwd_struct { - - static list_t pwd = { &(pwd), &(pwd) }, * topd = &(pwd); - --static void pushd(const char *const __restrict path); -+static void pushd(const char *const __restrict path) __attribute__((nonnull(1))); - static void pushd(const char *const path) - { - pwd_t * dir; -@@ -305,13 +309,13 @@ out: - return getserv(ptr); - } - --static serv_t * findserv(const char *const __restrict serv) __attribute__((nonnull(1))); -+static serv_t * findserv(const char *const __restrict serv); - static serv_t * findserv(const char *const serv) - { - list_t * ptr; - serv_t * ret = (serv_t*)0; - -- if (!serv) -+ if (serv == (const char*)0) - goto out; - - list_for_each(ptr, serv_start) { -@@ -334,6 +338,9 @@ static void rememberreq(serv_t *serv, ui - list_t * ptr; - uint old = bit; - -+ if (!tmp) -+ error("%s", strerror(errno)); -+ - while ((token = strsep(&tmp, delimeter))) { - boolean found = false; - req_t * this; -@@ -399,6 +406,9 @@ static void reversereq(const serv_t * se - char * rev = strdupa(list); - uint old = bit; - -+ if (!rev) -+ error("%s", strerror(errno)); -+ - while ((dep = strsep(&rev, delimeter)) && *dep) { - serv_t * tmp; - list_t * ptr; -@@ -437,7 +447,7 @@ static void reversereq(const serv_t * se - /* - * Check required services for name - */ --static boolean chkrequired(const char *const __restrict name) __attribute__((nonnull(1))); -+static boolean chkrequired(const char *const __restrict name); - static boolean chkrequired(const char *const name) - { - serv_t * serv = findserv(name); -@@ -587,7 +597,7 @@ static inline void active_script(void) - serv_t * chk = (serv_t*)0; - list_t * req; - const char *name; -- boolean ignore = false; -+ boolean skip = false; - - if (!(serv->lvls & cur->lvls)) - continue; -@@ -612,11 +622,11 @@ static inline void active_script(void) - */ - list_for_each(req, &(serv->sort.req)) { - if (!strcmp(getreq(req)->serv, cur->name)) -- ignore = true; -+ skip = true; - if (!strcmp(getreq(req)->serv, name)) -- ignore = true; -+ skip = true; - } -- if (ignore) continue; -+ if (skip) continue; - - /* - * Increase order of members of the same start -@@ -1111,8 +1121,8 @@ static inline void scan_script_reset(voi - #define FOUND_LSB_DEFAULT 0x02 - #define FOUND_LSB_OVERRIDE 0x04 - --static uchar scan_lsb_headers(const char *const __restrict path) __attribute__((nonnull(1))); --static uchar scan_lsb_headers(const char *const path) -+static uchar scan_lsb_headers(const char *const __restrict path, const boolean ignore) __attribute__((nonnull(1))); -+static uchar scan_lsb_headers(const char *const path, const boolean ignore) - { - regmatch_t subloc[SUBNUM_SHD+1], *val = &subloc[SUBNUM-1], *shl = &subloc[SUBNUM_SHD-1]; - FILE *script; -@@ -1244,7 +1254,8 @@ static uchar scan_lsb_headers(const char - if (*name == 'S' || *name == 'K') - name += 3; - warn("script %s is broken: missing end of LSB comment.\n", name); -- error("exiting now!\n"); -+ if (!ignore) -+ error("exiting now!\n"); - } - - #ifndef USE_STOP_TAGS -@@ -1341,8 +1352,9 @@ static char *scriptname(const char * pat - return script; - } - --static uchar load_overrides(const char *const __restrict dir, const char *const __restrict name) __attribute__((nonnull(1,2))); --static uchar load_overrides(const char *const dir, const char *const name) -+static uchar load_overrides(const char *const __restrict dir, -+ const char *const __restrict name, const boolean ignore) __attribute__((nonnull(1,2))); -+static uchar load_overrides(const char *const dir, const char *const name, const boolean ignore) - { - uchar ret = 0; - char fullpath[PATH_MAX+1]; -@@ -1354,14 +1366,16 @@ static uchar load_overrides(const char * - error("snprintf(): %s\n", strerror(errno)); - - if (stat(fullpath, &statbuf) == 0 && S_ISREG(statbuf.st_mode)) -- ret = scan_lsb_headers(fullpath); -+ ret = scan_lsb_headers(fullpath, ignore); - if (ret) - ret |= FOUND_LSB_OVERRIDE; - return ret; - } - --static uchar scan_script_defaults(const char *const __restrict path, const char *const __restrict override_path) __attribute__((nonnull(1,2))); --static uchar scan_script_defaults(const char *const path, const char *const override_path) -+static uchar scan_script_defaults(const char *const __restrict path, -+ const char *const __restrict override_path, const boolean ignore) __attribute__((nonnull(1,2))); -+static uchar scan_script_defaults(const char *const path, const char *const override_path, -+ const boolean ignore) - { - uchar ret = 0; - char *name = scriptname(path); -@@ -1393,10 +1407,10 @@ static uchar scan_script_defaults(const - #endif /* SUSE */ - - /* Replace with headers from the script itself */ -- ret |= scan_lsb_headers(path); -+ ret |= scan_lsb_headers(path, ignore); - - if (!ret) /* Load values if the override file exist */ -- ret |= load_overrides("/usr/share/insserv/overrides", name); -+ ret |= load_overrides("/usr/share/insserv/overrides", name, ignore); - else - ret |= FOUND_LSB_DEFAULT; - -@@ -1404,7 +1418,7 @@ static uchar scan_script_defaults(const - * Allow host-specific overrides to replace the content in the - * init.d scripts - */ -- ret |= load_overrides(override_path, name); -+ ret |= load_overrides(override_path, name, ignore); - #ifdef SUSE - out: - #endif /* SUSE */ -@@ -1510,8 +1524,11 @@ static int map_runlevel_to_seek(const in - * Scan current service structure - */ - static void scan_script_locations(const char *const __restrict path, -- const char *const __restrict override_path, char ** const __restrict iargv, const int icnt) __attribute__((nonnull(1,2))); --static void scan_script_locations(const char *const path, const char *const override_path, char ** const iargv, const int icnt) -+ const char *const __restrict override_path, -+ char ** const __restrict iargv, -+ const int icnt, const boolean ignore) __attribute__((nonnull(1,2))); -+static void scan_script_locations(const char *const path, const char *const override_path, -+ char ** const iargv, const int icnt, const boolean ignore) - { - int runlevel; - -@@ -1553,18 +1570,11 @@ static void scan_script_locations(const - xremove(d->d_name); /* dangling sym link */ - continue; - } --#ifdef SUSE -- /* -- * Ignore scripts if removed later to avoid not used depencies -- * in the makefiles depend.boot, .depend.start and .depend.stop -- */ -- if (iargv && chkfor(ptr, iargv, icnt)) -- continue; --#endif /* SUSE */ -- lsb = scan_script_defaults(d->d_name, override_path); - -+ lsb = scan_script_defaults(d->d_name, override_path, ignore); - if (!script_inf.provides || script_inf.provides == empty) - script_inf.provides = xstrdup(ptr); -+ - #ifndef SUSE - if (!lsb) { - script_inf.required_start = xstrdup(DEFAULT_DEPENDENCY); -@@ -1801,11 +1811,6 @@ static int cfgfile_filter(const struct d - return 0; - if ((*name == '.') && ((*(name+1) == '\0') || (*(name+1) == '.'))) - return 0; -- else { -- struct stat st; -- if ((stat(name,&st) < 0) || !S_ISREG(st.st_mode)) -- return 0; -- } - if ((end = strrchr(name, '.'))) { - end++; - if (!strncmp(end, "rpm", 3) || /* .rpmorig, .rpmnew, .rmpsave, ... */ -@@ -1859,6 +1864,7 @@ static void scan_conf(const char * file) - n = scandir(path, &namelist, cfgfile_filter, alphasort); - if(n > 0) { - while(n--) { -+ struct stat st; - char buf[PATH_MAX+1]; - int r; - -@@ -1866,6 +1872,9 @@ static void scan_conf(const char * file) - if (r >= sizeof(buf) || r < 0) - error("snprintf(): %s\n", strerror(errno)); - -+ if ((stat(buf, &st) < 0) || !S_ISREG(st.st_mode)) -+ continue; -+ - scan_conf_file(buf); - - free(namelist[n]); -@@ -1940,6 +1949,91 @@ static inline char * scan_for(DIR *const - return ret; - } - -+#ifdef SUSE -+/* -+ * A simple command line checker of the parent process to determine if this is -+ * a sub process "/bin/sh" forked off for executing a temporary file for %preun, -+ * %postun, %pre, or %post scriptlet. -+ */ -+static inline boolean underrpm(void) -+{ -+ boolean ret = false; -+ const pid_t pp = getppid(); -+ char buf[PATH_MAX], *argv[3], *ptr; -+# if defined(USE_RPMLIB) && (USE_RPMLIB > 0) -+ char *tmppath, *shell; -+# endif -+ int argc, fd; -+ ssize_t len; -+ -+ snprintf(buf, sizeof(buf)-1, "/proc/%lu/cmdline", (unsigned long)pp); -+ if ((fd = open(buf, O_NOCTTY|O_RDONLY)) < 0) -+ goto out; -+ -+ memset(buf, '\0', sizeof(buf)); -+ if ((len = read(fd , buf, sizeof(buf)-1)) < 0) -+ goto out; -+ -+ ptr = &buf[0]; -+ argc = 0; -+ do { -+ argv[argc++] = ptr; -+ if (argc > 2) -+ break; -+ if ((len = len - (ssize_t)(ptr - &buf[0])) < 0) -+ break; -+ } while ((ptr = memchr(ptr, '\0', len)) && *(++ptr)); -+ -+ if (argc != 3) -+ goto out; -+ -+# if defined(USE_RPMLIB) && (USE_RPMLIB > 0) -+ rpmReadConfigFiles(NULL, NULL); -+ rpmFreeRpmrc(); -+ -+ if ((shell = rpmExpand("%_buildshell", NULL)) == NULL) -+ shell = xstrdup("/bin/sh"); -+ -+ if (strncmp(argv[0], shell, strlen(shell)) != 0) { -+ free(shell); -+ goto out; -+ } -+ free(shell); -+ -+ if ((tmppath = rpmExpand("%_tmppath", NULL)) == NULL) -+ tmppath = xstrdup("/var/tmp"); -+ -+ if (strncmp(argv[1], tmppath, strlen(tmppath)) != 0) { -+ free(tmppath); -+ goto out; -+ } -+ -+ len = strlen(tmppath); -+ free(tmppath); -+ -+ ptr = argv[1]; -+ if (strncmp(ptr + len, "/rpm-tmp.", 9) != 0) -+ goto out; -+# else -+ if ((strcmp(argv[0], "/bin/sh") != 0) && -+ (strcmp(argv[0], "/bin/bash") != 0)) -+ goto out; -+ -+ if ((strncmp(argv[1], "/var/tmp/rpm-tmp.", 17) != 0) && -+ (strncmp(argv[1], "/usr/tmp/rpm-tmp.", 17) != 0) && -+ (strncmp(argv[1], "/tmp/rpm-tmp.", 13) != 0)) -+ goto out; -+# endif -+ if ((argc = atoi(argv[2])) >= 0 && argc <= 2) -+ ret = true; -+out: -+ if (fd >= 0) -+ close(fd); -+ -+ return ret; -+} -+#endif /* SUSE */ -+ - static struct option long_options[] = - { - {"verbose", 0, (int*)0, 'v'}, -@@ -2127,6 +2221,11 @@ int main (int argc, char *argv[]) - printf("Overwrite argument for %s is %s\n", argv[c], argr[c]); - #endif /* DEBUG */ - -+#ifdef SUSE -+ if (underrpm()) -+ ignore = true; -+#endif /* SUSE */ -+ - /* - * Scan and set our configuration for virtual services. - */ -@@ -2144,7 +2243,7 @@ int main (int argc, char *argv[]) - #if 0 - if (!defaults) - #endif -- scan_script_locations(path, override_path, (del ? argv : (char**)0), argc); -+ scan_script_locations(path, override_path, (del ? argv : (char**)0), argc, ignore); - - if ((initdir = opendir(path)) == (DIR*)0) - error("can not opendir(%s): %s\n", path, strerror(errno)); -@@ -2231,7 +2330,7 @@ int main (int argc, char *argv[]) - } - - /* main scanner for LSB comment in current script */ -- lsb = scan_script_defaults(d->d_name, override_path); -+ lsb = scan_script_defaults(d->d_name, override_path, ignore); - - if ((lsb & FOUND_LSB_HEADER) == 0) { - if ((lsb & (FOUND_LSB_DEFAULT | FOUND_LSB_OVERRIDE)) == 0) -@@ -2443,7 +2542,7 @@ int main (int argc, char *argv[]) - ok = chkdependencies(token); - else - ok = chkrequired(token); -- if (!ok) -+ if (!ok && !ignore) - error("exiting now!\n"); - } - ---- listing.h -+++ listing.h 2008-02-01 11:40:45.347748000 +0100 -@@ -97,11 +97,11 @@ extern int makeprov(const char *__restri - extern void setorder(const char *__restrict script, const int order, boolean recursive) __attribute__((nonnull(1))); - extern int getorder(const char *__restrict script) __attribute__((nonnull(1))); - extern boolean notincluded(const char *__restrict script, const int runlevel) __attribute__((nonnull(1))); --extern boolean foreach(const char **__restrict script, int *__restrict order, const int runlevel) __attribute__((nonnull(1,2))); --extern void virtprov(const char *__restrict virt, const char *__restrict real) __attribute__((nonnull(1,2))); -+extern boolean foreach(const char **__restrict script, int *__restrict order, const int runlevel) __attribute__((nonnull(2))); -+extern void virtprov(const char *__restrict virt, const char *__restrict real) __attribute__((nonnull(1))); - extern const char * getscript(const char *__restrict prov) __attribute__((nonnull(1))); - extern const char * getprovides(const char *__restrict script) __attribute__((nonnull(1))); --extern boolean listscripts(const char **__restrict script, const int lvl) __attribute__((nonnull(1))); -+extern boolean listscripts(const char **__restrict script, const int lvl); - extern int maxorder; - extern boolean is_loop_detected(void); - -@@ -116,7 +116,7 @@ extern int map_has_runlevels(void); - extern int map_runlevel_to_lvl (const int runlevel); - extern int map_key_to_lvl(const char key); - --static inline char * xstrdup(const char *__restrict s) __attribute__((always_inline,nonnull(1))); -+static inline char * xstrdup(const char *__restrict s) __attribute__((always_inline)); - static inline char * xstrdup(const char * s) - { - char * r; ++++ insserv.c 2008-07-31 18:08:21.737684067 +0200 +@@ -290,6 +290,8 @@ static void rememberreq(service_t * rest + requires(here, need, type); + break; + case '$': ++ if (strcasecmp(token, "$null") == 0) ++ break; + if (strcasecmp(token, "$all") == 0) { + serv->attr.flags |= SERV_ALL; + break; +@@ -2357,7 +2359,19 @@ int main (int argc, char *argv[]) + + if (strcmp(path, INITDIR) != 0) { + char * tmp; +- root = xstrdup(path); ++ if (*path != '/') { ++ char * pwd = getcwd((char*)0, 0); ++ size_t len = strlen(pwd)+1+strlen(path); ++ root = (char*)malloc(len); ++ if (!root) ++ error("%s", strerror(errno)); ++ strcpy(root, pwd); ++ if (pwd[1]) ++ strcat(root, "/"); ++ strcat(root, path); ++ free(pwd); ++ } else ++ root = xstrdup(path); + if ((tmp = strstr(root, INITDIR))) { + *tmp = '\0'; + } else { ++++++ insserv-1.11.0.tar.bz2 -> insserv-1.12.0.tar.bz2 ++++++ ++++ 6539 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-libs
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package xorg-x11-libs checked in at Sat Aug 2 00:33:57 CEST 2008. -------- --- xorg-x11-libs/xorg-x11-libs.changes 2008-07-18 17:12:29.000000000 +0200 +++ xorg-x11-libs/xorg-x11-libs.changes 2008-08-01 12:38:17.194851265 +0200 @@ -1,0 +2,6 @@ +Fri Aug 1 12:37:37 CEST 2008 - sndirsch(a)suse.de + +- xcb-util 0.2.1 + * bug fixes + +------------------------------------------------------------------- Old: ---- xcb-util-0.2.tar.bz2 New: ---- xcb-util-0.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.tI9105/_old 2008-08-02 00:33:27.000000000 +0200 +++ /var/tmp/diff_new_pack.tI9105/_new 2008-08-02 00:33:27.000000000 +0200 @@ -20,7 +20,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 72 +Release: 78 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -56,7 +56,7 @@ Source28: libXft1-X11R6.9-1.2.tar.bz2 Source29: libvnc-20070501.tar.bz2 Source30: libXcliplist-20070501.tar.bz2 -Source31: xcb-util-0.2.tar.bz2 +Source31: xcb-util-0.2.1.tar.bz2 Source32: pixman-0.11.8.tar.bz2 Source33: libpciaccess-0.10.3.tar.bz2 Patch: libXrandr.diff @@ -220,6 +220,9 @@ %{_mandir}/man3/* %changelog +* Fri Aug 01 2008 sndirsch(a)suse.de +- xcb-util 0.2.1 + * bug fixes * Fri Jul 18 2008 sndirsch(a)suse.de - pixman 0.11.8 - obsoletes pixman-bfo16310.diff ++++++ xcb-util-0.2.tar.bz2 -> xcb-util-0.2.1.tar.bz2 ++++++ ++++ 20132 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-driver-input
by root＠Hilbert.suse.de 01 Aug '08

01 Aug '08

Hello community, here is the log from the commit of package xorg-x11-driver-input checked in at Sat Aug 2 00:32:25 CEST 2008. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2008-07-03 21:30:21.000000000 +0200 +++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2008-07-30 18:29:29.579746298 +0200 @@ -1,0 +2,7 @@ +Wed Jul 30 18:28:01 CEST 2008 - sndirsch(a)suse.de + +- xf86-input-vmmouse.diff + * make sure to call conversion_proc from within the driver, as + Xserver no longer does + +------------------------------------------------------------------- New: ---- xf86-input-vmmouse.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.jk4580/_old 2008-08-02 00:30:31.000000000 +0200 +++ /var/tmp/diff_new_pack.jk4580/_new 2008-08-02 00:30:31.000000000 +0200 @@ -16,7 +16,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 96 +Release: 110 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -61,6 +61,7 @@ Patch11: xf86-input-evdev-max_fixes.diff Patch12: zap_warning_kbd.diff Patch13: xf86-input-fpit-commmit-95676d8.diff +Patch14: xf86-input-vmmouse.diff %description This package contains X.Org input drivers. @@ -93,6 +94,9 @@ pushd xf86-input-fpit-* %patch13 -p1 popd +pushd xf86-input-vmmouse-* +%patch14 -p0 +popd %build %ifarch %ix86 x86_64 @@ -102,7 +106,8 @@ %endif pushd $dir case $dir in - xf86-input-joystick-*) autoreconf -fi ;; + xf86-input-joystick-* | \ + xf86-input-vmmouse-*) autoreconf -fi ;; *) ;; esac ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -133,6 +138,10 @@ %{_mandir}/man4/* %changelog +* Wed Jul 30 2008 sndirsch(a)suse.de +- xf86-input-vmmouse.diff + * make sure to call conversion_proc from within the driver, as + Xserver no longer does * Thu Jul 03 2008 sndirsch(a)suse.de - updated xf86-input-magictouch to git commit 7f90f6a; required for xorg-server 1.5 ++++++ xf86-input-vmmouse.diff ++++++ --- configure.ac.orig 2008-07-30 18:22:47.777948399 +0200 +++ configure.ac 2008-07-30 18:23:23.091511252 +0200 @@ -82,7 +82,7 @@ [AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1, [Has version 1.1.0 or greater of the Xserver])]) -PKG_CHECK_EXISTS([xorg-server >= 1.3.99.0 xorg-server <= 1.4.0.90], +PKG_CHECK_EXISTS([xorg-server >= 1.3.99.0], [AC_DEFINE([CALL_CONVERSION_PROC], 1, [Call conversion_proc from within the driver, as Xserver doesn't])]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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