head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.42 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.40 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.38 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.36 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.34 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.32 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.30 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.28 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.26 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.24 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.22 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.20 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.18 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.16 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.14 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.4 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.2; locks; strict; comment @# @; 1.2 date 2005.03.23.22.11.57; author markd; state dead; branches; next 1.1; 1.1 date 2005.02.20.11.31.11; author markd; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2005.02.20.11.31.11; author snj; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2005.02.20.18.45.05; author snj; state Exp; branches; next ; desc @@ 1.2 log @Update to KDE 3.4 Highlights at a glance * Text-to-speech system with support built into Konqueror, Kate, KPDF and the standalone application KSayIt * Support for text to speech synthesis is integrated with the desktop * Completely redesigned, more flexible trash system * Kicker with improved look and feel * KPDF now enables you to select, copy & paste text and images from PDFs, along with many other improvements * Kontact supports now various groupware servers, including eGroupware, GroupWise, Kolab, OpenGroupware.org and SLOX * Kopete supports Novell Groupwise and Lotus Sametime and gets integrated into Kontact * DBUS/HAL support allows to keep dynamic device icons in media:/ and on the desktop in sync with the state of all devices * KHTML has improved standard support and now close to full support for CSS 2.1 and the CSS 3 Selectors module * Better synchronization between 2 PCs * A new high contrast style and a complete monochrome icon set * An icon effect to paint all icons in two chosen colors, converting third party application icons into high contrast monochrome icons * Akregator allows you to read news from your favourite RSS-enabled websites in one application * Juk has now an album cover management via Google Image Search * KMail now stores passwords securely with KWallet * SVG files can now be used as wallpapers * KHTML plug-ins are now configurable, so the user can selectively disable ones that are not used. This does not include Netscape-style plug-ins. Netscape plug-in in CPU usage can be manually lowered, and plug-ins are more stable. * more than 6,500 bugs have been fixed * more than 1,700 wishes have been fullfilled * more than 80,000 contributions with several million lines of code and documentation added or changed @ text @$NetBSD: patch-ai,v 1.1 2005/02/20 11:31:11 markd Exp $ --- kstars/kstars/indi/fitsrw.c.orig 2004-06-25 21:10:04.000000000 +1200 +++ kstars/kstars/indi/fitsrw.c @@@@ -155,31 +155,31 @@@@ int fits_ieee64_motorola = 0; #define FITS_WRITE_BOOLCARD(fp,key,value) \ {char card[81]; \ - sprintf (card, "%-8.8s= %20s%50s", key, value ? "T" : "F", " "); \ + snprintf (card, sizeof( card ), "%-8.8s= %20s%50s", key, value ? "T" : "F", " "); \ fwrite (card, 1, 80, fp); } #define FITS_WRITE_LONGCARD(fp,key,value) \ {char card[81]; \ - sprintf (card, "%-8.8s= %20ld%50s", key, (long)value, " "); \ + snprintf (card, sizeof( card ), "%-8.8s= %20ld%50s", key, (long)value, " "); \ fwrite (card, 1, 80, fp); } #define FITS_WRITE_DOUBLECARD(fp,key,value) \ {char card[81], dbl[21], *istr; \ - sprintf (dbl, "%20f", (double)value); istr = strstr (dbl, "e"); \ + snprintf (dbl, sizeof( dbl ), "%20f", (double)value); istr = strstr (dbl, "e"); \ if (istr) *istr = 'E'; \ - sprintf (card, "%-8.8s= %20.20s%50s", key, dbl, " "); \ + snprintf (card, sizeof( card ), "%-8.8s= %20.20s%50s", key, dbl, " "); \ fwrite (card, 1, 80, fp); } #define FITS_WRITE_STRINGCARD(fp,key,value) \ {char card[81]; int k;\ - sprintf (card, "%-8.8s= \'%s", key, value); \ + snprintf (card, sizeof( card ), "%-8.8s= \'%s", key, value); \ for (k = strlen (card); k < 81; k++) card[k] = ' '; \ k = strlen (key); if (k < 8) card[19] = '\''; else card[11+k] = '\''; \ fwrite (card, 1, 80, fp); } #define FITS_WRITE_CARD(fp,value) \ {char card[81]; \ - sprintf (card, "%-80.80s", value); \ + snprintf (card, sizeof( card ), "%-80.80s", value); \ fwrite (card, 1, 80, fp); } @@@@ -474,7 +474,8 @@@@ static void fits_drop_error (void) /* #END-PAR */ /*****************************************************************************/ -FITS_FILE *fits_open (const char *filename, const char *openmode) + +FITS_FILE *fits_open (const char* filename, const char *openmode) {int reading, writing, n_rec, n_hdr; long fpos_header, fpos_data; @@@@ -483,8 +484,10 @@@@ FITS_FILE *fits_open (const char *filena FITS_RECORD_LIST *hdrlist; FITS_HDU_LIST *hdulist, *last_hdulist; - /* initialize */ + if ((filename == NULL) || (*filename == '\0') || (openmode == NULL)) + FITS_RETURN ("fits_open: Invalid parameters", NULL); + /* initialize */ hdulist = NULL; last_hdulist = NULL; @@@@ -506,9 +509,6 @@@@ FITS_FILE *fits_open (const char *filena } } - if ((filename == NULL) || (*filename == '\0') || (openmode == NULL)) - FITS_RETURN ("fits_open: Invalid parameters", NULL); - reading = (strcmp (openmode, "r") == 0); writing = (strcmp (openmode, "w") == 0); if ((!reading) && (!writing)) @@@@ -858,7 +858,7 @@@@ int fits_write_header (FITS_FILE *ff, FI for (r = 0; r < hdulist->naxis; r++) {char naxisn[10]; - sprintf (naxisn, "NAXIS%d", r+1); + snprintf (naxisn, sizeof( naxisn ), "NAXIS%d", r+1); FITS_WRITE_LONGCARD (ff->fp, naxisn, hdulist->naxisn[r]); numcards++; } @@@@ -1025,7 +1025,7 @@@@ static FITS_HDU_LIST *fits_decode_header for (k = 1; k <= FITS_MAX_AXIS; k++) {char naxisn[9]; - sprintf (naxisn, "NAXIS%-3d", k); + snprintf (naxisn, sizeof( naxisn ), "NAXIS%-3d", k); fdat = fits_decode_card (fits_search_card (hdr, naxisn), typ_flong); if (fdat == NULL) { @@@@ -1121,7 +1121,7 @@@@ static FITS_HDU_LIST *fits_decode_header } else {char msg[160]; - sprintf (msg, "fits_decode_header: IEEE floating point format required for\ + snprintf (msg, sizeof( msg ), "fits_decode_header: IEEE floating point format required for\ BITPIX=%d\nis not supported on this machine", hdulist->bitpix); fits_set_error (msg); } @@@@ -1130,7 +1130,7 @@@@ static FITS_HDU_LIST *fits_decode_header return (hdulist); err_missing: - sprintf (errmsg, "fits_decode_header: missing/invalid %s card", key); + snprintf (errmsg, sizeof(errmsg), "fits_decode_header: missing/invalid %.50s card", key); err_return: fits_delete_hdulist (hdulist); @@@@ -1429,7 +1429,7 @@@@ FITS_DATA *fits_decode_card (const char if (strncmp (card+8, "= ", 2) != 0) { - sprintf (msg, "fits_decode_card (warning): Missing value indicator\ + snprintf (msg, sizeof( msg ), "fits_decode_card (warning): Missing value indicator\ '= ' for %8.8s", l_card); fits_set_error (msg); } @ 1.1 log @Fix for http://www.kde.org/info/security/advisory-20050215-1.txt. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ai was added on branch pkgsrc-2004Q4 on 2005-02-20 11:31:11 +0000 @ text @d1 119 @ 1.1.2.2 log @Pullup ticket 299 - requested by Mark Davies security fix for kdeedu3 Revisions pulled up: - pkgsrc/misc/kdeedu3/Makefile 1.29 - pkgsrc/misc/kdeedu3/distinfo 1.22 - pkgsrc/misc/kdeedu3/patches/patch-ac 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ad 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ae 1.1 - pkgsrc/misc/kdeedu3/patches/patch-af 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ag 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ah 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ai 1.1 - pkgsrc/misc/kdeedu3/patches/patch-aj 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ak 1.1 - pkgsrc/misc/kdeedu3/patches/patch-al 1.1 - pkgsrc/misc/kdeedu3/patches/patch-am 1.1 - pkgsrc/misc/kdeedu3/patches/patch-an 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ao 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ap 1.1 - pkgsrc/misc/kdeedu3/patches/patch-aq 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ar 1.1 - pkgsrc/misc/kdeedu3/patches/patch-as 1.1 - pkgsrc/misc/kdeedu3/patches/patch-at 1.1 - pkgsrc/misc/kdeedu3/patches/patch-au 1.1 - pkgsrc/misc/kdeedu3/patches/patch-av 1.1 - pkgsrc/misc/kdeedu3/patches/patch-aw 1.1 - pkgsrc/misc/kdeedu3/patches/patch-ax 1.1 Module Name: pkgsrc Committed By: markd Date: Sun Feb 20 11:31:11 UTC 2005 Modified Files: pkgsrc/misc/kdeedu3: Makefile distinfo Added Files: pkgsrc/misc/kdeedu3/patches: patch-ac patch-ad patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak patch-al patch-am patch-an patch-ao patch-ap patch-aq patch-ar patch-as patch-at patch-au patch-av patch-aw patch-ax Log Message: Fix for http://www.kde.org/info/security/advisory-20050215-1.txt. Bump PKGREVISION. @ text @a0 119 $NetBSD: patch-ai,v 1.1.2.1 2005/02/20 18:45:05 snj Exp $ --- kstars/kstars/indi/fitsrw.c.orig 2004-06-25 21:10:04.000000000 +1200 +++ kstars/kstars/indi/fitsrw.c @@@@ -155,31 +155,31 @@@@ int fits_ieee64_motorola = 0; #define FITS_WRITE_BOOLCARD(fp,key,value) \ {char card[81]; \ - sprintf (card, "%-8.8s= %20s%50s", key, value ? "T" : "F", " "); \ + snprintf (card, sizeof( card ), "%-8.8s= %20s%50s", key, value ? "T" : "F", " "); \ fwrite (card, 1, 80, fp); } #define FITS_WRITE_LONGCARD(fp,key,value) \ {char card[81]; \ - sprintf (card, "%-8.8s= %20ld%50s", key, (long)value, " "); \ + snprintf (card, sizeof( card ), "%-8.8s= %20ld%50s", key, (long)value, " "); \ fwrite (card, 1, 80, fp); } #define FITS_WRITE_DOUBLECARD(fp,key,value) \ {char card[81], dbl[21], *istr; \ - sprintf (dbl, "%20f", (double)value); istr = strstr (dbl, "e"); \ + snprintf (dbl, sizeof( dbl ), "%20f", (double)value); istr = strstr (dbl, "e"); \ if (istr) *istr = 'E'; \ - sprintf (card, "%-8.8s= %20.20s%50s", key, dbl, " "); \ + snprintf (card, sizeof( card ), "%-8.8s= %20.20s%50s", key, dbl, " "); \ fwrite (card, 1, 80, fp); } #define FITS_WRITE_STRINGCARD(fp,key,value) \ {char card[81]; int k;\ - sprintf (card, "%-8.8s= \'%s", key, value); \ + snprintf (card, sizeof( card ), "%-8.8s= \'%s", key, value); \ for (k = strlen (card); k < 81; k++) card[k] = ' '; \ k = strlen (key); if (k < 8) card[19] = '\''; else card[11+k] = '\''; \ fwrite (card, 1, 80, fp); } #define FITS_WRITE_CARD(fp,value) \ {char card[81]; \ - sprintf (card, "%-80.80s", value); \ + snprintf (card, sizeof( card ), "%-80.80s", value); \ fwrite (card, 1, 80, fp); } @@@@ -474,7 +474,8 @@@@ static void fits_drop_error (void) /* #END-PAR */ /*****************************************************************************/ -FITS_FILE *fits_open (const char *filename, const char *openmode) + +FITS_FILE *fits_open (const char* filename, const char *openmode) {int reading, writing, n_rec, n_hdr; long fpos_header, fpos_data; @@@@ -483,8 +484,10 @@@@ FITS_FILE *fits_open (const char *filena FITS_RECORD_LIST *hdrlist; FITS_HDU_LIST *hdulist, *last_hdulist; - /* initialize */ + if ((filename == NULL) || (*filename == '\0') || (openmode == NULL)) + FITS_RETURN ("fits_open: Invalid parameters", NULL); + /* initialize */ hdulist = NULL; last_hdulist = NULL; @@@@ -506,9 +509,6 @@@@ FITS_FILE *fits_open (const char *filena } } - if ((filename == NULL) || (*filename == '\0') || (openmode == NULL)) - FITS_RETURN ("fits_open: Invalid parameters", NULL); - reading = (strcmp (openmode, "r") == 0); writing = (strcmp (openmode, "w") == 0); if ((!reading) && (!writing)) @@@@ -858,7 +858,7 @@@@ int fits_write_header (FITS_FILE *ff, FI for (r = 0; r < hdulist->naxis; r++) {char naxisn[10]; - sprintf (naxisn, "NAXIS%d", r+1); + snprintf (naxisn, sizeof( naxisn ), "NAXIS%d", r+1); FITS_WRITE_LONGCARD (ff->fp, naxisn, hdulist->naxisn[r]); numcards++; } @@@@ -1025,7 +1025,7 @@@@ static FITS_HDU_LIST *fits_decode_header for (k = 1; k <= FITS_MAX_AXIS; k++) {char naxisn[9]; - sprintf (naxisn, "NAXIS%-3d", k); + snprintf (naxisn, sizeof( naxisn ), "NAXIS%-3d", k); fdat = fits_decode_card (fits_search_card (hdr, naxisn), typ_flong); if (fdat == NULL) { @@@@ -1121,7 +1121,7 @@@@ static FITS_HDU_LIST *fits_decode_header } else {char msg[160]; - sprintf (msg, "fits_decode_header: IEEE floating point format required for\ + snprintf (msg, sizeof( msg ), "fits_decode_header: IEEE floating point format required for\ BITPIX=%d\nis not supported on this machine", hdulist->bitpix); fits_set_error (msg); } @@@@ -1130,7 +1130,7 @@@@ static FITS_HDU_LIST *fits_decode_header return (hdulist); err_missing: - sprintf (errmsg, "fits_decode_header: missing/invalid %s card", key); + snprintf (errmsg, sizeof(errmsg), "fits_decode_header: missing/invalid %.50s card", key); err_return: fits_delete_hdulist (hdulist); @@@@ -1429,7 +1429,7 @@@@ FITS_DATA *fits_decode_card (const char if (strncmp (card+8, "= ", 2) != 0) { - sprintf (msg, "fits_decode_card (warning): Missing value indicator\ + snprintf (msg, sizeof( msg ), "fits_decode_card (warning): Missing value indicator\ '= ' for %8.8s", l_card); fits_set_error (msg); } @