From svn at tinysofa.org Wed Dec 1 14:41:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 1 Dec 2004 09:41:34 -0500 (EST) Subject: [tinysofa-svn] r5156 - in tinysofa/releases/1.1/sash/current: sources specs Message-ID: <20041201144134.925F734411C@minbar.tinysofa.org> Author: jh Date: 2004-12-01 09:41:33 -0500 (Wed, 01 Dec 2004) New Revision: 5156 Added: tinysofa/releases/1.1/sash/current/sources/sash-3.6-scriptarg.patch tinysofa/releases/1.1/sash/current/sources/sash-3.7-segfault.patch tinysofa/releases/1.1/sash/current/sources/sash-3.7.tar.gz tinysofa/releases/1.1/sash/current/sources/sash-pwdfunc.patch Removed: tinysofa/releases/1.1/sash/current/sources/sash-3.6.tar.gz Modified: tinysofa/releases/1.1/sash/current/sources/sash-3.6-misc.patch tinysofa/releases/1.1/sash/current/specs/sash.spec Log: - new upstream Modified: tinysofa/releases/1.1/sash/current/sources/sash-3.6-misc.patch =================================================================== --- tinysofa/releases/1.1/sash/current/sources/sash-3.6-misc.patch 2004-11-30 16:44:33 UTC (rev 5155) +++ tinysofa/releases/1.1/sash/current/sources/sash-3.6-misc.patch 2004-12-01 14:41:33 UTC (rev 5156) @@ -1,21 +1,11 @@ -diff -Nru sash-3.6.orig/Makefile sash-3.6/Makefile ---- sash-3.6.orig/Makefile 2002-07-21 23:24:47.000000000 +0000 -+++ sash-3.6/Makefile 2003-12-08 16:09:50.000000000 +0000 +--- sash-3.6/Makefile.orig 2003-09-01 12:29:56.000000000 +0200 ++++ sash-3.6/Makefile 2003-09-01 12:30:23.000000000 +0200 @@ -14,7 +14,7 @@ MOUNT_TYPE = '"ext3"' -CFLAGS = -O3 -Wall -Wmissing-prototypes \ -+CFLAGS = $(RPM_OPT_FLAGS) -Wmissing-prototypes \ ++CFLAGS = $(RPM_OPT_FLAGS) -Wall -Wmissing-prototypes \ -DHAVE_GZIP=$(HAVE_GZIP) \ -DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \ -DHAVE_LINUX_MOUNT=$(HAVE_LINUX_MOUNT) \ -@@ -26,7 +26,7 @@ - - - BINDIR = /bin --MANDIR = /usr/man/man1 -+MANDIR = /usr/share/man/man1 - - - OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o cmd_grep.o cmd_ls.o cmd_tar.o \ Added: tinysofa/releases/1.1/sash/current/sources/sash-3.6-scriptarg.patch =================================================================== --- tinysofa/releases/1.1/sash/current/sources/sash-3.6-scriptarg.patch 2004-11-30 16:44:33 UTC (rev 5155) +++ tinysofa/releases/1.1/sash/current/sources/sash-3.6-scriptarg.patch 2004-12-01 14:41:33 UTC (rev 5156) @@ -0,0 +1,60 @@ +--- sash-3.6/sash.c.orig 2002-07-22 00:55:28.000000000 +0200 ++++ sash-3.6/sash.c 2003-09-01 12:41:51.000000000 +0200 +@@ -481,6 +481,24 @@ + } + } + ++ /* A single argument is allowed, and it must be a filename which ++ provides stdin. This allows #! usage. */ ++ if (argc) { ++ int fd; ++ ++ fd = open(argv[0], O_RDONLY); ++ if (fd < 0) { ++ fprintf(stderr, "Error opening %s: %s\n", argv[0], ++ strerror(errno)); ++ return 1; ++ } ++ ++ dup2(fd, 0); ++ close(fd); ++ ++ argc--, argv++; ++ } ++ + /* + * No more arguments are allowed. + */ +@@ -1271,7 +1289,7 @@ + fprintf(stderr, "Stand-alone shell (version %s)\n", version); + fprintf(stderr, "\n"); + fprintf(stderr, "Usage: sash [-a] [-q] [-f fileName] [-c command] [-p prompt]\n"); +- ++ fprintf(stderr, "Usage: sash [-a] [-q] [-f fileName] [-c command] [-p prompt] [script]\n"); + exit(1); + } + +--- sash-3.6/sash.1.orig 2002-07-22 01:16:40.000000000 +0200 ++++ sash-3.6/sash.1 2003-09-01 12:43:04.000000000 +0200 +@@ -2,7 +2,7 @@ + .SH NAME + sash \- stand-alone shell with built-in commands + .SH SYNOPSYS +-.B sash [-c command] [-f fileName ] [-p prompt] [-q] [-a] ++.B sash [-c command] [-f fileName ] [-p prompt] [-q] [-a] [script] + .SH DESCRIPTION + The + .B sash +@@ -496,6 +496,12 @@ + The -a option creates aliases for the built-in commands so + that they replace the corresponding standard commands. + This is the same result as if the 'aliasall' command was used. ++ ++A file name may be provided as the last argument to sash, in which case ++sash's standard input is read from that file. This allows #! scripts ++to use sash as their script interpretor. Be aware that sash does not provide ++most normal bourne-shell programming features, however. ++ + .SH SYSTEM RECOVERY + This section contains some useful information about using + .B sash Deleted: tinysofa/releases/1.1/sash/current/sources/sash-3.6.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/sash/current/sources/sash-3.7-segfault.patch =================================================================== --- tinysofa/releases/1.1/sash/current/sources/sash-3.7-segfault.patch 2004-11-30 16:44:33 UTC (rev 5155) +++ tinysofa/releases/1.1/sash/current/sources/sash-3.7-segfault.patch 2004-12-01 14:41:33 UTC (rev 5156) @@ -0,0 +1,21 @@ +--- sash-3.4/utils.c.segf 2004-03-26 21:32:26.000000000 +0100 ++++ sash-3.4/utils.c 2004-03-26 21:32:34.000000000 +0100 +@@ -588,8 +588,7 @@ + if (*text == ch) + found = TRUE; + } +- +- if (!found) ++ if (!found && retryPat != NULL) + { + pattern = retryPat; + text = ++retryText; +@@ -598,7 +597,7 @@ + /* fall into next case */ + + case '?': +- if (*text++ == '\0') ++ if (*text && *text++ == '\0') + return FALSE; + + break; Added: tinysofa/releases/1.1/sash/current/sources/sash-3.7.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/sash/current/sources/sash-3.7.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.1/sash/current/sources/sash-pwdfunc.patch =================================================================== --- tinysofa/releases/1.1/sash/current/sources/sash-pwdfunc.patch 2004-11-30 16:44:33 UTC (rev 5155) +++ tinysofa/releases/1.1/sash/current/sources/sash-pwdfunc.patch 2004-12-01 14:41:33 UTC (rev 5156) @@ -0,0 +1,603 @@ +--- sash-3.4/__getgrent.c.pwd 2004-03-26 16:59:55.000000000 +0100 ++++ sash-3.4/__getgrent.c 2004-03-26 17:34:45.000000000 +0100 +@@ -0,0 +1,202 @@ ++/* ++ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS, ++ * Copyright (C) 1995, 1996 Nat Friedman . ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include ++#include ++#include ++ ++#include "grp_.h" ++ ++/* ++ * Define GR_SCALE_DYNAMIC if you want grp to dynamically scale its read buffer ++ * so that lines of any length can be used. On very very small systems, ++ * you may want to leave this undefined becasue it will make the grp functions ++ * somewhat larger (because of the inclusion of malloc and the code necessary). ++ * On larger systems, you will want to define this, because grp will _not_ ++ * deal with long lines gracefully (they will be skipped). ++ */ ++#undef GR_SCALE_DYNAMIC ++ ++#ifndef GR_SCALE_DYNAMIC ++/* ++ * If scaling is not dynamic, the buffers will be statically allocated, and ++ * maximums must be chosen. GR_MAX_LINE_LEN is the maximum number of ++ * characters per line in the group file. GR_MAX_MEMBERS is the maximum ++ * number of members of any given group. ++ */ ++#define GR_MAX_LINE_LEN 128 ++/* GR_MAX_MEMBERS = (GR_MAX_LINE_LEN-(24+3+6))/9 */ ++#define GR_MAX_MEMBERS 11 ++ ++#endif /* !GR_SCALE_DYNAMIC */ ++ ++ ++/* ++ * Define GR_DYNAMIC_GROUP_LIST to make initgroups() dynamically allocate ++ * space for it's GID array before calling setgroups(). This is probably ++ * unnecessary scalage, so it's undefined by default. ++ */ ++#undef GR_DYNAMIC_GROUP_LIST ++ ++#ifndef GR_DYNAMIC_GROUP_LIST ++/* ++ * GR_MAX_GROUPS is the size of the static array initgroups() uses for ++ * its static GID array if GR_DYNAMIC_GROUP_LIST isn't defined. ++ */ ++#define GR_MAX_GROUPS 64 ++ ++#endif /* !GR_DYNAMIC_GROUP_LIST */ ++ ++ ++/* ++ * This is the core group-file read function. It behaves exactly like ++ * getgrent() except that it is passed a file descriptor. getgrent() ++ * is just a wrapper for this function. ++ */ ++struct group *bb_getgrent(int grp_fd) ++{ ++#ifndef GR_SCALE_DYNAMIC ++ static char line_buff[GR_MAX_LINE_LEN]; ++ static char *members[GR_MAX_MEMBERS]; ++#else ++ static char *line_buff = NULL; ++ static char **members = NULL; ++ short line_index; ++ short buff_size; ++#endif ++ static struct group group; ++ register char *ptr; ++ char *field_begin; ++ short member_num; ++ char *endptr; ++ int line_len; ++ ++ ++ /* We use the restart label to handle malformatted lines */ ++ restart: ++#ifdef GR_SCALE_DYNAMIC ++ line_index = 0; ++ buff_size = 256; ++#endif ++ ++#ifndef GR_SCALE_DYNAMIC ++ /* Read the line into the static buffer */ ++ if ((line_len = read(grp_fd, line_buff, GR_MAX_LINE_LEN)) <= 0) ++ return NULL; ++ field_begin = strchr(line_buff, '\n'); ++ if (field_begin != NULL) ++ lseek(grp_fd, (long) (1 + field_begin - (line_buff + line_len)), ++ SEEK_CUR); ++ else { /* The line is too long - skip it :-\ */ ++ ++ do { ++ if ((line_len = read(grp_fd, line_buff, GR_MAX_LINE_LEN)) <= 0) ++ return NULL; ++ } while (!(field_begin = strchr(line_buff, '\n'))); ++ lseek(grp_fd, (long) ((field_begin - line_buff) - line_len + 1), ++ SEEK_CUR); ++ goto restart; ++ } ++ if (*line_buff == '#' || *line_buff == ' ' || *line_buff == '\n' || ++ *line_buff == '\t') ++ goto restart; ++ *field_begin = '\0'; ++ ++#else /* !GR_SCALE_DYNAMIC */ ++ line_buff = realloc(line_buff, buff_size); ++ while (1) { ++ if ((line_len = read(grp_fd, line_buff + line_index, ++ buff_size - line_index)) <= 0) ++ return NULL; ++ field_begin = strchr(line_buff, '\n'); ++ if (field_begin != NULL) { ++ lseek(grp_fd, ++ (long) (1 + field_begin - ++ (line_len + line_index + line_buff)), SEEK_CUR); ++ *field_begin = '\0'; ++ if (*line_buff == '#' || *line_buff == ' ' ++ || *line_buff == '\n' || *line_buff == '\t') ++ goto restart; ++ break; ++ } else { /* Allocate some more space */ ++ ++ line_index = buff_size; ++ buff_size += 256; ++ line_buff = realloc(line_buff, buff_size); ++ } ++ } ++#endif /* GR_SCALE_DYNAMIC */ ++ ++ /* Now parse the line */ ++ group.gr_name = line_buff; ++ ptr = strchr(line_buff, ':'); ++ if (ptr == NULL) ++ goto restart; ++ *ptr++ = '\0'; ++ ++ group.gr_passwd = ptr; ++ ptr = strchr(ptr, ':'); ++ if (ptr == NULL) ++ goto restart; ++ *ptr++ = '\0'; ++ ++ field_begin = ptr; ++ ptr = strchr(ptr, ':'); ++ if (ptr == NULL) ++ goto restart; ++ *ptr++ = '\0'; ++ ++ group.gr_gid = (gid_t) strtoul(field_begin, &endptr, 10); ++ if (*endptr != '\0') ++ goto restart; ++ ++ member_num = 0; ++ field_begin = ptr; ++ ++#ifndef GR_SCALE_DYNAMIC ++ while ((ptr = strchr(ptr, ',')) != NULL) { ++ *ptr = '\0'; ++ ptr++; ++ members[member_num] = field_begin; ++ field_begin = ptr; ++ member_num++; ++ } ++ if (*field_begin == '\0') ++ members[member_num] = NULL; ++ else { ++ members[member_num] = field_begin; ++ members[member_num + 1] = NULL; ++ } ++#else /* !GR_SCALE_DYNAMIC */ ++ free(members); ++ members = (char **) malloc((member_num + 1) * sizeof(char *)); ++ for ( ; field_begin && *field_begin != '\0'; field_begin = ptr) { ++ if ((ptr = strchr(field_begin, ',')) != NULL) ++ *ptr++ = '\0'; ++ members[member_num++] = field_begin; ++ members = (char **) realloc(members, ++ (member_num + 1) * sizeof(char *)); ++ } ++ members[member_num] = NULL; ++#endif /* GR_SCALE_DYNAMIC */ ++ ++ group.gr_mem = members; ++ return &group; ++} +--- sash-3.4/__getpwent.c.pwd 2004-03-26 16:59:55.000000000 +0100 ++++ sash-3.4/__getpwent.c 2004-03-26 16:59:55.000000000 +0100 +@@ -0,0 +1,114 @@ ++/* ++ * __getpwent.c - This file is part of the libc-8086/pwd package for ELKS, ++ * Copyright (C) 1995, 1996 Nat Friedman . ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include "pwd_.h" ++ ++#define PWD_BUFFER_SIZE 256 ++ ++/* This isn't as flash as my previous version -- it doesn't dynamically ++ scale down the gecos on too-long lines, but it also makes fewer syscalls, ++ so it's probably nicer. Write me if you want the old version. Maybe I ++ should include it as a build-time option... ? ++ -Nat */ ++ ++struct passwd *__getpwent(int pwd_fd) ++{ ++ static char line_buff[PWD_BUFFER_SIZE]; ++ static struct passwd passwd; ++ char *field_begin; ++ char *endptr; ++ char *gid_ptr=NULL; ++ char *uid_ptr=NULL; ++ int line_len; ++ int i; ++ ++ /* We use the restart label to handle malformatted lines */ ++ restart: ++ /* Read the passwd line into the static buffer using a minimal of ++ syscalls. */ ++ if ((line_len = read(pwd_fd, line_buff, PWD_BUFFER_SIZE)) <= 0) ++ return NULL; ++ field_begin = strchr(line_buff, '\n'); ++ if (field_begin != NULL) ++ lseek(pwd_fd, (long) (1 + field_begin - (line_buff + line_len)), ++ SEEK_CUR); ++ else { /* The line is too long - skip it. :-\ */ ++ ++ do { ++ if ((line_len = read(pwd_fd, line_buff, PWD_BUFFER_SIZE)) <= 0) ++ return NULL; ++ } while (!(field_begin = strchr(line_buff, '\n'))); ++ lseek(pwd_fd, (long) (field_begin - line_buff) - line_len + 1, ++ SEEK_CUR); ++ goto restart; ++ } ++ if (*line_buff == '#' || *line_buff == ' ' || *line_buff == '\n' || ++ *line_buff == '\t') ++ goto restart; ++ *field_begin = '\0'; ++ ++ /* We've read the line; now parse it. */ ++ field_begin = line_buff; ++ for (i = 0; i < 7; i++) { ++ switch (i) { ++ case 0: ++ passwd.pw_name = field_begin; ++ break; ++ case 1: ++ passwd.pw_passwd = field_begin; ++ break; ++ case 2: ++ uid_ptr = field_begin; ++ break; ++ case 3: ++ gid_ptr = field_begin; ++ break; ++ case 4: ++ passwd.pw_gecos = field_begin; ++ break; ++ case 5: ++ passwd.pw_dir = field_begin; ++ break; ++ case 6: ++ passwd.pw_shell = field_begin; ++ break; ++ } ++ if (i < 6) { ++ field_begin = strchr(field_begin, ':'); ++ if (field_begin == NULL) ++ goto restart; ++ *field_begin++ = '\0'; ++ } ++ } ++ passwd.pw_gid = (gid_t) strtoul(gid_ptr, &endptr, 10); ++ if (*endptr != '\0') ++ goto restart; ++ ++ passwd.pw_uid = (uid_t) strtoul(uid_ptr, &endptr, 10); ++ if (*endptr != '\0') ++ goto restart; ++ ++ return &passwd; ++} +--- sash-3.4/getgrgid.c.pwd 2004-03-26 16:59:55.000000000 +0100 ++++ sash-3.4/getgrgid.c 2004-03-26 17:35:45.000000000 +0100 +@@ -0,0 +1,42 @@ ++/* ++ * getgrgid.c - This file is part of the libc-8086/grp package for ELKS, ++ * Copyright (C) 1995, 1996 Nat Friedman . ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include "grp_.h" ++ ++struct group *getgrgid(const gid_t gid) ++{ ++ struct group *group; ++ int grp_fd; ++ ++ if ((grp_fd = open("/etc/group", O_RDONLY)) < 0) ++ return NULL; ++ ++ while ((group = bb_getgrent(grp_fd)) != NULL) ++ if (group->gr_gid == gid) { ++ close(grp_fd); ++ return group; ++ } ++ ++ close(grp_fd); ++ return NULL; ++} +--- sash-3.4/getgrnam.c.pwd 2004-03-26 16:59:55.000000000 +0100 ++++ sash-3.4/getgrnam.c 2004-03-26 17:35:36.000000000 +0100 +@@ -0,0 +1,48 @@ ++/* ++ * getgrnam.c - This file is part of the libc-8086/grp package for ELKS, ++ * Copyright (C) 1995, 1996 Nat Friedman . ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include "grp_.h" ++ ++struct group *getgrnam(const char *name) ++{ ++ int grp_fd; ++ struct group *group; ++ ++ if (name == NULL) { ++ errno = EINVAL; ++ return NULL; ++ } ++ ++ if ((grp_fd = open("/etc/group", O_RDONLY)) < 0) ++ return NULL; ++ ++ while ((group = bb_getgrent(grp_fd)) != NULL) ++ if (!strcmp(group->gr_name, name)) { ++ close(grp_fd); ++ return group; ++ } ++ ++ close(grp_fd); ++ return NULL; ++} +--- sash-3.4/getpwnam.c.pwd 2004-03-26 16:59:55.000000000 +0100 ++++ sash-3.4/getpwnam.c 2004-03-26 16:59:55.000000000 +0100 +@@ -0,0 +1,49 @@ ++/* ++ * getpwnam.c - This file is part of the libc-8086/pwd package for ELKS, ++ * Copyright (C) 1995, 1996 Nat Friedman . ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include "pwd_.h" ++ ++ ++struct passwd *getpwnam(const char *name) ++{ ++ int passwd_fd; ++ struct passwd *passwd; ++ ++ if (name == NULL) { ++ errno = EINVAL; ++ return NULL; ++ } ++ ++ if ((passwd_fd = open("/etc/passwd", O_RDONLY)) < 0) ++ return NULL; ++ ++ while ((passwd = __getpwent(passwd_fd)) != NULL) ++ if (!strcmp(passwd->pw_name, name)) { ++ close(passwd_fd); ++ return passwd; ++ } ++ ++ close(passwd_fd); ++ return NULL; ++} +--- sash-3.4/getpwuid.c.pwd 2004-03-26 16:59:55.000000000 +0100 ++++ sash-3.4/getpwuid.c 2004-03-26 16:59:55.000000000 +0100 +@@ -0,0 +1,43 @@ ++/* ++ * getpwuid.c - This file is part of the libc-8086/pwd package for ELKS, ++ * Copyright (C) 1995, 1996 Nat Friedman . ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include ++#include ++#include ++ ++#include "pwd_.h" ++ ++struct passwd *getpwuid(uid_t uid) ++{ ++ int passwd_fd; ++ struct passwd *passwd; ++ ++ if ((passwd_fd = open("/etc/passwd", O_RDONLY)) < 0) ++ return NULL; ++ ++ while ((passwd = __getpwent(passwd_fd)) != NULL) ++ if (passwd->pw_uid == uid) { ++ close(passwd_fd); ++ return passwd; ++ } ++ ++ close(passwd_fd); ++ return NULL; ++} +--- sash-3.4/grp_.h.pwd 2004-03-26 16:59:55.000000000 +0100 ++++ sash-3.4/grp_.h 2004-03-26 17:34:14.000000000 +0100 +@@ -0,0 +1,33 @@ ++#ifndef __CONFIG_GRP_H ++#define __CONFIG_GRP_H ++ ++#include ++#include ++#include ++ ++ ++/* The group structure */ ++struct group ++{ ++ char *gr_name; /* Group name. */ ++ char *gr_passwd; /* Password. */ ++ gid_t gr_gid; /* Group ID. */ ++ char **gr_mem; /* Member list. */ ++}; ++ ++extern void setgrent __P ((void)); ++extern void endgrent __P ((void)); ++extern struct group * getgrent __P ((void)); ++ ++extern struct group * getgrgid __P ((__const gid_t gid)); ++extern struct group * getgrnam __P ((__const char * name)); ++ ++extern struct group * fgetgrent __P ((FILE * file)); ++ ++extern int setgroups __P ((size_t n, __const gid_t * groups)); ++extern int initgroups __P ((__const char * user, gid_t gid)); ++ ++extern struct group * bb_getgrent __P ((int grp_fd)); ++ ++#endif /* __CONFIG_GRP_H */ ++ +--- sash-3.4/pwd_.h.pwd 2004-03-26 16:59:55.000000000 +0100 ++++ sash-3.4/pwd_.h 2004-03-26 17:36:19.000000000 +0100 +@@ -0,0 +1,35 @@ ++#ifndef __CONFIG_PWD_H ++#define __CONFIG_PWD_H ++ ++#include ++#include ++#include ++ ++/* The passwd structure. */ ++struct passwd ++{ ++ char *pw_name; /* Username. */ ++ char *pw_passwd; /* Password. */ ++ uid_t pw_uid; /* User ID. */ ++ gid_t pw_gid; /* Group ID. */ ++ char *pw_gecos; /* Real name. */ ++ char *pw_dir; /* Home directory. */ ++ char *pw_shell; /* Shell program. */ ++}; ++ ++extern void setpwent __P ((void)); ++extern void endpwent __P ((void)); ++extern struct passwd * getpwent __P ((void)); ++ ++extern int putpwent __P ((__const struct passwd * __p, FILE * __f)); ++extern int getpw __P ((uid_t uid, char *buf)); ++ ++extern struct passwd * fgetpwent __P ((FILE * file)); ++ ++extern struct passwd * getpwuid __P ((__const uid_t)); ++extern struct passwd * getpwnam __P ((__const char *)); ++ ++extern struct passwd * __getpwent __P ((__const int passwd_fd)); ++ ++#endif /* __CONFIG_PWD_H */ ++ +--- sash-3.4/Makefile.pwd 2004-03-26 16:59:54.000000000 +0100 ++++ sash-3.4/Makefile 2004-03-26 21:30:20.000000000 +0100 +@@ -15,7 +15,9 @@ + + + OBJS = sash.o cmds.o cmd_dd.o cmd_ed.o cmd_grep.o cmd_ls.o cmd_tar.o \ +- cmd_gzip.o cmd_find.o cmd_file.o cmd_chattr.o cmd_ar.o utils.o ++ cmd_gzip.o cmd_find.o cmd_file.o cmd_chattr.o cmd_ar.o utils.o \ ++ getgrgid.o getgrnam.o getpwnam.o getpwuid.o __getgrent.o \ ++ __getpwent.o + + + sash: $(OBJS) Modified: tinysofa/releases/1.1/sash/current/specs/sash.spec =================================================================== --- tinysofa/releases/1.1/sash/current/specs/sash.spec 2004-11-30 16:44:33 UTC (rev 5155) +++ tinysofa/releases/1.1/sash/current/specs/sash.spec 2004-12-01 14:41:33 UTC (rev 5156) @@ -1,73 +1,104 @@ -Summary: A statically linked shell, including some built-in basic commands. +Summary: A statically-linked shell, including some built-in basic commands. Name: sash -Version: 3.6 -Release: 6ts +Version: 3.7 +Release: 1jh License: GPL Group: main Source0: http://www.canb.auug.org.au/~dbell/programs/sash-%{version}.tar.gz Patch0: sash-3.6-misc.patch +Patch1: sash-3.6-scriptarg.patch Patch2: sash-3.4-losetup.patch -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: zlib-devel +Patch3: sash-pwdfunc.patch +Patch4: sash-3.7-segfault.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: zlib-devel %description -Sash is a simple, standalone, statically linked shell which includes -simplified versions of built-in commands like ls, dd and gzip. Sash +Sash is a simple, standalone, statically-linked shell which includes +simplified versions of built-in commands like ls, dd, and gzip. Sash is statically linked so that it can work without shared libraries, so it is particularly useful for recovering from certain types of system -failures. Sash can also be used to safely upgrade to new versions of +failures. Sash can also be used to safely upgrade to new versions of shared libraries. + %prep %setup -q -%patch0 -p1 -%patch2 -p1 +%patch0 -p1 -b .misc +%patch1 -p1 -b .scriptarg +%patch2 -p1 -b .losetup +%patch3 -p1 -b .pwd +%patch4 -p1 -b .segf + %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +%make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/sbin -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 +%{__mkdir_p} \ + %{buildroot}/sbin \ + %{buildroot}%{_mandir}/man8 -install -s -m755 sash $RPM_BUILD_ROOT/sbin -install -m644 sash.1 $RPM_BUILD_ROOT%{_mandir}/man8/sash.8 +install -s -m 755 sash %{buildroot}/sbin +install -m 644 sash.1 %{buildroot}%{_mandir}/man8/sash.8 + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files %defattr(-,root,root) /sbin/sash %{_mandir}/man8/sash.8* + %changelog -* Thu Aug 05 2004 tsintegrate 3.6-6ts -- current (3.6-6jh) integrated as 3.6-6ts for release 1.1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 19 2004 tsintegrate 3.6-5ts -- current (3.6-4ts) integrated as 3.6-5ts for release 1.0-U1 +* Fri Mar 26 2004 Karsten Hopp 3.7-3 +- add some functions from the ELKS libc-8086/pwd package to fix static linking +- fix segfault (#119206) -* Wed May 12 2004 Omar Kilani 3.6-4ts -- Add BuildRequires zlib-devel. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Dec 8 2003 Erlend Midttun 3.6-1tr -- New upstream. +* Fri Jan 23 2004 Karsten Hopp 3.7-1 +- update -* Wed Jun 18 2003 Erlend Midttun 3.5-4tr -- Big rebuild +* Mon Sep 01 2003 Than Ngo 3.6-1 +- 3.6 -* Mon Mar 24 2003 Erlend Midttun 3.5-3em -- Rebuilt against glibc 2.3.2. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Jul 24 2002 Daniel Meyer 3.5-2dm -- rebuild for Trustix Secure Linux 2.0 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Mar 18 2002 Christian H. Toldnes -- Security related rebuild due to broken zlib. -- Picked up version 3.5 +* Fri Dec 13 2002 Elliot Lee +- Rebuild +- _smp_mflags +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Aug 13 2001 Preston Brown +- build requirement on zlib-devel + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Aug 30 2000 Matt Wilson +- rebuild to cope with glibc locale binary incompatibility, again + * Wed Jul 19 2000 Jakub Jelinek - rebuild to cope with glibc locale binary incompatibility @@ -93,4 +124,4 @@ - Injected new description and group. * Fri Dec 18 1998 Preston Brown -- bumped spec number for initial rh 6.0 buil +- bumped spec number for initial rh 6.0 build From svn at tinysofa.org Wed Dec 1 14:44:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 1 Dec 2004 09:44:04 -0500 (EST) Subject: [tinysofa-svn] r5157 - in tinysofa/releases/1.1: ipsec-tools/current/specs kerberosafs/current/specs libc-client/current/specs nfs-utils/current/specs nss_ldap/current/specs pam_krb5/current/specs php4/current/specs squid/current/specs Message-ID: <20041201144404.EAEC334411C@minbar.tinysofa.org> Author: jh Date: 2004-12-01 09:44:04 -0500 (Wed, 01 Dec 2004) New Revision: 5157 Modified: tinysofa/releases/1.1/ipsec-tools/current/specs/ipsec-tools.spec tinysofa/releases/1.1/kerberosafs/current/specs/kerberosafs.spec tinysofa/releases/1.1/libc-client/current/specs/libc-client.spec tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec tinysofa/releases/1.1/php4/current/specs/php4.spec tinysofa/releases/1.1/squid/current/specs/squid.spec Log: - kerberos5 -> krb5 Modified: tinysofa/releases/1.1/ipsec-tools/current/specs/ipsec-tools.spec =================================================================== --- tinysofa/releases/1.1/ipsec-tools/current/specs/ipsec-tools.spec 2004-12-01 14:41:33 UTC (rev 5156) +++ tinysofa/releases/1.1/ipsec-tools/current/specs/ipsec-tools.spec 2004-12-01 14:44:04 UTC (rev 5157) @@ -14,7 +14,7 @@ Source6: udp.h Patch: ipsec-tools-0.2.4-racoon-dest.patch Patch2: isakmp.c.diff -BuildPrereq: openssl-devel, kerberos5-devel, flex, bison, gcc-c++ +BuildPrereq: openssl-devel, krb5-devel, flex, bison, gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: initscripts >= 7.31 Modified: tinysofa/releases/1.1/kerberosafs/current/specs/kerberosafs.spec =================================================================== --- tinysofa/releases/1.1/kerberosafs/current/specs/kerberosafs.spec 2004-12-01 14:41:33 UTC (rev 5156) +++ tinysofa/releases/1.1/kerberosafs/current/specs/kerberosafs.spec 2004-12-01 14:44:04 UTC (rev 5157) @@ -7,7 +7,7 @@ Group: extra Summary: A Kerberos to AFS bridging library, built against Kerberos 5. BuildRoot: %{_tmppath}/%{name}-root -BuildPrereq: kerberos5-devel, libcom_err-devel, autoconf, automake, libtool +BuildPrereq: krb5-devel, libcom_err-devel, autoconf, automake, libtool %define k5prefix /usr/kerberos Modified: tinysofa/releases/1.1/libc-client/current/specs/libc-client.spec =================================================================== --- tinysofa/releases/1.1/libc-client/current/specs/libc-client.spec 2004-12-01 14:41:33 UTC (rev 5156) +++ tinysofa/releases/1.1/libc-client/current/specs/libc-client.spec 2004-12-01 14:44:04 UTC (rev 5157) @@ -27,7 +27,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: kerberos5-devel, openssl-devel, pam-devel +BuildPrereq: krb5-devel, openssl-devel, pam-devel # DO NOT REMOVE THIS PAM HEADER DEPENDANCY OR FACE THE WRATH BuildPreReq: /usr/include/security/pam_modules.h Requires: pam >= 0.59 Modified: tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2004-12-01 14:41:33 UTC (rev 5156) +++ tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2004-12-01 14:44:04 UTC (rev 5157) @@ -44,7 +44,7 @@ PreReq: coreutils, grep %if %{nfsv4_support} Requires: modutils >= 2.4.26-9 -BuildRequires: kerberos5-devel >= 1.3.1 +BuildRequires: krb5-devel >= 1.3.1 %endif %service_requires %accountman_requires Modified: tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec =================================================================== --- tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec 2004-12-01 14:41:33 UTC (rev 5156) +++ tinysofa/releases/1.1/nss_ldap/current/specs/nss_ldap.spec 2004-12-01 14:44:04 UTC (rev 5157) @@ -17,7 +17,7 @@ Group: main BuildRoot: %{_tmppath}/%{name}-%{nss_ldap_version}-root BuildPrereq: autoconf, automake, libtool -BuildPrereq: kerberos5-devel, openssl-devel, /usr/include/security/pam_modules.h +BuildPrereq: krb5-devel, openssl-devel, /usr/include/security/pam_modules.h BuildPrereq: libtool BuildPrereq: cyrus-sasl-devel >= 2.1, openldap-devel >= 2.0.27 BuildPrereq: pam-devel zlib-devel Modified: tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec =================================================================== --- tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec 2004-12-01 14:41:33 UTC (rev 5156) +++ tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec 2004-12-01 14:44:04 UTC (rev 5157) @@ -5,8 +5,8 @@ Source0: pam_krb5-%{version}.tar.gz License: LGPL Group: extra -BuildPrereq: byacc, flex, kerberos5-devel, kerberosafs-devel, pam-devel -BuildRequires: libstdc++-devel kerberos5 kerberosafs libcom_err-devel gcc-c++ +BuildPrereq: byacc, flex, krb5-devel, kerberosafs-devel, pam-devel +BuildRequires: libstdc++-devel krb5 kerberosafs libcom_err-devel gcc-c++ BuildRoot: %{_tmppath}/%{name}-root Requires: kerberosafs >= 1.0 @@ -57,7 +57,7 @@ - current (2.0.10-2ts) integrated as 2.0.10-3ts for release 1.0-U1 * Wed May 12 2004 Omar Kilani -- Add BuildRequires: libstdc++-devel kerberos5 kerberosafs libcom_err-devel +- Add BuildRequires: libstdc++-devel krb5 kerberosafs libcom_err-devel * Wed Apr 07 2004 Omar Kilani - 2.0.10-2ts - Tinysofa Modified: tinysofa/releases/1.1/php4/current/specs/php4.spec =================================================================== --- tinysofa/releases/1.1/php4/current/specs/php4.spec 2004-12-01 14:41:33 UTC (rev 5156) +++ tinysofa/releases/1.1/php4/current/specs/php4.spec 2004-12-01 14:44:04 UTC (rev 5157) @@ -102,7 +102,7 @@ Obsoletes: php-imap < 5.0.0 Obsoletes: mod_php3-imap, stronghold-php-imap Obsoletes: mod_php4-imap -BuildRequires: kerberos5-devel, openssl-devel, libc-client-devel +BuildRequires: krb5-devel, openssl-devel, libc-client-devel %description imap The php-imap package contains a dynamic shared object (DSO) for the @@ -158,7 +158,7 @@ Provides: %{name}_database Obsoletes: mod_php3-pgsql, stronghold-php-pgsql Obsoletes: mod_php4-pgsql -BuildRequires: kerberos5-devel, openssl-devel, postgresql-devel +BuildRequires: krb5-devel, openssl-devel, postgresql-devel %description pgsql The php-pgsql package includes a dynamic shared object (DSO) that can Modified: tinysofa/releases/1.1/squid/current/specs/squid.spec =================================================================== --- tinysofa/releases/1.1/squid/current/specs/squid.spec 2004-12-01 14:41:33 UTC (rev 5156) +++ tinysofa/releases/1.1/squid/current/specs/squid.spec 2004-12-01 14:44:04 UTC (rev 5157) @@ -28,7 +28,7 @@ %accountman_requires %service_requires BuildRequires: openldap-devel pam-devel openssl-devel -BuildRequires: kerberos5-devel libcom_err-devel +BuildRequires: krb5-devel libcom_err-devel %description Squid is a high-performance proxy caching server for Web clients, From svn at tinysofa.org Wed Dec 1 14:49:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 1 Dec 2004 09:49:50 -0500 (EST) Subject: [tinysofa-svn] r5158 - in tinysofa/releases/1.1/samba/current: sources specs Message-ID: <20041201144950.D965234411C@minbar.tinysofa.org> Author: jh Date: 2004-12-01 09:49:50 -0500 (Wed, 01 Dec 2004) New Revision: 5158 Added: tinysofa/releases/1.1/samba/current/sources/samba-3.0.4-install.mount.smbfs.patch tinysofa/releases/1.1/samba/current/sources/samba-3.0.9-changetrustpw.patch tinysofa/releases/1.1/samba/current/sources/samba-3.0.9.tar.gz Removed: tinysofa/releases/1.1/samba/current/sources/samba-3.0.6.tar.gz tinysofa/releases/1.1/samba/current/sources/samba-3.0.8.tar.gz Modified: tinysofa/releases/1.1/samba/current/sources/samba-3.0.8-logfiles.patch tinysofa/releases/1.1/samba/current/specs/samba.spec Log: - 3.0.9 Added: tinysofa/releases/1.1/samba/current/sources/samba-3.0.4-install.mount.smbfs.patch =================================================================== --- tinysofa/releases/1.1/samba/current/sources/samba-3.0.4-install.mount.smbfs.patch 2004-12-01 14:44:04 UTC (rev 5157) +++ tinysofa/releases/1.1/samba/current/sources/samba-3.0.4-install.mount.smbfs.patch 2004-12-01 14:49:50 UTC (rev 5158) @@ -0,0 +1,17 @@ +--- samba-3.0.4/source/script/installbin.sh.orig 2004-04-04 09:37:41.000000000 +0200 ++++ samba-3.0.4/source/script/installbin.sh 2004-07-27 13:25:46.000000000 +0200 +@@ -22,14 +22,6 @@ + fi + cp $p $BINDIR/ + chmod $INSTALLPERMS $BINDIR/$p2 +- +- # this is a special case, mount needs this in a specific location +- if [ $p2 = smbmount ]; then +- if [ ! -d $DESTDIR/sbin ]; then +- mkdir $DESTDIR/sbin +- fi +- ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs +- fi + done + + Deleted: tinysofa/releases/1.1/samba/current/sources/samba-3.0.6.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/samba/current/sources/samba-3.0.8-logfiles.patch =================================================================== --- tinysofa/releases/1.1/samba/current/sources/samba-3.0.8-logfiles.patch 2004-12-01 14:44:04 UTC (rev 5157) +++ tinysofa/releases/1.1/samba/current/sources/samba-3.0.8-logfiles.patch 2004-12-01 14:49:50 UTC (rev 5158) @@ -77,8 +77,8 @@ log level = 10 -- log file = /usr/local/samba/lib/log.%m -+ log file = /usr/local/samba/lib/%m.log +- log file = /usr/local/samba/lib/log.%m ++ log file = /usr/local/samba/lib/%m.log include = /usr/local/samba/lib/smb.conf.%m

and create a file /usr/local/samba/lib/smb.conf.machine where Deleted: tinysofa/releases/1.1/samba/current/sources/samba-3.0.8.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/samba/current/sources/samba-3.0.9-changetrustpw.patch =================================================================== --- tinysofa/releases/1.1/samba/current/sources/samba-3.0.9-changetrustpw.patch 2004-12-01 14:44:04 UTC (rev 5157) +++ tinysofa/releases/1.1/samba/current/sources/samba-3.0.9-changetrustpw.patch 2004-12-01 14:49:50 UTC (rev 5158) @@ -0,0 +1,10 @@ +--- samba-3.0.9/source/libads/#util.c~ 2004-11-16 15:16:02.000000000 -0500 ++++ samba-3.0.9/source/libads/util.c 2004-11-16 15:18:12.000000000 -0500 +@@ -62,7 +62,6 @@ + failed: + SAFE_FREE(service_principal); + SAFE_FREE(password); +- SAFE_FREE(new_password); + return ret; + } + #endif Added: tinysofa/releases/1.1/samba/current/sources/samba-3.0.9.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/samba/current/sources/samba-3.0.9.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec =================================================================== --- tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-12-01 14:44:04 UTC (rev 5157) +++ tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-12-01 14:49:50 UTC (rev 5158) @@ -2,7 +2,7 @@ Summary: The Samba SMB server. Name: samba -Version: 3.0.8 +Version: 3.0.9 Release: 1jh Epoch: 0 License: GNU GPL Version 2 @@ -33,9 +33,11 @@ Patch9: samba-3.0.5rc1-passwd.patch Patch10: samba-3.0.5pre1-smbclient-kerberos.patch Patch11: samba-3.0.5pre1-use_authtok.patch -Patch13: samba-3.0.5rc1-64bit-timestamps.patch -Patch15: samba-3.0.8pre1-smbmnt.patch -Patch20: samba-3.0.8-non-ascii-domain.patch +Patch12: samba-3.0.5rc1-64bit-timestamps.patch +Patch13: samba-3.0.8pre1-smbmnt.patch +Patch14: samba-3.0.8-non-ascii-domain.patch +Patch15: samba-3.0.9-changetrustpw.patch +Patch16: samba-3.0.4-install.mount.smbfs.patch Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version} Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 @@ -44,9 +46,9 @@ Prereq: sed mktemp /usr/bin/killall coreutils initscripts %service_requires BuildRequires: cups-devel, readline-devel, pam-devel -BuildRequires: kerberos5-devel, kerberos5-libs, libcom_err-devel +BuildRequires: krb5-devel, krb5-libs, libcom_err-devel BuildRequires: openldap-devel, mysql-devel, cyrus-sasl-devel, openssl-devel -BuildRequires: autoconf kerberos5 zlib-devel ncurses-devel +BuildRequires: autoconf krb5 zlib-devel ncurses-devel BuildRequires: libacl-devel %define __perl_requires %{nil} @@ -121,9 +123,11 @@ %patch9 -p1 -b .passwd %patch10 -p1 -b .smbclient-kerberos %patch11 -p1 -b .use_authtok -%patch13 -p1 -b .64bit-timestamps -%patch15 -p1 -b .smbmnt -%patch20 -p1 -b .non-ascii-domain +%patch12 -p1 -b .64bit-timestamps +%patch13 -p1 -b .smbmnt +%patch14 -p1 -b .non-ascii-domain +%patch15 -p1 -b .changetrustpw +%patch16 -p1 -b .install.mount.smbfs # crap rm -f examples/VFS/.cvsignore From svn at tinysofa.org Wed Dec 1 14:50:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 1 Dec 2004 09:50:47 -0500 (EST) Subject: [tinysofa-svn] r5159 - in tinysofa/releases/1.1/cyrus-imapd/current: sources specs Message-ID: <20041201145047.72D1E34411C@minbar.tinysofa.org> Author: jh Date: 2004-12-01 09:50:46 -0500 (Wed, 01 Dec 2004) New Revision: 5159 Added: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.10.tar.gz Removed: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.9.tar.gz Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - 2.2.10, fixes CAN-2004-1015 - clean up doc directory - fix perl stuff permissions (and stripping) - adjust rpm scripts Added: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.10.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.10.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-2.2.9.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc 2004-12-01 14:49:50 UTC (rev 5158) +++ tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc 2004-12-01 14:50:46 UTC (rev 5159) @@ -54,7 +54,7 @@ [ -f /var/run/cyrus-master.pid ] && restart || : ;; status) - status $master + status cyrus-master RETVAL=$? ;; *) Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-01 14:49:50 UTC (rev 5158) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-01 14:50:46 UTC (rev 5159) @@ -1,6 +1,9 @@ +# for some reason this is needed +%define _unpackaged_files_terminate_build 0 + Summary: A high-performance mail store with IMAP and POP3 support. Name: cyrus-imapd -Version: 2.2.9 +Version: 2.2.10 Release: 1jh License: BSD Group: extra @@ -23,7 +26,7 @@ patch7: cyrus-imapd-perl-path2.patch -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: cyrus-sasl, db4, imapd-pam, libcom_err BuildRequires: cyrus-sasl-devel, e2fsprogs-devel, perl, perl-devel, tcp_wrappers-devel BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel @@ -56,6 +59,7 @@ The %{name}-devel package contains files needed for developing and compiling applications which use the Cyrus IMAPD. + %prep %setup -q %patch1 -p1 @@ -67,6 +71,7 @@ rm -fr autom4te.cache + %build export CPPFLAGS="-I/usr/include/et" export CFLAGS="$RPM_OPT_FLAGS -fPIC" @@ -86,10 +91,11 @@ --with-cyrus-prefix=%{_libdir}/%{name} \ --sysconfdir=%{_sysconfdir}/%{name} -%make +%make -j1 gcc $RPM_OPT_FLAGS -o deliver-wrapper $RPM_SOURCE_DIR/cyrus-deliver-wrapper.c + %install # Create directories. mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{cron.daily,postfix} @@ -126,8 +132,8 @@ install -s deliver-wrapper \ $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/deliver-wrapper -install -m 755 imtest/imtest $RPM_BUILD_ROOT/usr/bin/imtest -install -m 755 perl/imap/cyradm $RPM_BUILD_ROOT/usr/bin/cyradm +install -m 755 imtest/imtest $RPM_BUILD_ROOT/%{_bindir}/imtest +install -m 755 perl/imap/cyradm $RPM_BUILD_ROOT/%{_bindir}/cyradm # Install various configuration files. install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/imapd.conf @@ -135,7 +141,7 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/user-procmailrc install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/%{name} -touch $RPM_BUILD_ROOT/var/spool/cyrus-imap/mailboxes +touch $RPM_BUILD_ROOT/var/spool/cyrus-imap/mailboxes export IMAP_DIR="$RPM_BUILD_ROOT/var/spool/cyrus-imap/" echo "IMAP_DIR: $IMAP_DIR" perl -e 'foreach ("a".."z") { mkdir "$ENV{IMAP_DIR}/user/$_",0755; mkdir "$ENV{IMAP_DIR}/quota/$_",0755; mkdir "$ENV{IMAP_DIR}/sieve/$_",0755; }' @@ -148,7 +154,7 @@ # Install the tools for tool in tools/* ; do - test -f ${tool} && install -m755 ${tool} $RPM_BUILD_ROOT/usr/bin/ + test -f ${tool} && install -m755 ${tool} $RPM_BUILD_ROOT/%{_bindir} done # We need to rename the internal man pages of cyrus to avoid conflicts with @@ -167,13 +173,18 @@ done popd -find %{buildroot} -name "perllocal.pod" -exec %{__rm} -f {} \; +find %{buildroot} \( \ + -name "perllocal.pod" -o \ + -name ".packlist" \ + \) -exec %{__rm} -f {} \; +find %{buildroot}%{_libdir}/perl* | xargs chmod u+rw + %clean %clean_buildroot + %pre -%{_initrddir}/cyrus stop 2>/dev/null >/dev/null || : # Dynamically add the cyrus user BEFORE installing package if [ -z "`getent group mail`" ]; then /usr/sbin/groupadd -g %{mail_gid} mail @@ -197,17 +208,14 @@ %preun %service_preun cyrus -if [ $1 = 0 ]; then - %{_initrddir}/cyrus stop 2>/dev/null || : - /sbin/chkconfig --del cyrus || : -fi %postun %service_postun cyrus + %files %defattr(-,root,root) -%doc COPYRIGHT README doc/* +%doc COPYRIGHT README doc/*.html doc/*.png %{_sysconfdir}/cron.daily/* %dir %{_sysconfdir}/%{name} %config %{_sysconfdir}/%{name}/procmailrc @@ -220,17 +228,22 @@ %attr(755,root,root) %{_libdir}/perl?/site_perl/*/*/auto/Cyrus %{_libdir}/perl?/site_perl/*/*/Cyrus %attr(02755,cyrus,mail) %{_libdir}/%{name}/bin/deliver-wrapper -%{_mandir}/*/* +%{_mandir}/man?/* %attr(750,cyrus,mail) /var/spool/cyrus-imap -%exclude /var/tmp/cyrus-imapd-root - %files devel %defattr(-,root,root) %attr(644,root,root) %{_libdir}/*.a %{_includedir}/cyrus + %changelog +* Wed Dec 1 2004 Jaakko Heinonen 2.2.10-1jh +- 2.2.10, fixes CAN-2004-1015 +- clean up doc directory +- fix perl stuff permissions (and stripping) +- adjust rpm scripts + * Wed Nov 24 2004 Jaakko Heinonen 2.2.9-1jh - 2.2.9, which fixes several critical vulnerabilities From svn at tinysofa.org Wed Dec 1 15:19:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 1 Dec 2004 10:19:17 -0500 (EST) Subject: [tinysofa-svn] r5160 - tinysofa/releases/1.1/cyrus-imapd/current/sources Message-ID: <20041201151917.3D91B34411C@minbar.tinysofa.org> Author: jh Date: 2004-12-01 10:19:16 -0500 (Wed, 01 Dec 2004) New Revision: 5160 Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc Log: - make initscript status work Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc 2004-12-01 14:50:46 UTC (rev 5159) +++ tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc 2004-12-01 15:19:16 UTC (rev 5160) @@ -54,8 +54,14 @@ [ -f /var/run/cyrus-master.pid ] && restart || : ;; status) - status cyrus-master - RETVAL=$? + pid=`pidofproc cyrus-master` + if test -n "$pid" && ps $pid > /dev/null; then + echo $"master (pid $pid) is running..." + RETVAL=0 + else + echo $"master is stopped" + RETVAL=1 + fi ;; *) echo "Usage: $0 {start|stop|restart|try-restart|status}" From svn at tinysofa.org Wed Dec 1 15:22:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 1 Dec 2004 10:22:58 -0500 (EST) Subject: [tinysofa-svn] r5161 - tinysofa/releases/1.1/postfix/current/sources Message-ID: <20041201152258.DF77934411C@minbar.tinysofa.org> Author: jh Date: 2004-12-01 10:22:58 -0500 (Wed, 01 Dec 2004) New Revision: 5161 Modified: tinysofa/releases/1.1/postfix/current/sources/postfix-master.cf Log: - nuke obsolete cyrus stuff from default config Modified: tinysofa/releases/1.1/postfix/current/sources/postfix-master.cf =================================================================== --- tinysofa/releases/1.1/postfix/current/sources/postfix-master.cf 2004-12-01 15:19:16 UTC (rev 5160) +++ tinysofa/releases/1.1/postfix/current/sources/postfix-master.cf 2004-12-01 15:22:58 UTC (rev 5161) @@ -103,13 +103,8 @@ maildrop unix - n n - - pipe flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient} # -# The Cyrus deliver program has changed incompatibly, multiple times. +# Use LMTP with Cyrus # -old-cyrus unix - n n - - pipe - flags=R user=cyrus argv=/usr/bin/cyrdeliver -e -m ${extension} ${user} -# Cyrus 2.1.5 (Amos Gouaux) -cyrus unix - n n - - pipe - user=cyrus argv=/usr/bin/cyrdeliver -e -r ${sender} -m ${extension} ${user} uucp unix - n n - - pipe flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) ifmail unix - n n - - pipe From svn at tinysofa.org Wed Dec 1 19:17:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 1 Dec 2004 14:17:46 -0500 (EST) Subject: [tinysofa-svn] r5162 - in tinysofa/releases/1.1/glibc/current: sources specs Message-ID: <20041201191746.943F934411C@minbar.tinysofa.org> Author: jh Date: 2004-12-01 14:17:46 -0500 (Wed, 01 Dec 2004) New Revision: 5162 Modified: tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh tinysofa/releases/1.1/glibc/current/specs/glibc.spec Log: - make i18n packages to prerequire the same version of the -i18n-common Modified: tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh =================================================================== --- tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh 2004-12-01 15:22:58 UTC (rev 5161) +++ tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh 2004-12-01 19:17:46 UTC (rev 5162) @@ -38,6 +38,7 @@ --buildroot Package BuildRoot --localedir Package localedir (/usr/share/locale) --requires Package Requires + --prereq Package PreRequires --provides Package Provides --obsoletes Package Obsoletes --post Package %post interpreter @@ -55,6 +56,7 @@ BUILDROOT="" LOCALEDIR="/usr/share/locale" REQUIRES="" +PREREQ="" PROVIDES="" OBSOLETES="" POST="" @@ -99,6 +101,10 @@ shift LOCALEDIR=$1 ;; + --prereq) + shift + PREREQ=$1 + ;; --requires) shift REQUIRES=$1 @@ -213,6 +219,7 @@ echo "Summary(pt_BR): Dados de internacionaliza?ao e locales para a l?ngua $LANGUAGE" echo "Group: i18n" [ -n "$REQUIRES" ] && eval echo "Requires: $REQUIRES" + [ -n "$PREREQ" ] && eval echo "PreReq: $PREREQ" [ -n "$PROVIDES" ] && eval echo "Provides: $PROVIDES" [ -n "$OBSOLETES" ] && eval echo "Obsoletes: $OBSOLETES" echo "Provides: $NAME-i18n" Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec =================================================================== --- tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-12-01 15:22:58 UTC (rev 5161) +++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-12-01 19:17:46 UTC (rev 5162) @@ -1048,7 +1048,8 @@ --license "%{license}" \ --buildarch "noarch" \ --buildroot "%{buildroot}" \ - --requires "glibc = %{version}, glibc-i18n-common = %{version}" \ + --requires "glibc = %{version}" \ + --prereq "glibc-i18n-common = %{version}-%{release}" \ --define "_topdir %{_topdir}" \ --define "_tmppath %{_tmppath}" \ --obsoletes '$NAME-i18n-`echo $LANGUAGE | sed "s/\(.*\)_.*/\1/"` \< %{version}-%{release}' \ From svn at tinysofa.org Wed Dec 1 19:18:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 1 Dec 2004 14:18:54 -0500 (EST) Subject: [tinysofa-svn] r5163 - tinysofa/releases/1.1/netatalk/current/specs Message-ID: <20041201191854.1BFFD34411C@minbar.tinysofa.org> Author: jh Date: 2004-12-01 14:18:53 -0500 (Wed, 01 Dec 2004) New Revision: 5163 Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec Log: - kerberos5 -> krb5 Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec =================================================================== --- tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-12-01 19:17:46 UTC (rev 5162) +++ tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-12-01 19:18:53 UTC (rev 5163) @@ -16,7 +16,7 @@ %service_requires Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf -BuildRequires: libstdc++-devel db4-devel kerberos5-devel libcom_err-devel +BuildRequires: libstdc++-devel db4-devel krb5-devel libcom_err-devel BuildRequires: perl gcc-c++ pam-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root From svn at tinysofa.org Thu Dec 2 21:10:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 2 Dec 2004 16:10:15 -0500 (EST) Subject: [tinysofa-svn] r5165 - tinysofa/releases/1.1/imapd-pam/current/specs Message-ID: <20041202211015.316173440D3@minbar.tinysofa.org> Author: jh Date: 2004-12-02 16:10:14 -0500 (Thu, 02 Dec 2004) New Revision: 5165 Modified: tinysofa/releases/1.1/imapd-pam/current/specs/imapd-pam.spec Log: - cleanup Modified: tinysofa/releases/1.1/imapd-pam/current/specs/imapd-pam.spec =================================================================== --- tinysofa/releases/1.1/imapd-pam/current/specs/imapd-pam.spec 2004-12-02 14:16:04 UTC (rev 5164) +++ tinysofa/releases/1.1/imapd-pam/current/specs/imapd-pam.spec 2004-12-02 21:10:14 UTC (rev 5165) @@ -7,30 +7,34 @@ Source0: imap.pamd Requires: imapd ExclusiveOs: Linux -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArchitectures: noarch %description -This is the PAM file for the different IMAP daemons. +This is the PAM file for Cyrus and Courier IMAP daemons. + %prep + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/etc/pam.d -install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT/etc/pam.d/imap -install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT/etc/pam.d/pop -install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT/etc/pam.d/pop3 +mkdir -p %{buildroot}%{_sysconfdir}/pam.d +install -m 0644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pam.d/imap +install -m 0644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pam.d/pop +install -m 0644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pam.d/pop3 + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files %defattr(-,root,root) -%config(noreplace) /etc/pam.d/imap -%config(noreplace) /etc/pam.d/pop -%config(noreplace) /etc/pam.d/pop3 +%config(noreplace) %{_sysconfdir}/pam.d/imap +%config(noreplace) %{_sysconfdir}/pam.d/pop +%config(noreplace) %{_sysconfdir}/pam.d/pop3 + %changelog * Thu Aug 05 2004 tsintegrate 1.9.0-10ts - current (1.9.0-10jh) integrated as 1.9.0-10ts for release 1.1 From svn at tinysofa.org Thu Dec 2 22:26:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 2 Dec 2004 17:26:39 -0500 (EST) Subject: [tinysofa-svn] r5166 - contrib/1.1/fox/current/specs Message-ID: <20041202222639.58AF73440D3@minbar.tinysofa.org> Author: gda Date: 2004-12-02 17:26:38 -0500 (Thu, 02 Dec 2004) New Revision: 5166 Modified: contrib/1.1/fox/current/specs/fox.spec Log: spec file fixes Modified: contrib/1.1/fox/current/specs/fox.spec =================================================================== --- contrib/1.1/fox/current/specs/fox.spec 2004-12-02 21:10:14 UTC (rev 5165) +++ contrib/1.1/fox/current/specs/fox.spec 2004-12-02 22:26:38 UTC (rev 5166) @@ -1,14 +1,18 @@ Summary: Shared libraries for the FOX 1.2.x toolkit. Name: fox Version: 1.2.11 -Release: 1gd +Release: 2gd Copyright: LGPL Group: contrib Source: ftp://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz URL: http://www.fox-toolkit.org BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: gcc-c++ xorg-x11-devel xorg-x11-Mesa-libGLU libpng-devel +BuildRequires: fontconfig-devel freetype-devel autoconf texinfo +BuildRequires: libtiff-devel bzip2-devel libjpeg-devel cups-devel Requires: xorg-x11-libs xorg-x11-Mesa-libGLU libpng +Requires: fontconfig freetype +Requires: libtiff bzip2 libjpeg cups %description FOX is a C++-based library for graphical user interface development @@ -84,15 +88,15 @@ export PATH="$PATH:/usr/X11R6/bin" CPPFLAGS="$RPM_OPT_FLAGS -frtti" CFLAGS="$RPM_OPT_FLAGS -frtti" %configure \ - --enable-release \ - --with-xft \ - --with-xcursor \ - --enable-cups \ - --with-opengl + --enable-release \ + --with-xft \ + --with-xcursor \ + --enable-cups \ + --with-opengl make %install -make install prefix=$RPM_BUILD_ROOT%{_prefix} +%makeinstall rm -f doc/Makefile.am doc/Makefile.in doc/Makefile rm -r doc/art/Makefile.am doc/art/Makefile.in doc/art/Makefile rm -f doc/screenshots/Makefile.am doc/screenshots/Makefile.in doc/screenshots/Makefile @@ -147,6 +151,9 @@ %{_mandir}/man1/shutterbug.1* %changelog +* Thu Dec 2 2004 Gerald Dachs 1.2.11-2gd +- spec file fixes + * Sun Oct 29 2004 Gerald Dachs 1.2.11-1gd - new upstream From svn at tinysofa.org Fri Dec 3 05:38:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 3 Dec 2004 00:38:14 -0500 (EST) Subject: [tinysofa-svn] r5167 - in tinysofa/releases/1.1/elinks/current: sources specs Message-ID: <20041203053814.618333440DF@minbar.tinysofa.org> Author: jh Date: 2004-12-03 00:38:13 -0500 (Fri, 03 Dec 2004) New Revision: 5167 Added: tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.3-latin1-term.patch Modified: tinysofa/releases/1.1/elinks/current/specs/elinks.spec Log: - change iso-8859-1 to default terminal charset (elinks-0.9.3-latin1-term.patch) Added: tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.3-latin1-term.patch =================================================================== --- tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.3-latin1-term.patch 2004-12-02 22:26:38 UTC (rev 5166) +++ tinysofa/releases/1.1/elinks/current/sources/elinks-0.9.3-latin1-term.patch 2004-12-03 05:38:13 UTC (rev 5167) @@ -0,0 +1,22 @@ +--- elinks-0.9.3/doc/man/man5/elinks.conf.5.latin1-term 2004-12-02 11:50:05.911564349 +0200 ++++ elinks-0.9.3/doc/man/man5/elinks.conf.5 2004-12-02 11:49:08.327013331 +0200 +@@ -1054,7 +1054,7 @@ + \f3terminal._template_.underline\f2 [0|1]\f1 (default: 0) + If we should use underline or enhance the color instead. + .TP +-\f3terminal._template_.charset\f2 \f1 (default: 7-bit ASCII) ++\f3terminal._template_.charset\f2 \f1 (default: ISO-8859-1) + Codepage of charset used for displaying content on terminal. + .SS User interface (ui) + User interface options. +--- elinks-0.9.3/src/config/options.inc.latin1-term 2004-05-28 23:20:00.000000000 +0300 ++++ elinks-0.9.3/src/config/options.inc 2004-12-02 11:21:58.411321669 +0200 +@@ -886,7 +886,7 @@ + N_("If we should use underline or enhance the color instead.")), + + INIT_OPT_CODEPAGE("terminal._template_", N_("Codepage"), +- "charset", 0, "us-ascii", ++ "charset", 0, "iso-8859-1", + N_("Codepage of charset used for displaying content on terminal.")), + + /* Keep options in alphabetical order. */ Modified: tinysofa/releases/1.1/elinks/current/specs/elinks.spec =================================================================== --- tinysofa/releases/1.1/elinks/current/specs/elinks.spec 2004-12-02 22:26:38 UTC (rev 5166) +++ tinysofa/releases/1.1/elinks/current/specs/elinks.spec 2004-12-03 05:38:13 UTC (rev 5167) @@ -1,7 +1,7 @@ Name: elinks Summary: A text-mode Web browser. Version: 0.9.3 -Release: 1jh +Release: 2jh Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2 Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2 Patch0: elinks-noegd.patch @@ -12,6 +12,7 @@ Patch5: elinks-sysname.patch Patch6: elinks-stdin.patch Patch7: elinks-0.9.2-xterm.patch +Patch8: elinks-0.9.3-latin1-term.patch Group: main URL: http://elinks.or.cz/ BuildRoot: %{_tmppath}/%{name}-buildroot @@ -56,6 +57,8 @@ # Fix xterm terminal: "Linux" driver seems better than "VT100" (#128105) %patch7 -p1 -b .xterm +%patch8 -p1 -b .latin1-term + aclocal automake -a autoconf @@ -92,6 +95,9 @@ %changelog +* Thu Dec 2 2004 Jaakko Heinonen 0.9.3-2jh +- change iso-8859-1 to default terminal charset (elinks-0.9.3-latin1-term.patch) + * Thu Oct 14 2004 Karel Zak 0.9.2-2 - the "Linux" driver seems better than "VT100" for xterm (#128105) From svn at tinysofa.org Fri Dec 3 05:56:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 3 Dec 2004 00:56:20 -0500 (EST) Subject: [tinysofa-svn] r5168 - tinysofa/releases/1.1/lvm/current/specs Message-ID: <20041203055620.7BB7A3440DF@minbar.tinysofa.org> Author: jh Date: 2004-12-03 00:56:19 -0500 (Fri, 03 Dec 2004) New Revision: 5168 Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec Log: - rationalize -devel Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec =================================================================== --- tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-12-03 05:38:13 UTC (rev 5167) +++ tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-12-03 05:56:19 UTC (rev 5168) @@ -49,21 +49,15 @@ %install %makeinstall \ - sbindir=$RPM_BUILD_ROOT/sbin \ - libdir=$RPM_BUILD_ROOT/%{_lib} \ - staticlibdir=$RPM_BUILD_ROOT/%{_libdir} + sbindir=%{buildroot}/sbin \ + libdir=%{buildroot}/%{_lib} \ + staticlibdir=%{buildroot}%{_libdir} chmod 755 %{buildroot}/%{_lib}/*.so* chmod 755 %{buildroot}/sbin/* chmod 644 %{buildroot}%{_libdir}/*.a -#force stripping of liblvm (keep unstriped version in /usr for debugging) -pushd $RPM_BUILD_ROOT/%{_lib} -cp -a * ../%{_libdir} -strip * -popd - %clean %clean_buildroot @@ -78,12 +72,12 @@ %doc ABSTRACT CHANGELOG CONTRIBUTORS COPYING COPYING.LIB FAQ %doc KNOWN_BUGS LVM-HOWTO README TODO WHATSNEW /sbin/* -%attr(755,root,root) /%{_lib}/*.so* +%attr(755,root,root) /%{_lib}/*.so.* %attr(644,root,root) %{_mandir}/man8/* %files devel %defattr(-,root,root) -%attr(755,root,root) %{_libdir}/*.so* +%attr(755,root,root) /%{_lib}/*.so %attr(644,root,root) %{_libdir}/*.a From svn at tinysofa.org Fri Dec 3 20:27:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 3 Dec 2004 15:27:24 -0500 (EST) Subject: [tinysofa-svn] r5169 - contrib/1.1/sqlite3/current/specs Message-ID: <20041203202724.6B49F3440F9@minbar.tinysofa.org> Author: gda Date: 2004-12-03 15:27:23 -0500 (Fri, 03 Dec 2004) New Revision: 5169 Modified: contrib/1.1/sqlite3/current/specs/sqlite3.spec Log: fixed group Modified: contrib/1.1/sqlite3/current/specs/sqlite3.spec =================================================================== --- contrib/1.1/sqlite3/current/specs/sqlite3.spec 2004-12-03 05:56:19 UTC (rev 5168) +++ contrib/1.1/sqlite3/current/specs/sqlite3.spec 2004-12-03 20:27:23 UTC (rev 5169) @@ -19,7 +19,7 @@ %package -n sqlite3-devel Summary: Header files and libraries for developing apps which will use sqlite -Group: tinysofa contrib +Group: contrib Requires: sqlite3 = %{version} %description -n sqlite3-devel From svn at tinysofa.org Thu Dec 9 06:46:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 9 Dec 2004 01:46:27 -0500 (EST) Subject: [tinysofa-svn] r5188 - tinysofa/releases/1.1/setup/current/specs Message-ID: <20041209064627.6DA3D344168@minbar.tinysofa.org> Author: jh Date: 2004-12-09 01:46:20 -0500 (Thu, 09 Dec 2004) New Revision: 5188 Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec Log: - add /etc/sysconfig/bootloader as %%ghost Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec =================================================================== --- tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-12-08 20:34:57 UTC (rev 5187) +++ tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-12-09 06:46:20 UTC (rev 5188) @@ -34,7 +34,9 @@ mkdir -p %{buildroot}/var/log cp /dev/null %{buildroot}/var/log/lastlog +touch %{buildroot}/etc/sysconfig/bootloader + %clean %clean_buildroot @@ -62,12 +64,17 @@ %attr(755,root,root) /etc/profile.d %attr(644,root,root) %verify(not md5 size mtime) /var/log/lastlog +%ghost /etc/sysconfig/bootloader + %exclude /etc/Makefile %exclude /etc/shells %exclude /etc/setup.spec %changelog +* Thu Dec 9 2004 Jaakko Heinonen +- add /etc/sysconfig/bootloader as %%ghost + * Tue Dec 7 2004 Jaakko Heinonen 2.2.5-10jh - add lmtp to /etc/services From svn at tinysofa.org Thu Dec 9 07:39:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 9 Dec 2004 02:39:25 -0500 (EST) Subject: [tinysofa-svn] r5189 - tinysofa/releases/1.1/mkinitrd/current/sources Message-ID: <20041209073925.C6AFD344168@minbar.tinysofa.org> Author: jh Date: 2004-12-09 02:39:18 -0500 (Thu, 09 Dec 2004) New Revision: 5189 Modified: tinysofa/releases/1.1/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-backwards-compat.patch Log: - check if /bin/mail is available Modified: tinysofa/releases/1.1/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-backwards-compat.patch =================================================================== --- tinysofa/releases/1.1/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-backwards-compat.patch 2004-12-09 06:46:20 UTC (rev 5188) +++ tinysofa/releases/1.1/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-backwards-compat.patch 2004-12-09 07:39:18 UTC (rev 5189) @@ -43,7 +43,7 @@ +} + +mailto(){ -+if [ "$MAILTO" != "" ]; then ++if [ "$MAILTO" != "" -a -x /bin/mail ]; then + if [ -f "$MAILFILE" ]; then + if [ -x /bin/hostname ]; then + HOSTNAME=$(/bin/hostname) @@ -51,7 +51,7 @@ + else + SUBJ='Kernel upgrade' + fi -+ cat $MAILFILE | mail -s "$SUBJ" $MAILTO > /dev/null 2>&1 ++ cat $MAILFILE | /bin/mail -s "$SUBJ" $MAILTO > /dev/null 2>&1 + else + echo "Could not find mail content: $MAILFILE" + fi From svn at tinysofa.org Fri Dec 10 12:39:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 10 Dec 2004 07:39:05 -0500 (EST) Subject: [tinysofa-svn] r5190 - in tinysofa/releases/1.1/nfs-utils/current: sources specs Message-ID: <20041210123905.9E27534416C@minbar.tinysofa.org> Author: jh Date: 2004-12-10 07:38:54 -0500 (Fri, 10 Dec 2004) New Revision: 5190 Added: tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.6-statd-SIGPIPE.patch Modified: tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec Log: - CAN-2004-1014 fix (nfs-utils-1.0.6-statd-SIGPIPE.patch) Added: tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.6-statd-SIGPIPE.patch =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.6-statd-SIGPIPE.patch 2004-12-09 07:39:18 UTC (rev 5189) +++ tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.6-statd-SIGPIPE.patch 2004-12-10 12:38:54 UTC (rev 5190) @@ -0,0 +1,19 @@ +=================================================================== +RCS file: /cvsroot/nfs/nfs-utils/utils/statd/statd.c,v +retrieving revision 1.17 +retrieving revision 1.18 +diff -u -r1.17 -r1.18 +--- nfs/nfs-utils/utils/statd/statd.c 2004/09/06 02:15:51 1.17 ++++ nfs/nfs-utils/utils/statd/statd.c 2004/12/03 03:32:44 1.18 +@@ -422,6 +422,11 @@ + signal(SIGUSR1, sigusr); + /* WARNING: the following works on Linux and SysV, but not BSD! */ + signal(SIGCHLD, SIG_IGN); ++ /* ++ * Ignore SIGPIPE to avoid statd dying when peers close their ++ * TCP connection while we're trying to reply to them. ++ */ ++ signal(SIGPIPE, SIG_IGN); + + /* initialize out_port */ + statd_get_socket(out_port); Modified: tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2004-12-09 07:39:18 UTC (rev 5189) +++ tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2004-12-10 12:38:54 UTC (rev 5190) @@ -3,7 +3,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.6 -Release: 7ts +Release: 8jh Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.6.tar.gz Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz Source10: nfs.init @@ -27,6 +27,7 @@ %endif Patch8: nfs-utils-1.0.6-pie.patch +Patch9: nfs-utils-1.0.6-statd-SIGPIPE.patch Group: main Obsoletes: nfs-server Obsoletes: knfsd @@ -73,6 +74,7 @@ %patch5 -p1 -b .zerostats %patch6 -p1 -b .mountd %patch8 -p1 -b .pie +%patch9 -p1 -b .sigpipe %ifarch s390 s390x perl -pi -e 's/-fpie/-fPIE/' */*/Makefile %endif @@ -217,6 +219,9 @@ %changelog +* Fri Dec 10 2004 Jaakko Heinonen 1.0.6-8jh +- CAN-2004-1014 fix (nfs-utils-1.0.6-statd-SIGPIPE.patch) + * Sat Sep 04 2004 tsintegrate 1.0.6-7ts - current (1.0.6-7jh) integrated as 1.0.6-7ts for release 1.1-U1 From svn at tinysofa.org Fri Dec 10 12:41:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 10 Dec 2004 07:41:52 -0500 (EST) Subject: [tinysofa-svn] r5191 - tinysofa/releases/1.1/nfs-utils/current/sources Message-ID: <20041210124152.7F63334416C@minbar.tinysofa.org> Author: jh Date: 2004-12-10 07:41:45 -0500 (Fri, 10 Dec 2004) New Revision: 5191 Modified: tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.6-statd-SIGPIPE.patch Log: - polish patch Modified: tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.6-statd-SIGPIPE.patch =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.6-statd-SIGPIPE.patch 2004-12-10 12:38:54 UTC (rev 5190) +++ tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.6-statd-SIGPIPE.patch 2004-12-10 12:41:45 UTC (rev 5191) @@ -1,10 +1,5 @@ -=================================================================== -RCS file: /cvsroot/nfs/nfs-utils/utils/statd/statd.c,v -retrieving revision 1.17 -retrieving revision 1.18 -diff -u -r1.17 -r1.18 ---- nfs/nfs-utils/utils/statd/statd.c 2004/09/06 02:15:51 1.17 -+++ nfs/nfs-utils/utils/statd/statd.c 2004/12/03 03:32:44 1.18 +--- nfs-utils/utils/statd/statd.c 2004/09/06 02:15:51 1.17 ++++ nfs-utils/utils/statd/statd.c 2004/12/03 03:32:44 1.18 @@ -422,6 +422,11 @@ signal(SIGUSR1, sigusr); /* WARNING: the following works on Linux and SysV, but not BSD! */ From svn at tinysofa.org Sat Dec 11 19:01:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 11 Dec 2004 14:01:57 -0500 (EST) Subject: [tinysofa-svn] r5192 - tinysofa/releases/1.1/cups/current/specs Message-ID: <20041211190157.88AFD344179@minbar.tinysofa.org> Author: jh Date: 2004-12-11 14:01:50 -0500 (Sat, 11 Dec 2004) New Revision: 5192 Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec Log: - mark mime.convs and mime.types as %%config(noreplace) Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-12-10 12:41:45 UTC (rev 5191) +++ tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-12-11 19:01:50 UTC (rev 5192) @@ -1,7 +1,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.21 -Release: 3jh +Release: 4jh License: GPL Group: main Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2 @@ -61,6 +61,7 @@ The cups-libs package provides libraries used by applications to use CUPS natively, without needing the lp/lpr commands. + %prep %setup -q %patch0 -p1 -b .noinit @@ -78,6 +79,7 @@ cp %{SOURCE5} cups-lpd.real perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real + %build %configure --with-docdir=%{_docdir}/cups-%{version} --localstatedir=%{_var} perl -pi -e "s,^DSO =.*,DSO=gcc -fpic," Makedefs @@ -85,6 +87,7 @@ # If we got this far, all prerequisite libraries must be here. make OPTIM="$RPM_OPT_FLAGS $CFLAGS -fpic" + %install mkdir -p $RPM_BUILD_ROOT%{_initrddir} @@ -131,6 +134,7 @@ # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? + %post %service_post cups @@ -150,7 +154,6 @@ %postun %service_postun cups - %triggerin -- samba-client ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || : exit 0 @@ -159,22 +162,24 @@ [ $2 = 0 ] || exit 0 rm -f %{_libdir}/cups/backend/smb + %clean %clean_buildroot + %files %defattr(-,root,root) -%dir %attr(0755,lp,sys) /etc/cups -%dir %attr(0711,lp,sys) /etc/cups/certs -%config(noreplace) %attr(0600,lp,sys) /etc/cups/classes.conf -%config(noreplace) %attr(0600,lp,sys) /etc/cups/cupsd.conf -%config(noreplace) %attr(0600,lp,sys) /etc/cups/printers.conf -%config(noreplace) /etc/cups/client.conf -/etc/cups/interfaces -/etc/cups/mime.types -/etc/cups/mime.convs -%dir %attr(0755,lp,sys) /etc/cups/ppd -%config(noreplace) /etc/pam.d/cups +%dir %attr(0755,lp,sys) %{_sysconfdir}/cups +%dir %attr(0711,lp,sys) %{_sysconfdir}/cups/certs +%config(noreplace) %attr(0600,lp,sys) %{_sysconfdir}/cups/classes.conf +%config(noreplace) %attr(0600,lp,sys) %{_sysconfdir}/cups/cupsd.conf +%config(noreplace) %attr(0600,lp,sys) %{_sysconfdir}/cups/printers.conf +%config(noreplace) %{_sysconfdir}/cups/client.conf +%{_sysconfdir}/cups/interfaces +%config(noreplace) %{_sysconfdir}/cups/mime.types +%config(noreplace) %{_sysconfdir}/cups/mime.convs +%dir %attr(0755,lp,sys) %{_sysconfdir}/cups/ppd +%config(noreplace) %{_sysconfdir}/pam.d/cups %doc %{_docdir}/cups-%{version} %config %{_initrddir}/cups %{_bindir}/cancel* @@ -206,8 +211,12 @@ %attr(644,root,root) %{_libdir}/*.a %{_includedir}/cups + %changelog -* Wed Oct 27 2004 Jaakko Heinonen 1.1.22-3jh +* Sat Dec 11 2004 Jaakko Heinonen 1.1.21-4jh +- mark mime.convs and mime.types as %%config(noreplace) + +* Wed Oct 27 2004 Jaakko Heinonen 1.1.21-3jh - add 1.1.22rc2 patch, which fixes CAN-2004-0888 and CAN-2004-0923 - add pie patch From svn at tinysofa.org Mon Dec 13 07:45:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 13 Dec 2004 02:45:20 -0500 (EST) Subject: [tinysofa-svn] r5193 - tinysofa/releases/1.1/anaconda/current/specs Message-ID: <20041213074520.35CF334418D@minbar.tinysofa.org> Author: jh Date: 2004-12-13 02:45:13 -0500 (Mon, 13 Dec 2004) New Revision: 5193 Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - add more requirements to runtime package - remove x86_64 from exclusivearch Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-12-11 19:01:50 UTC (rev 5192) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-12-13 07:45:13 UTC (rev 5193) @@ -1,8 +1,8 @@ # The modutils tarball should be kept in track with modutils.src.rpm -ExclusiveArch: i386 i586 +ExclusiveArch: %{ix86} Name: anaconda Version: 1.1.7 -Release: 1jh +Release: 2jh Epoch: 1 License: GPL Summary: The tinysofa installation program. @@ -31,6 +31,7 @@ Summary: tinysofa installer portions needed only for fresh installs. Group: development Requires: hwdata >= 0.44, dosfstools, cramfsprogs, cpio, rpm +Requires: mkisofs %description runtime The anaconda-runtime package contains parts of the tinysofa @@ -161,6 +162,10 @@ %changelog +* Wed Nov 3 2004 Jaakko Heinonen 1.1.7-2jh +- add more requirements to runtime package +- remove x86_64 from exclusivearch + * Sat Sep 04 2004 tsintegrate 1.1.6-1ts - current (1.1.6-1jh) integrated as 1.1.6-1ts for release 1.1-U1 From svn at tinysofa.org Mon Dec 13 09:23:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 13 Dec 2004 04:23:15 -0500 (EST) Subject: [tinysofa-svn] r5194 - tinysofa/releases/1.1/db4/current/specs Message-ID: <20041213092315.3316434418C@minbar.tinysofa.org> Author: jh Date: 2004-12-13 04:23:07 -0500 (Mon, 13 Dec 2004) New Revision: 5194 Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec Log: - run ldconfig for java package Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec =================================================================== --- tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-12-13 07:45:13 UTC (rev 5193) +++ tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-12-13 09:23:07 UTC (rev 5194) @@ -316,7 +316,11 @@ %postun -p /sbin/ldconfig +%post -p /sbin/ldconfig java +%postun -p /sbin/ldconfig java + + %files %defattr(-,root,root) %doc LICENSE README docs/images @@ -373,6 +377,9 @@ %changelog +* Mon Dec 13 2004 Jaakko Heinonen +- run ldconfig for java package + * Sun Nov 14 2004 Jaakko Heinonen 4.2.52-5jh - fix mutex usage with non-nptl version From svn at tinysofa.org Mon Dec 13 19:55:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 13 Dec 2004 14:55:24 -0500 (EST) Subject: [tinysofa-svn] r5195 - tinysofa/misc/comps/releases/1.2 Message-ID: <20041213195524.738A73441AC@minbar.tinysofa.org> Author: jh Date: 2004-12-13 14:55:17 -0500 (Mon, 13 Dec 2004) New Revision: 5195 Modified: tinysofa/misc/comps/releases/1.2/comps.xml Log: - add base group (needed by anaconda) - clean up groups - add i18n group Modified: tinysofa/misc/comps/releases/1.2/comps.xml =================================================================== --- tinysofa/misc/comps/releases/1.2/comps.xml 2004-12-13 09:23:07 UTC (rev 5194) +++ tinysofa/misc/comps/releases/1.2/comps.xml 2004-12-13 19:55:17 UTC (rev 5195) @@ -13,34 +13,25 @@ ash bash beecrypt - bzip2 bzip2-libs chkconfig coreutils cpio cracklib cracklib-dicts - crontabs dev db4 - diffutils e2fsprogs elfutils-libelf ed etcskel - expat-libs - fcron - file filesystem findutils ftp htmlinfo - gdbm glib glibc glibc-common - gmp - gnupg grep groff gzip @@ -51,15 +42,13 @@ iputils kbd kernel - kudzu - less + kudzu libgcc libtermcap libuser login logrotate losetup - mailx man mdadm mkinitrd @@ -70,14 +59,10 @@ net-tools newt ncurses - openssl - openldap-libs pam passwd pciutils popt - portmap - postfix procps psacct psmisc @@ -85,42 +70,65 @@ readline release rootfiles - rmt rpm - sash sed setup sharutils slang sysklogd sysvinit - tar - tcp_wrappers termcap - tmpwatch tzdata util-linux vim - wget - which words ypbind-mt authconfig - kudzu shadow-utils - apt zlib + base + Additional Basic Utilities + These packages include a minimal set of packages. Useful for c +reating small router/firewall boxes, for example. + false + true + + core + + + apt + bzip2 + diffutils + crontabs + fcron + file + gnupg + hdparm + kudzu + less + postfix + sash + tcp_wrappers + tar + tmpwatch + wget + which + + + + + localutils Commonly used local utilities These packages include a set of commonly used local utilities. true true - core + base bc @@ -130,16 +138,15 @@ perl gdbm groff-perl - hdparm lsof mt-st ostat slocate sudo - sysstat - tcsh + sysstat + tcsh vim-syntax - vim-tools + vim-tools zip unzip syslinux @@ -154,7 +161,7 @@ true true - core + base bind-libs @@ -168,7 +175,10 @@ nc lftp openssh-clients + openssl perl + portmap + nfs-utils rdate rsync stunnel @@ -180,12 +190,218 @@ + i18n + I18n support + National language (locale) support for GNU C library. + true + + base + + + glibc-i18n-common + glibc-i18n-en_US + glibc-i18n-aa_DJ + glibc-i18n-aa_ER + glibc-i18n-aa_ET + glibc-i18n-af_ZA + glibc-i18n-am_ET + glibc-i18n-an_ES + glibc-i18n-ar_AE + glibc-i18n-ar_BH + glibc-i18n-ar_DZ + glibc-i18n-ar_EG + glibc-i18n-ar_IN + glibc-i18n-ar_IQ + glibc-i18n-ar_JO + glibc-i18n-ar_KW + glibc-i18n-ar_LB + glibc-i18n-ar_LY + glibc-i18n-ar_MA + glibc-i18n-ar_OM + glibc-i18n-ar_QA + glibc-i18n-ar_SA + glibc-i18n-ar_SD + glibc-i18n-ar_SY + glibc-i18n-ar_TN + glibc-i18n-ar_YE + glibc-i18n-az_AZ + glibc-i18n-bg_BG + glibc-i18n-bn_BD + glibc-i18n-bn_IN + glibc-i18n-br_FR + glibc-i18n-bs_BA + glibc-i18n-byn_ER + glibc-i18n-cy_GB + glibc-i18n-da + glibc-i18n-da_DK + glibc-i18n-el + glibc-i18n-el_GR + glibc-i18n-en_AU + glibc-i18n-en_BW + glibc-i18n-en_CA + glibc-i18n-en_DK + glibc-i18n-en_GB + glibc-i18n-en_HK + glibc-i18n-en_IE + glibc-i18n-en_IN + glibc-i18n-en_NZ + glibc-i18n-en_PH + glibc-i18n-en_SG + glibc-i18n-en_ZA + glibc-i18n-en_ZW + glibc-i18n-et_EE + glibc-i18n-eu_ES + glibc-i18n-fa_IR + glibc-i18n-fi + glibc-i18n-fi_FI + glibc-i18n-fo_FO + glibc-i18n-ga_IE + glibc-i18n-gd_GB + glibc-i18n-gez_ER + glibc-i18n-gez_ET + glibc-i18n-gu_IN + glibc-i18n-gv_GB + glibc-i18n-he_IL + glibc-i18n-hi_IN + glibc-i18n-hr + glibc-i18n-hr_HR + glibc-i18n-hy_AM + glibc-i18n-id_ID + glibc-i18n-is_IS + glibc-i18n-iw_IL + glibc-i18n-ja + glibc-i18n-ja_JP + glibc-i18n-ka_GE + glibc-i18n-kk_KZ + glibc-i18n-kl_GL + glibc-i18n-kn_IN + glibc-i18n-ko + glibc-i18n-ko_KR + glibc-i18n-kw_GB + glibc-i18n-lg_UG + glibc-i18n-lo_LA + glibc-i18n-lt_LT + glibc-i18n-lv_LV + glibc-i18n-mi_NZ + glibc-i18n-mk_MK + glibc-i18n-ml_IN + glibc-i18n-mn_MN + glibc-i18n-mr_IN + glibc-i18n-ms_MY + glibc-i18n-mt_MT + glibc-i18n-ne_NP + glibc-i18n-nl + glibc-i18n-nl_BE + glibc-i18n-nl_NL + glibc-i18n-nn_NO + glibc-i18n-no_NO + glibc-i18n-oc_FR + glibc-i18n-om_ET + glibc-i18n-om_KE + glibc-i18n-pa_IN + glibc-i18n-pt_BR + glibc-i18n-pt_PT + glibc-i18n-ro_RO + glibc-i18n-ru_RU + glibc-i18n-ru_UA + glibc-i18n-se_NO + glibc-i18n-sid_ET + glibc-i18n-sl_SI + glibc-i18n-so_DJ + glibc-i18n-so_ET + glibc-i18n-so_KE + glibc-i18n-so_SO + glibc-i18n-sq_AL + glibc-i18n-st_ZA + glibc-i18n-sv + glibc-i18n-sv_FI + glibc-i18n-sv_SE + glibc-i18n-ta_IN + glibc-i18n-te_IN + glibc-i18n-tg_TJ + glibc-i18n-th_TH + glibc-i18n-ti_ER + glibc-i18n-ti_ET + glibc-i18n-tig_ER + glibc-i18n-tl_PH + glibc-i18n-tr + glibc-i18n-tr_TR + glibc-i18n-tt_RU + glibc-i18n-uk_UA + glibc-i18n-ur_PK + glibc-i18n-uz_UZ + glibc-i18n-vi_VN + glibc-i18n-wa_BE + glibc-i18n-wal_ET + glibc-i18n-xh_ZA + glibc-i18n-yi_US + glibc-i18n-zh_CN + glibc-i18n-zh_HK + glibc-i18n-zh_SG + glibc-i18n-zh_TW + glibc-i18n-zu_ZA + glibc-i18n-be + glibc-i18n-be_BY + glibc-i18n-ca + glibc-i18n-ca_ES + glibc-i18n-cs + glibc-i18n-cs_CZ + glibc-i18n-de + glibc-i18n-de_AT + glibc-i18n-de_BE + glibc-i18n-de_CH + glibc-i18n-de_DE + glibc-i18n-de_LU + glibc-i18n-es + glibc-i18n-es_AR + glibc-i18n-es_BO + glibc-i18n-es_CL + glibc-i18n-es_CO + glibc-i18n-es_CR + glibc-i18n-es_DO + glibc-i18n-es_EC + glibc-i18n-es_ES + glibc-i18n-es_GT + glibc-i18n-es_HN + glibc-i18n-es_MX + glibc-i18n-es_NI + glibc-i18n-es_PA + glibc-i18n-es_PE + glibc-i18n-es_PR + glibc-i18n-es_PY + glibc-i18n-es_SV + glibc-i18n-es_US + glibc-i18n-es_UY + glibc-i18n-es_VE + glibc-i18n-fr + glibc-i18n-fr_BE + glibc-i18n-fr_CA + glibc-i18n-fr_CH + glibc-i18n-fr_FR + glibc-i18n-fr_LU + glibc-i18n-gl + glibc-i18n-gl_ES + glibc-i18n-hu + glibc-i18n-hu_HU + glibc-i18n-it + glibc-i18n-it_CH + glibc-i18n-it_IT + glibc-i18n-nb + glibc-i18n-nb_NO + glibc-i18n-pl + glibc-i18n-pl_PL + glibc-i18n-sk + glibc-i18n-sk_SK + + + + development Development Tools for software development. true - core + base autoconf @@ -226,7 +442,7 @@ > true - core + base netatalk @@ -236,11 +452,10 @@ imap-server IMAP Server (dovecot) - These packages allow you to configure an IMAP server. + These packages allow you to configure an IMAP server. true - core + base dovecot @@ -250,11 +465,10 @@ dhcp-server DHCP Server (ISC DHCP) - These packages allow you to configure the ISC DHCP server. + These packages allow you to configure the ISC DHCP server. true - core + base dhcp-server @@ -264,11 +478,10 @@ ldap-server LDAP Server (OpenLDAP) - These packages allow you to configure the OpenLDAP server. + These packages allow you to configure the OpenLDAP server. true - core + base openldap-servers @@ -278,11 +491,10 @@ tftp-server TFTP Server (tftp-hpa) - These packages allow you to configure the TFTP server. + These packages allow you to configure the TFTP server. true - core + base tftp-server @@ -292,11 +504,10 @@ nis-server NIS Server (ypserv) - These packages allow you to configure the NIS server. + These packages allow you to configure the NIS server. true - core + base ypserv @@ -310,7 +521,7 @@ MS Windows(tm) systems. true - core + base samba-client @@ -321,11 +532,10 @@ ftp-server FTP Server (vsftpd) - These tools allow you to run an FTP server on the system. + These tools allow you to run an FTP server on the system. true - core + base vsftpd @@ -339,7 +549,7 @@ true true - core + base openssh-server From svn at tinysofa.org Tue Dec 14 05:23:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 14 Dec 2004 00:23:22 -0500 (EST) Subject: [tinysofa-svn] r5196 - tinysofa/misc/comps/releases/1.2 Message-ID: <20041214052322.0FF2D3441AC@minbar.tinysofa.org> Author: jh Date: 2004-12-14 00:23:14 -0500 (Tue, 14 Dec 2004) New Revision: 5196 Modified: tinysofa/misc/comps/releases/1.2/comps.xml Log: - mark glibc-i18n-en_US as default Modified: tinysofa/misc/comps/releases/1.2/comps.xml =================================================================== --- tinysofa/misc/comps/releases/1.2/comps.xml 2004-12-13 19:55:17 UTC (rev 5195) +++ tinysofa/misc/comps/releases/1.2/comps.xml 2004-12-14 05:23:14 UTC (rev 5196) @@ -199,7 +199,7 @@ glibc-i18n-common - glibc-i18n-en_US + glibc-i18n-en_US glibc-i18n-aa_DJ glibc-i18n-aa_ER glibc-i18n-aa_ET From svn at tinysofa.org Tue Dec 14 05:32:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 14 Dec 2004 00:32:35 -0500 (EST) Subject: [tinysofa-svn] r5197 - tinysofa/misc/comps/releases/1.2 Message-ID: <20041214053235.2858C3441B0@minbar.tinysofa.org> Author: jh Date: 2004-12-14 00:32:28 -0500 (Tue, 14 Dec 2004) New Revision: 5197 Modified: tinysofa/misc/comps/releases/1.2/comps.xml Log: - move sharutils to localutils Modified: tinysofa/misc/comps/releases/1.2/comps.xml =================================================================== --- tinysofa/misc/comps/releases/1.2/comps.xml 2004-12-14 05:23:14 UTC (rev 5196) +++ tinysofa/misc/comps/releases/1.2/comps.xml 2004-12-14 05:32:28 UTC (rev 5197) @@ -73,7 +73,6 @@ rpm sed setup - sharutils slang sysklogd sysvinit @@ -149,6 +148,7 @@ vim-tools zip unzip + sharutils syslinux dosfstools From svn at tinysofa.org Tue Dec 14 15:01:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 14 Dec 2004 10:01:31 -0500 (EST) Subject: [tinysofa-svn] r5198 - in contrib/1.1/dnsmasq/current: sources specs Message-ID: <20041214150131.AE9193441AC@minbar.tinysofa.org> Author: gda Date: 2004-12-14 10:01:10 -0500 (Tue, 14 Dec 2004) New Revision: 5198 Added: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.19.tar.gz Removed: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.18.tar.gz Modified: contrib/1.1/dnsmasq/current/specs/dnsmasq.spec Log: new upstream Deleted: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.18.tar.gz =================================================================== (Binary files differ) Added: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.19.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.1/dnsmasq/current/sources/dnsmasq-2.19.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/dnsmasq/current/specs/dnsmasq.spec =================================================================== --- contrib/1.1/dnsmasq/current/specs/dnsmasq.spec 2004-12-14 05:32:28 UTC (rev 5197) +++ contrib/1.1/dnsmasq/current/specs/dnsmasq.spec 2004-12-14 15:01:10 UTC (rev 5198) @@ -1,6 +1,6 @@ Summary: A lightweight caching nameserver Name: dnsmasq -Version: 2.18 +Version: 2.19 Release: 1gd Group: contrib Source: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz @@ -25,11 +25,10 @@ %build -CFLAGS="$RPM_OPT_FLAGS" make +%make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p -m 755 $RPM_BUILD_ROOT%{_initrddir} mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir} @@ -63,6 +62,9 @@ %changelog +* Tue Dec 14 2004 Gerald Dachs 2.19-1gd +- new upstream version + * Sun Nov 28 2004 Gerald Dachs 2.18-1gd - new upstream version From svn at tinysofa.org Tue Dec 14 16:01:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 14 Dec 2004 11:01:03 -0500 (EST) Subject: [tinysofa-svn] r5199 - in contrib/1.1/sylpheed/current: sources specs Message-ID: <20041214160103.4D5BF3441AC@minbar.tinysofa.org> Author: gda Date: 2004-12-14 10:58:26 -0500 (Tue, 14 Dec 2004) New Revision: 5199 Added: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0beta4.tar.bz2 Removed: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0beta1.tar.bz2 Modified: contrib/1.1/sylpheed/current/specs/sylpheed.spec Log: new upstream Deleted: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0beta1.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0beta4.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0beta4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/sylpheed/current/specs/sylpheed.spec =================================================================== --- contrib/1.1/sylpheed/current/specs/sylpheed.spec 2004-12-14 15:01:10 UTC (rev 5198) +++ contrib/1.1/sylpheed/current/specs/sylpheed.spec 2004-12-14 15:58:26 UTC (rev 5199) @@ -1,6 +1,6 @@ Summary: a GTK+ based, lightweight, and fast e-mail client Name: sylpheed -Version: 1.0.0beta1 +Version: 1.0.0beta4 Release: 1gd Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 Copyright: GPL @@ -56,6 +56,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Tue Dec 14 2004 Gerald Dachs 1.0.0beta4-1gd +- 1.0.0beta4 + * Sat Oct 30 2004 Gerald Dachs 1.0.0beta1-1gd - 1.0.0beta1 From svn at tinysofa.org Wed Dec 15 09:10:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 04:10:54 -0500 (EST) Subject: [tinysofa-svn] r5200 - in contrib/1.1/imlib/current: sources specs Message-ID: <20041215091054.8F46534425D@minbar.tinysofa.org> Author: jh Date: 2004-12-15 04:10:45 -0500 (Wed, 15 Dec 2004) New Revision: 5200 Added: contrib/1.1/imlib/current/sources/imlib-1.9.14-sec2.patch Modified: contrib/1.1/imlib/current/specs/imlib.spec Log: - CAN-2004-1026, integer overflow within the image decoding routines Added: contrib/1.1/imlib/current/sources/imlib-1.9.14-sec2.patch =================================================================== --- contrib/1.1/imlib/current/sources/imlib-1.9.14-sec2.patch 2004-12-14 15:58:26 UTC (rev 5199) +++ contrib/1.1/imlib/current/sources/imlib-1.9.14-sec2.patch 2004-12-15 09:10:45 UTC (rev 5200) @@ -0,0 +1,510 @@ +diff -urN imlib-1.9.13.orig/Imlib/load.c imlib-1.9.13/Imlib/load.c +--- imlib-1.9.13.orig/Imlib/load.c Wed Mar 13 19:06:29 2002 ++++ imlib-1.9.13/Imlib/load.c Thu Sep 16 17:21:01 2004 +@@ -4,6 +4,8 @@ + #include "Imlib_private.h" + #include + ++#define G_MAXINT ((int) 0x7fffffff) ++ + /* Split the ID - damages input */ + + static char * +@@ -41,13 +43,17 @@ + + /* + * Make sure we don't wrap on our memory allocations ++ * we check G_MAXINT/4 because rend.c malloc's w * h * bpp ++ * + 3 is safety margin + */ + + void * _imlib_malloc_image(unsigned int w, unsigned int h) + { +- if( w > 32767 || h > 32767) +- return NULL; +- return malloc(w * h * 3); ++ if (w <= 0 || w > 32767 || ++ h <= 0 || h > 32767 || ++ h >= (G_MAXINT/4 - 1) / w) ++ return NULL; ++ return malloc(w * h * 3 + 3); + } + + #ifdef HAVE_LIBJPEG +@@ -360,7 +366,9 @@ + npix = ww * hh; + *w = (int)ww; + *h = (int)hh; +- if(ww > 32767 || hh > 32767) ++ if (ww <= 0 || ww > 32767 || ++ hh <= 0 || hh > 32767 || ++ hh >= (G_MAXINT/sizeof(uint32)) / ww) + { + TIFFClose(tif); + return NULL; +@@ -463,7 +471,7 @@ + } + *w = gif->Image.Width; + *h = gif->Image.Height; +- if (*h > 32767 || *w > 32767) ++ if (*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) + { + return NULL; + } +@@ -965,7 +973,12 @@ + comment = 0; + quote = 0; + context = 0; ++ memset(lookup, 0, sizeof(lookup)); ++ + line = malloc(lsz); ++ if (!line) ++ return NULL; ++ + while (!done) + { + pc = c; +@@ -994,25 +1007,25 @@ + { + /* Header */ + sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "IMLIB ERROR: XPM files wth colors > 32766 not supported\n"); + free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n"); + free(line); + return NULL; + } +- if (*w > 32767) ++ if (*w <= 0 || *w > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); + free(line); + return NULL; + } +- if (*h > 32767) ++ if (*h <= 0 || *h > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); + free(line); +@@ -1045,11 +1058,13 @@ + { + int slen; + int hascolor, iscolor; ++ int space; + + iscolor = 0; + hascolor = 0; + tok[0] = 0; + col[0] = 0; ++ space = sizeof(col) - 1; + s[0] = 0; + len = strlen(line); + strncpy(cmap[j].str, line, cpp); +@@ -1072,10 +1087,10 @@ + { + if (k >= len) + { +- if (col[0]) +- strcat(col, " "); +- if (strlen(col) + strlen(s) < sizeof(col)) +- strcat(col, s); ++ if (col[0] && space > 0) ++ strcat(col, " "), space -= 1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + if (col[0]) + { +@@ -1105,14 +1120,17 @@ + } + } + } +- strcpy(tok, s); ++ if (slen < sizeof(tok)); ++ strcpy(tok, s); + col[0] = 0; ++ space = sizeof(col) - 1; + } + else + { +- if (col[0]) +- strcat(col, " "); +- strcat(col, s); ++ if (col[0] && space > 0) ++ strcat(col, " "), space -=1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + } + } +@@ -1341,12 +1359,12 @@ + sscanf(s, "%i %i", w, h); + a = *w; + b = *h; +- if (a > 32767) ++ if (a <= 0 || a > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); + return NULL; + } +- if (b > 32767) ++ if (b <= 0 || b > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); + return NULL; +diff -urN imlib-1.9.13.orig/Imlib/utils.c imlib-1.9.13/Imlib/utils.c +--- imlib-1.9.13.orig/Imlib/utils.c Mon Mar 4 17:45:28 2002 ++++ imlib-1.9.13/Imlib/utils.c Thu Sep 16 17:21:15 2004 +@@ -1496,36 +1496,56 @@ + context = 0; + ptr = NULL; + end = NULL; ++ memset(lookup, 0, sizeof(lookup)); + + while (!done) + { + line = data[count++]; ++ if (!line) ++ break; ++ line = strdup(line); ++ if (!line) ++ break; ++ len = strlen(line); ++ for (i = 0; i < len; ++i) ++ { ++ c = line[i]; ++ if (c < 32) ++ line[i] = 32; ++ else if (c > 127) ++ line[i] = 127; ++ } ++ + if (context == 0) + { + /* Header */ + sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "IMLIB ERROR: XPM data wth colors > 32766 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "IMLIB ERROR: XPM data with characters per pixel > 5 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (w > 32767) ++ if (w <= 0 || w > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } +- if (h > 32767) ++ if (h <= 0 || h > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } + cmap = malloc(sizeof(struct _cmap) * ncolors); +@@ -1533,6 +1553,7 @@ + if (!cmap) + { + free(im); ++ free(line); + return NULL; + } + im->rgb_width = w; +@@ -1542,6 +1563,7 @@ + { + free(cmap); + free(im); ++ free(line); + return NULL; + } + im->alpha_data = NULL; +@@ -1817,6 +1839,7 @@ + } + if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) + done = 1; ++ free(line); + } + if (!transp) + { +diff -urN imlib-1.9.13.orig/gdk_imlib/io-gif.c imlib-1.9.13/gdk_imlib/io-gif.c +--- imlib-1.9.13.orig/gdk_imlib/io-gif.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-gif.c Thu Sep 16 16:11:31 2004 +@@ -55,7 +55,7 @@ + } + *w = gif->Image.Width; + *h = gif->Image.Height; +- if(*h > 32767 || *w > 32767) ++ if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) + { + return NULL; + } +diff -urN imlib-1.9.13.orig/gdk_imlib/io-ppm.c imlib-1.9.13/gdk_imlib/io-ppm.c +--- imlib-1.9.13.orig/gdk_imlib/io-ppm.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-ppm.c Thu Sep 16 16:13:13 2004 +@@ -53,12 +53,12 @@ + sscanf(s, "%i %i", w, h); + a = *w; + b = *h; +- if (a > 32767) ++ if (a <= 0 || a > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); + return NULL; + } +- if (b > 32767) ++ if (b <= 0 || b > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); + return NULL; +diff -urN imlib-1.9.13.orig/gdk_imlib/io-tiff.c imlib-1.9.13/gdk_imlib/io-tiff.c +--- imlib-1.9.13.orig/gdk_imlib/io-tiff.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-tiff.c Thu Sep 16 16:13:57 2004 +@@ -36,7 +36,9 @@ + npix = ww * hh; + *w = (int)ww; + *h = (int)hh; +- if(ww > 32767 || hh > 32767) ++ if (ww <= 0 || ww > 32767 || ++ hh <= 0 || hh > 32767 || ++ hh >= (G_MAXINT/sizeof(uint32)) / ww) + { + TIFFClose(tif); + return NULL; +diff -urN imlib-1.9.13.orig/gdk_imlib/io-xpm.c imlib-1.9.13/gdk_imlib/io-xpm.c +--- imlib-1.9.13.orig/gdk_imlib/io-xpm.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-xpm.c Thu Sep 16 17:08:24 2004 +@@ -40,8 +40,12 @@ + context = 0; + i = j = 0; + cmap = NULL; ++ memset(lookup, 0, sizeof(lookup)); + + line = malloc(lsz); ++ if (!line) ++ return NULL; ++ + while (!done) + { + pc = c; +@@ -70,25 +74,25 @@ + { + /* Header */ + sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "gdk_imlib ERROR: XPM files wth colors > 32766 not supported\n"); + free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "gdk_imlib ERROR: XPM files with characters per pixel > 5 not supported\n"); + free(line); + return NULL; + } +- if (*w > 32767) ++ if (*w <= 0 || *w > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); + free(line); + return NULL; + } +- if (*h > 32767) ++ if (*h <= 0 || *h > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); + free(line); +@@ -120,11 +124,13 @@ + { + int slen; + int hascolor, iscolor; ++ int space; + + hascolor = 0; + iscolor = 0; + tok[0] = 0; + col[0] = 0; ++ space = sizeof(col) - 1; + s[0] = 0; + len = strlen(line); + strncpy(cmap[j].str, line, cpp); +@@ -147,10 +153,10 @@ + { + if (k >= len) + { +- if (col[0]) +- strcat(col, " "); +- if (strlen(col) + strlen(s) < sizeof(col)) +- strcat(col, s); ++ if (col[0] && space > 0) ++ strncat(col, " ", space), space -= 1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + if (col[0]) + { +@@ -180,14 +186,17 @@ + } + } + } +- strcpy(tok, s); ++ if (slen < sizeof(tok)) ++ strcpy(tok, s); + col[0] = 0; ++ space = sizeof(col) - 1; + } + else + { +- if (col[0]) +- strcat(col, " "); +- strcat(col, s); ++ if (col[0] && space > 0) ++ strcat(col, " "), space -= 1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + } + } +diff -urN imlib-1.9.13.orig/gdk_imlib/misc.c imlib-1.9.13/gdk_imlib/misc.c +--- imlib-1.9.13.orig/gdk_imlib/misc.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/misc.c Thu Sep 16 16:35:32 2004 +@@ -1355,11 +1355,16 @@ + + /* + * Make sure we don't wrap on our memory allocations ++ * we check G_MAX_INT/4 because rend.c malloc's w * h * bpp ++ * + 3 is safety margin + */ + + void *_gdk_malloc_image(unsigned int w, unsigned int h) + { +- if( w > 32767 || h > 32767) ++ if (w <= 0 || w > 32767 || ++ h <= 0 || h > 32767 || ++ h >= (G_MAXINT/4 - 1) / w) + return NULL; +- return malloc(w * h * 3); ++ return malloc(w * h * 3 + 3); + } ++ +diff -urN imlib-1.9.13.orig/gdk_imlib/utils.c imlib-1.9.13/gdk_imlib/utils.c +--- imlib-1.9.13.orig/gdk_imlib/utils.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/utils.c Thu Sep 16 17:28:35 2004 +@@ -1236,36 +1236,56 @@ + context = 0; + ptr = NULL; + end = NULL; ++ memset(lookup, 0, sizeof(lookup)); + + while (!done) + { + line = data[count++]; ++ if (!line) ++ break; ++ line = strdup(line); ++ if (!line) ++ break; ++ len = strlen(line); ++ for (i = 0; i < len; ++i) ++ { ++ c = line[i]; ++ if (c < 32) ++ line[i] = 32; ++ else if (c > 127) ++ line[i] = 127; ++ } ++ + if (context == 0) + { + /* Header */ + sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "gdk_imlib ERROR: XPM data wth colors > 32766 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "gdk_imlib ERROR: XPM data with characters per pixel > 5 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (w > 32767) ++ if (w <= 0 || w > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } +- if (h > 32767) ++ if (h <= 0 || h > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } + cmap = malloc(sizeof(struct _cmap) * ncolors); +@@ -1273,6 +1293,7 @@ + if (!cmap) + { + free(im); ++ free(line); + return NULL; + } + im->rgb_width = w; +@@ -1282,6 +1303,7 @@ + { + free(cmap); + free(im); ++ free(line); + return NULL; + } + im->alpha_data = NULL; +@@ -1355,7 +1377,7 @@ + strcpy(col + colptr, " "); + colptr++; + } +- if (colptr + ls <= sizeof(col)) ++ if (colptr + ls < sizeof(col)) + { + strcpy(col + colptr, s); + colptr += ls; +@@ -1558,6 +1580,7 @@ + } + if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) + done = 1; ++ free(line); + } + if (!transp) + { Modified: contrib/1.1/imlib/current/specs/imlib.spec =================================================================== --- contrib/1.1/imlib/current/specs/imlib.spec 2004-12-14 15:58:26 UTC (rev 5199) +++ contrib/1.1/imlib/current/specs/imlib.spec 2004-12-15 09:10:45 UTC (rev 5200) @@ -1,11 +1,12 @@ Summary: Imlib is an advanced replacement library for libraries like libXpm Name: imlib Version: 1.9.14 -Release: 2jh +Release: 3jh License: GPL Group: contrib Source0: http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/%{name}-%{version}.tar.bz2 Patch0: imlib-1.9.14-bounds.patch +Patch1: imlib-1.9.14-sec2.patch BuildRequires: libtiff-devel libjpeg-devel libungif-devel glib12 glib12-devel BuildRequires: gtk12+ gtk12+-devel xorg-x11-devel libpng-devel Requires: libtiff libjpeg libungif glib12 gtk12+ xorg-x11-libs @@ -31,6 +32,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure @@ -66,6 +68,9 @@ %changelog +* Wed Dec 15 2004 Jaakko Heinonen 1.9.14-3jh +- CAN-2004-1026, integer overflow within the image decoding routines + * Thu Sep 16 2004 Jaakko Heinonen 1.9.14-2jh - correct -devel requirements - fix %defattr From svn at tinysofa.org Wed Dec 15 11:20:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 06:20:55 -0500 (EST) Subject: [tinysofa-svn] r5201 - in contrib/1.1/lesstif/current: sources specs Message-ID: <20041215112055.95DBC344261@minbar.tinysofa.org> Author: jh Date: 2004-12-15 06:19:55 -0500 (Wed, 15 Dec 2004) New Revision: 5201 Added: contrib/1.1/lesstif/current/sources/lesstif-0.94.0.tar.bz2 Removed: contrib/1.1/lesstif/current/sources/lesstif-0.93.95b.tar.bz2 Modified: contrib/1.1/lesstif/current/specs/lesstif.spec Log: - 0.94.0, fixes CAN-2004-0914 Deleted: contrib/1.1/lesstif/current/sources/lesstif-0.93.95b.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.1/lesstif/current/sources/lesstif-0.94.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/lesstif/current/sources/lesstif-0.94.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/lesstif/current/specs/lesstif.spec =================================================================== --- contrib/1.1/lesstif/current/specs/lesstif.spec 2004-12-15 09:10:45 UTC (rev 5200) +++ contrib/1.1/lesstif/current/specs/lesstif.spec 2004-12-15 11:19:55 UTC (rev 5201) @@ -2,12 +2,11 @@ Summary: An OSF/Motif(R) clone. Name: lesstif -Version: 0.93.95b -Release: 2jh +Version: 0.94.0 +Release: 1jh License: LGPL Group: contrib Source: ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/lesstif-%{version}.tar.bz2 -Patch: lesstif-0.93.95b-xpm.patch Url: http://www.lesstif.org/ Obsoletes: lesstif-clients @@ -53,7 +52,6 @@ %prep %setup -q -%patch -p1 -b .xpm %build @@ -157,6 +155,9 @@ %changelog +* Wed Dec 15 2004 Jaakko Heinonen 0.94.0-1jh +- 0.94.0, fixes CAN-2004-0914 + * Tue Oct 12 2004 Jaakko Heinonen 0.93.95b-2jh - patch xpm vulnerability (CAN-2004-0687, CAN-2004-0688) From svn at tinysofa.org Wed Dec 15 12:49:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 07:49:04 -0500 (EST) Subject: [tinysofa-svn] r5202 - in tinysofa/releases/1.1: . bridge-utils bridge-utils/current bridge-utils/current/sources bridge-utils/current/specs Message-ID: <20041215124904.9EF2334425D@minbar.tinysofa.org> Author: jh Date: 2004-12-15 07:48:48 -0500 (Wed, 15 Dec 2004) New Revision: 5202 Added: tinysofa/releases/1.1/bridge-utils/ tinysofa/releases/1.1/bridge-utils/current/ tinysofa/releases/1.1/bridge-utils/current/sources/ tinysofa/releases/1.1/bridge-utils/current/sources/bridge-utils-1.0.4-inc.patch tinysofa/releases/1.1/bridge-utils/current/sources/bridge-utils-1.0.4.tar.gz tinysofa/releases/1.1/bridge-utils/current/specs/ tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec tinysofa/releases/1.1/bridge-utils/pristine/ tinysofa/releases/1.1/bridge-utils/releases/ Log: - add bridge-utils Added: tinysofa/releases/1.1/bridge-utils/current/sources/bridge-utils-1.0.4-inc.patch =================================================================== --- tinysofa/releases/1.1/bridge-utils/current/sources/bridge-utils-1.0.4-inc.patch 2004-12-15 11:19:55 UTC (rev 5201) +++ tinysofa/releases/1.1/bridge-utils/current/sources/bridge-utils-1.0.4-inc.patch 2004-12-15 12:48:48 UTC (rev 5202) @@ -0,0 +1,10 @@ +--- bridge-utils-1.0.4/libbridge/libbridge_private.h~ 2004-05-28 21:38:38.000000000 +0100 ++++ bridge-utils-1.0.4/libbridge/libbridge_private.h 2004-07-01 11:24:21.000000000 +0100 +@@ -22,6 +22,7 @@ + #include "config.h" + + #include ++#include + #include + #include + #include Added: tinysofa/releases/1.1/bridge-utils/current/sources/bridge-utils-1.0.4.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/bridge-utils/current/sources/bridge-utils-1.0.4.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec =================================================================== --- tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec 2004-12-15 11:19:55 UTC (rev 5201) +++ tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec 2004-12-15 12:48:48 UTC (rev 5202) @@ -0,0 +1,120 @@ +%define with_devel 0 + +Summary: Utilities for configuring the linux ethernet bridge. +Name: bridge-utils +Version: 1.0.4 +Release: 1jh +License: GPL +URL: http://bridge.sourceforge.net/ +Group: System Environment/Base +Source0: http://bridge.sourceforge.net/bridge-utils/%{name}-%{version}.tar.gz +Patch0: bridge-utils-1.0.4-inc.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +This package contains utilities for configuring the linux ethernet +bridge. The linux ethernet bridge can be used for connecting multiple +ethernet devices together. The connecting is fully transparent: hosts +connected to one ethernet device see hosts connected to the other +ethernet devices directly. + +Install bridge-utils if you want to use the linux ethernet bridge. + +%package devel +Summary: Utilities for configuring the linux ethernet bridge. +Group: development + +%description devel +The bridge-utils-devel package contains the header and object files +necessary for developing programs which use 'libbridge.a', the +interface to the linux kernel ethernet bridge. If you are developing +programs which need to configure the linux ethernet bridge, your +system needs to have these standard header and object files available +in order to create the executables. + +Install bridge-utils-devel if you are going to develop programs which +will use the linux ethernet bridge interface library. + + +%prep +%setup -q +%patch0 -p1 + + +%build +%configure +%make CFLAGS="$RPM_OPT_FLAGS" + + +%install +%makeinstall_std + + +%clean +%clean_buildroot + + +%files +%defattr (-,root,root) +%doc AUTHORS doc/FAQ doc/HOWTO +%{_sbindir}/brctl +%{_mandir}/man8/brctl.8* + +%if %{with_devel} +%files -n bridge-utils-devel +%defattr (-,root,root) +%{_includedir}/libbridge.h +%{_libdir}/libbridge.a +%else +%exclude %{_includedir} +%exclude %{_libdir}/*.a +%endif + + +%changelog +* Wed Dec 15 2004 Jaakko Heinonen 1.0.4-1jh +- tinysofa + +* Thu Jul 1 2004 David Woodhouse +- Update to 1.0.4 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Oct 25 2003 Florian La Roche +- support change to call sysconf() to get HZ + +* Tue Sep 16 2003 David Woodhouse 0.9.6-1 +- Update to 0.9.6 +- Detect lack of kernel bridge support or EPERM and exit with appropriate code. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Dec 13 2002 Elliot Lee 0.9.3-7 +- Rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Mar 04 2002 Benjamin LaHaise +- manual rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Nov 07 2001 Matthew Galgoci +- initial cleanup of spec file from net release + From svn at tinysofa.org Wed Dec 15 12:54:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 07:54:34 -0500 (EST) Subject: [tinysofa-svn] r5203 - tinysofa/releases/1.1/bridge-utils/current/specs Message-ID: <20041215125434.C89A234425D@minbar.tinysofa.org> Author: jh Date: 2004-12-15 07:54:28 -0500 (Wed, 15 Dec 2004) New Revision: 5203 Modified: tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec Log: - fix group Modified: tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec =================================================================== --- tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec 2004-12-15 12:48:48 UTC (rev 5202) +++ tinysofa/releases/1.1/bridge-utils/current/specs/bridge-utils.spec 2004-12-15 12:54:28 UTC (rev 5203) @@ -6,7 +6,7 @@ Release: 1jh License: GPL URL: http://bridge.sourceforge.net/ -Group: System Environment/Base +Group: main Source0: http://bridge.sourceforge.net/bridge-utils/%{name}-%{version}.tar.gz Patch0: bridge-utils-1.0.4-inc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root From svn at tinysofa.org Wed Dec 15 13:08:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 08:08:38 -0500 (EST) Subject: [tinysofa-svn] r5204 - tinysofa/misc/comps/releases/1.2 Message-ID: <20041215130838.39F9734425D@minbar.tinysofa.org> Author: jh Date: 2004-12-15 08:08:31 -0500 (Wed, 15 Dec 2004) New Revision: 5204 Modified: tinysofa/misc/comps/releases/1.2/comps.xml Log: - add web-server group Modified: tinysofa/misc/comps/releases/1.2/comps.xml =================================================================== --- tinysofa/misc/comps/releases/1.2/comps.xml 2004-12-15 12:54:28 UTC (rev 5203) +++ tinysofa/misc/comps/releases/1.2/comps.xml 2004-12-15 13:08:31 UTC (rev 5204) @@ -556,6 +556,32 @@ + + web-server + Web server (apache) + This group include Apache Web server support. + true + false + + base + + + httpd + apr + apr-util + php4 + php4-pear + php4-gd + php4-imap + php4-ldap + php4-mbstring + php4-mysql + php4-ncurses + php4-pgsql + php4-xmlrpc + + + Applications @@ -573,6 +599,7 @@ ldap-server tftp-server smb-server + web-server From svn at tinysofa.org Wed Dec 15 20:08:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 15:08:26 -0500 (EST) Subject: [tinysofa-svn] r5205 - in tinysofa/releases/1.1/sudo/current: sources specs Message-ID: <20041215200826.BB414344261@minbar.tinysofa.org> Author: jh Date: 2004-12-15 15:08:02 -0500 (Wed, 15 Dec 2004) New Revision: 5205 Added: tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p5.tar.gz Removed: tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p2.tar.gz Modified: tinysofa/releases/1.1/sudo/current/specs/sudo.spec Log: - new upstream Deleted: tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p2.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/sudo/current/sources/sudo-1.6.8p5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/sudo/current/specs/sudo.spec =================================================================== --- tinysofa/releases/1.1/sudo/current/specs/sudo.spec 2004-12-15 13:08:31 UTC (rev 5204) +++ tinysofa/releases/1.1/sudo/current/specs/sudo.spec 2004-12-15 20:08:02 UTC (rev 5205) @@ -1,6 +1,6 @@ Summary: Allows restricted root access for specified users. Name: sudo -Version: 1.6.8p2 +Version: 1.6.8p5 Release: 1jh License: BSD Group: main @@ -69,6 +69,9 @@ %exclude %attr(0755,root,root) %{_libdir}/sudo_noexec.la %changelog +* Wed Dec 15 2004 Jaakko Heinonen 1.6.8p5-1jh +- new upstream + * Mon Nov 15 2004 Jaakko Heinonen 1.6.8p2-1jh - 1.6.8p2, which fixes a security bug with bash scripts From svn at tinysofa.org Wed Dec 15 20:17:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 15:17:51 -0500 (EST) Subject: [tinysofa-svn] r5206 - tinysofa/releases/1.1/release/current/specs Message-ID: <20041215201751.6887A344261@minbar.tinysofa.org> Author: jh Date: 2004-12-15 15:17:44 -0500 (Wed, 15 Dec 2004) New Revision: 5206 Modified: tinysofa/releases/1.1/release/current/specs/release.spec Log: - update 3 Modified: tinysofa/releases/1.1/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.1/release/current/specs/release.spec 2004-12-15 20:08:02 UTC (rev 5205) +++ tinysofa/releases/1.1/release/current/specs/release.spec 2004-12-15 20:17:44 UTC (rev 5206) @@ -1,11 +1,11 @@ -%define release_name Rio update 2 +%define release_name Rio update 3 %define vendor tinysofa %define product classic server Summary: tinysofa release file Name: release Version: 1.1 -Release: 2jh +Release: 3jh Epoch: 2 License: GPL Group: main From svn at tinysofa.org Wed Dec 15 20:39:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 15:39:03 -0500 (EST) Subject: [tinysofa-svn] r5207 - tinysofa/releases/1.1/openssh/current/specs Message-ID: <20041215203903.CB639344261@minbar.tinysofa.org> Author: jh Date: 2004-12-15 15:38:56 -0500 (Wed, 15 Dec 2004) New Revision: 5207 Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec Log: - server requires now tcp_wrappers Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec =================================================================== --- tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-12-15 20:17:44 UTC (rev 5206) +++ tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-12-15 20:38:56 UTC (rev 5207) @@ -4,7 +4,7 @@ Summary: OpenSSH free Secure Shell (SSH) implementation Name: openssh Version: 3.8.1p1 -Release: 1jh +Release: 2jh License: BSD Group: main Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{realversion}.tar.gz @@ -34,6 +34,7 @@ Group: main Obsoletes: ssh-server %{name}-server-config < %{version}-%{release} PreReq: %{name} = %{version} +Requires: tcp_wrappers %service_requires %description @@ -201,6 +202,9 @@ %attr(0644,root,root) %config(noreplace) /etc/ssh/sshd_config %changelog +* Wed Dec 15 2004 Jaakko Heinonen 3.8.1p1-2jh +- server requires now tcp_wrappers + * Sat Oct 30 2004 Jaakko Heinonen 3.8.1p1-1jh - 3.8.1p1 - fix a spec file error which caused it to compile without pie From svn at tinysofa.org Wed Dec 15 21:01:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 16:01:22 -0500 (EST) Subject: [tinysofa-svn] r5208 - in contrib/1.1: . perl-html-template perl-html-template/current perl-html-template/current/sources perl-html-template/current/specs Message-ID: <20041215210122.AB1A4344261@minbar.tinysofa.org> Author: gda Date: 2004-12-15 16:01:06 -0500 (Wed, 15 Dec 2004) New Revision: 5208 Added: contrib/1.1/perl-html-template/ contrib/1.1/perl-html-template/current/ contrib/1.1/perl-html-template/current/sources/ contrib/1.1/perl-html-template/current/sources/HTML-Template-2.7.tar.gz contrib/1.1/perl-html-template/current/specs/ contrib/1.1/perl-html-template/current/specs/perl-html-template.spec contrib/1.1/perl-html-template/pristine/ contrib/1.1/perl-html-template/releases/ Log: for jaakko Added: contrib/1.1/perl-html-template/current/sources/HTML-Template-2.7.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.1/perl-html-template/current/sources/HTML-Template-2.7.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.1/perl-html-template/current/specs/perl-html-template.spec =================================================================== --- contrib/1.1/perl-html-template/current/specs/perl-html-template.spec 2004-12-15 20:38:56 UTC (rev 5207) +++ contrib/1.1/perl-html-template/current/specs/perl-html-template.spec 2004-12-15 21:01:06 UTC (rev 5208) @@ -0,0 +1,52 @@ +%define perlname HTML-Template + +Summary:The Perl module HTML-Template. +Name: perl-html-template +Version: 2.7 +Release: 1gd +License: Artistic, GPL +Group: contrib +Source: %{perlname}-%{version}.tar.gz +URL: http://www.cpan.org/ +Requires: perl = %{perl_version} +BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version} +BuildRoot: %{_tmppath}/%{name}-%{version} + + +%description +The Perl module HTML-Template + +%prep +%setup -q -n %{perlname}-%{version} + + +%build +%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor %{name}-%{version}-filelist +find %{buildroot} -type f -print |\ +%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist + +%clean +%clean_buildroot + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) +%doc Changes MANIFEST README + + +%changelog +* Wed Dec 15 2004 Gerald Dachs 2.7-1gd +- fresh build + From svn at tinysofa.org Wed Dec 15 21:55:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 16:55:04 -0500 (EST) Subject: [tinysofa-svn] r5209 - in tinysofa/releases/1.1/anaconda/current: sources specs Message-ID: <20041215215504.AE45D344261@minbar.tinysofa.org> Author: jh Date: 2004-12-15 16:54:53 -0500 (Wed, 15 Dec 2004) New Revision: 5209 Added: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.7-depmod.patch Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - add depmod patch Added: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.7-depmod.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.7-depmod.patch 2004-12-15 21:01:06 UTC (rev 5208) +++ tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.7-depmod.patch 2004-12-15 21:54:53 UTC (rev 5209) @@ -0,0 +1,31 @@ +--- ts-anaconda-1.1.7/scripts/upd-modules.depmod 2004-12-15 23:51:59.234546697 +0200 ++++ ts-anaconda-1.1.7/scripts/upd-modules 2004-12-15 23:52:38.490664550 +0200 +@@ -108,7 +108,7 @@ + MODINFO=/usr/share/hwdata/module-info + MODDEPS=$KERNELROOT/moddeps + +-depmod -e -F $KERNELROOT/boot/System.map-$version \ ++/sbin/depmod.old -e -F $KERNELROOT/boot/System.map-$version \ + $KERNELROOT/lib/modules/$version/*/*.o | $FILTERMODDEPS > $MODDEPS + + NETMODULES=$(resdeps `$MODLIST --modinfo-file $MODINFO net | egrep -v $EXCLUDENETMODULES`) +@@ -157,7 +157,7 @@ + + SPACE2=`du -s . | awk '{print $1}'` + +- /sbin/depmod -F $KERNELROOT/boot/System.map-$version -e *.o | \ ++ /sbin/depmod.old -F $KERNELROOT/boot/System.map-$version -e *.o | \ + grep ':.*o' | \ + sed -e 's/\.o//g' \ + -e 's/lp: parport/lp: parport_pc/g' \ +--- ts-anaconda-1.1.7/scripts/mk-images.depmod 2004-12-15 23:51:23.453551418 +0200 ++++ ts-anaconda-1.1.7/scripts/mk-images 2004-12-15 23:51:40.736202342 +0200 +@@ -142,7 +142,7 @@ + + exclpattern="tc90x|FPT|BusLogic|Pci2000|Pci2220i" + +- $FAKEARCH /sbin/depmod -e -F $KERNELROOT/boot/System.map-$version \ ++ $FAKEARCH /sbin/depmod.old -e -F $KERNELROOT/boot/System.map-$version \ + $what > $final.foo 2>&1 | + egrep -v "modprobe: (${exclpattern}) multiply defined" + Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-12-15 21:01:06 UTC (rev 5208) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-12-15 21:54:53 UTC (rev 5209) @@ -2,13 +2,14 @@ ExclusiveArch: %{ix86} Name: anaconda Version: 1.1.7 -Release: 2jh +Release: 3jh Epoch: 1 License: GPL Summary: The tinysofa installation program. Group: main Source: ts-anaconda-%{version}.tar.bz2 Patch: anaconda-jfs-xfs.patch +Patch1: ts-anaconda-1.1.7-depmod.patch BuildRequires: pump-devel, kudzu-devel, pciutils-devel, bzip2-devel BuildRequires: e2fsprogs-devel, python-devel db4-devel, newt-devel BuildRequires: rpm-devel, gettext >= 0.11, dietlibc, zlib-devel @@ -44,6 +45,7 @@ %setup -q -n ts-%{name}-%{version} %patch0 -p1 +%patch1 -p1 -b .depmod %build @@ -162,6 +164,9 @@ %changelog +* Wed Dec 15 2004 Jaakko Heinonen 1.1.7-3jh +- use depmod.old + * Wed Nov 3 2004 Jaakko Heinonen 1.1.7-2jh - add more requirements to runtime package - remove x86_64 from exclusivearch From svn at tinysofa.org Wed Dec 15 22:17:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 15 Dec 2004 17:17:41 -0500 (EST) Subject: [tinysofa-svn] r5210 - tinysofa/releases/1.1/openldap/current/specs Message-ID: <20041215221741.E1C23344261@minbar.tinysofa.org> Author: jh Date: 2004-12-15 17:17:34 -0500 (Wed, 15 Dec 2004) New Revision: 5210 Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec Log: - change useradd to match our setup configuration Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec =================================================================== --- tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-12-15 21:54:53 UTC (rev 5209) +++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-12-15 22:17:34 UTC (rev 5210) @@ -94,8 +94,8 @@ %description utils The utils present in the openLDAP suite. -%prep +%prep %setup -q -a 3 %patch0 -p1 %patch1 -p1 @@ -190,10 +190,8 @@ %{__mkdir_p} \ %{buildroot}%{_sysconfdir}/sysconfig - install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/ldap - %if %{_useldbm} # Change the database to ldbm. perl -pi -e "s|bdb|ldbm|g" $RPM_BUILD_ROOT/%{_sysconfdir}/%{_ldapsubdir}/slapd.conf @@ -212,14 +210,13 @@ /usr/sbin/groupadd -g 111 slapd fi if [ -z "`getent passwd slapd`" ]; then - /usr/sbin/useradd -d /no/dir -M -s /bin/false \ + /usr/sbin/useradd -d /var/empty -M -s /sbin/nologin \ -g slapd -u 111 slapd fi %post servers %service_post ldap - %preun servers %service_preun ldap @@ -245,7 +242,7 @@ %dir /etc/%{_ldapsubdir}/schema/tinysofa %config(noreplace) /etc/%{_ldapsubdir}/schema/tinysofa/*.schema* %attr(0755,root,root) %dir %{_datadir}/openldap -%{_datadir}/openldap/migration +%{_datadir}/%{_ldapsubdir}/migration %{_datadir}/%{_ldapsubdir}/ucdata %{_mandir}/man5/ldap.conf.5* From svn at tinysofa.org Thu Dec 16 05:34:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 16 Dec 2004 00:34:16 -0500 (EST) Subject: [tinysofa-svn] r5211 - tinysofa/releases/1.1/beecrypt/current/specs Message-ID: <20041216053416.5B3DF344261@minbar.tinysofa.org> Author: jh Date: 2004-12-16 00:34:09 -0500 (Thu, 16 Dec 2004) New Revision: 5211 Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec Log: - use %%py_version instead of hardcoded python version Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec =================================================================== --- tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-12-15 22:17:34 UTC (rev 5210) +++ tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-12-16 05:34:09 UTC (rev 5211) @@ -53,7 +53,7 @@ CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack" %configure --enable-shared --enable-static %{?with_python} -%make +%make PYVER="%{py_version}" %install @@ -99,6 +99,9 @@ %changelog +* Thu Dec 16 2004 Jaakko Heinonen +- use %%py_version instead of hardcoded python version + * Thu Aug 05 2004 tsintegrate 3.1.0-6ts - current (3.1.0-6jh) integrated as 3.1.0-6ts for release 1.1 From svn at tinysofa.org Thu Dec 16 08:55:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 16 Dec 2004 03:55:01 -0500 (EST) Subject: [tinysofa-svn] r5212 - in tinysofa/releases/1.1/gettext/current: sources specs Message-ID: <20041216085501.4648E344261@minbar.tinysofa.org> Author: jh Date: 2004-12-16 03:54:49 -0500 (Thu, 16 Dec 2004) New Revision: 5212 Added: tinysofa/releases/1.1/gettext/current/sources/gettext-0.14.1-phase0getc.patch Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec Log: - add gettext-0.14.1-phase0getc.patch - fix for automake 1.9 Added: tinysofa/releases/1.1/gettext/current/sources/gettext-0.14.1-phase0getc.patch =================================================================== --- tinysofa/releases/1.1/gettext/current/sources/gettext-0.14.1-phase0getc.patch 2004-12-16 05:34:09 UTC (rev 5211) +++ tinysofa/releases/1.1/gettext/current/sources/gettext-0.14.1-phase0getc.patch 2004-12-16 08:54:49 UTC (rev 5212) @@ -0,0 +1,12 @@ +diff -uNr gettext-0.14.1.orig/gettext-tools/src/x-c.c gettext-0.14.1/gettext-tools/src/x-c.c +--- gettext-0.14.1.orig/gettext-tools/src/x-c.c 2004-01-12 21:10:51.000000000 +1000 ++++ gettext-0.14.1/gettext-tools/src/x-c.c 2004-11-02 00:23:12.936345496 +1000 +@@ -408,7 +408,7 @@ + return '\n'; + + case '\\': +- c = phase0_getc (fp); ++ c = phase0_getc (); + if (c != '\n') + { + phase0_ungetc (c); Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec =================================================================== --- tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2004-12-16 05:34:09 UTC (rev 5211) +++ tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2004-12-16 08:54:49 UTC (rev 5212) @@ -1,12 +1,13 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext Version: 0.14.1 -Release: 10jh +Release: 11jh License: GPL/LGPL Group: development Source: ftp://ftp.gnu.org/gnu/gettext-%{version}.tar.gz Patch: gettext-0.14.1-amd64-libtool.patch Patch1: gettext-0.14.1-tempfile.patch +Patch2: gettext-0.14.1-phase0getc.patch BuildRoot: %{_tmppath}/%{name}-root BuildRequires: libstdc++-devel gcc-c++ findutils autoconf automake Requires: libstdc++ @@ -45,11 +46,31 @@ %setup -q %patch -p1 -b .amd64-libtool %patch1 -p1 -b .tempfile +%patch2 -p1 -b .phase0getc %build +aclocal --force +automake +autoconf + +for d in autoconf-lib-link gettext-tools gettext-runtime; do + pushd $d + aclocal --force -I m4/ -I ../config/m4/ -I ../gettext-runtime/m4/ \ + -I ../gettext-tools/m4/ -I ../autoconf-lib-link/m4/ + automake + autoconf + popd +done +pushd gettext-runtime/libasprintf +aclocal --force -I ../../config/m4/ -I ../../gettext-runtime/m4/ \ + -I ../../gettext-tools/m4/ -I ../../autoconf-lib-link/m4/ +automake +autoconf +popd + %configure --without-included-gettext \ - --enable-shared --with-pic-=yes + --enable-shared --with-pic=yes %make -j1 @@ -110,6 +131,10 @@ %changelog +* Thu Dec 16 2004 Jaakko Heinonen 0.14.1-11jh +- add gettext-0.14.1-phase0getc.patch +- fix for automake 1.9 + * Mon Oct 11 2004 Jaakko Heinonen 0.14.1-10jh - add gettext-0.14.1-tempfile.patch (Oystein Viggen) From svn at tinysofa.org Thu Dec 16 09:04:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 16 Dec 2004 04:04:23 -0500 (EST) Subject: [tinysofa-svn] r5213 - in tinysofa/releases/1.1/findutils/current: sources specs Message-ID: <20041216090423.09EDB344267@minbar.tinysofa.org> Author: jh Date: 2004-12-16 04:04:11 -0500 (Thu, 16 Dec 2004) New Revision: 5213 Added: tinysofa/releases/1.1/findutils/current/sources/findutils-4.1.20-build.patch Modified: tinysofa/releases/1.1/findutils/current/specs/findutils.spec Log: - fix for new automake Added: tinysofa/releases/1.1/findutils/current/sources/findutils-4.1.20-build.patch =================================================================== --- tinysofa/releases/1.1/findutils/current/sources/findutils-4.1.20-build.patch 2004-12-16 08:54:49 UTC (rev 5212) +++ tinysofa/releases/1.1/findutils/current/sources/findutils-4.1.20-build.patch 2004-12-16 09:04:11 UTC (rev 5213) @@ -0,0 +1,23 @@ +diff -ur findutils-4.1.20.orig/configure.in findutils-4.1.20/configure.in +--- findutils-4.1.20.orig/configure.in 2003-05-26 14:16:09.000000000 -0400 ++++ findutils-4.1.20/configure.in 2004-08-01 08:38:30.000000000 -0400 +@@ -26,7 +26,7 @@ + AC_PROG_CC_STDC + AM_C_PROTOTYPES + AC_PROG_INSTALL +-AC_PROG_RANLIB ++AC_PROG_LIBTOOL + AC_PROG_MAKE_SET + AC_SYS_LARGEFILE + +diff -ur findutils-4.1.20.orig/locate/testsuite/Makefile.am findutils-4.1.20/locate/testsuite/Makefile.am +--- findutils-4.1.20.orig/locate/testsuite/Makefile.am 2001-06-05 02:10:07.000000000 -0400 ++++ findutils-4.1.20/locate/testsuite/Makefile.am 2004-08-01 08:51:09.000000000 -0400 +@@ -13,6 +13,6 @@ + locate.gnu/ignore_case3.exp \ + locate.gnu/ignore_case3.xo + +-DIST_SUBDIRS = config inputs locate.gnu ++DIST_SUBDIRS = config locate.gnu + + CLEANFILES = *.log *.sum site.exp site.bak Modified: tinysofa/releases/1.1/findutils/current/specs/findutils.spec =================================================================== --- tinysofa/releases/1.1/findutils/current/specs/findutils.spec 2004-12-16 08:54:49 UTC (rev 5212) +++ tinysofa/releases/1.1/findutils/current/specs/findutils.spec 2004-12-16 09:04:11 UTC (rev 5213) @@ -11,8 +11,9 @@ Patch2: findutils-4.1-getshort.patch Patch3: findutils-4.1.20-xargs_help_cr.patch Patch4: findutils-4.1.20-i.patch +Patch5: findutils-4.1.20-build.patch %info_requires -BuildRequires: autoconf automake gettext gettext-devel +BuildRequires: autoconf automake gettext gettext-devel libtool BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -36,24 +37,30 @@ %if %{with_selinux} patch -p1 -i %{SOURCE2} %endif +%patch5 -p1 -b .build %build +libtoolize --force +autoheader aclocal +automake autoconf %configure --disable-nls %make - %install %makeinstall %install_info -n find doc/find.texi %nuke_info +%clean +%clean_buildroot + %post %info_post @@ -61,10 +68,6 @@ %info_postun -%clean -%clean_buildroot - - %files %defattr(-,root,root) %doc NEWS README @@ -86,6 +89,9 @@ %changelog +* Thu Dec 16 2004 Jaakko Heinonen +- fix for new automake + * Thu Aug 05 2004 tsintegrate 4.1.20-6ts - current (4.1.20-6jh) integrated as 4.1.20-6ts for release 1.1 From svn at tinysofa.org Thu Dec 16 10:33:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 16 Dec 2004 05:33:07 -0500 (EST) Subject: [tinysofa-svn] r5214 - tinysofa/releases/1.1/perl/current/specs Message-ID: <20041216103307.6AB55344261@minbar.tinysofa.org> Author: jh Date: 2004-12-16 05:33:00 -0500 (Thu, 16 Dec 2004) New Revision: 5214 Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec Log: - doesn't build with parallel make Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-12-16 09:04:11 UTC (rev 5213) +++ tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-12-16 10:33:00 UTC (rev 5214) @@ -158,7 +158,7 @@ # create lib/Config.pm #make lib/Config.pm -%make +%make -j1 # Strip binaries (done now rather than at install) strip perl From svn at tinysofa.org Thu Dec 16 11:01:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 16 Dec 2004 06:01:08 -0500 (EST) Subject: [tinysofa-svn] r5215 - tinysofa/releases/1.1/anaconda/current/specs Message-ID: <20041216110108.70DF9344261@minbar.tinysofa.org> Author: jh Date: 2004-12-16 06:01:01 -0500 (Thu, 16 Dec 2004) New Revision: 5215 Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - parallel make change Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-12-16 10:33:00 UTC (rev 5214) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-12-16 11:01:01 UTC (rev 5215) @@ -112,7 +112,7 @@ popd pushd wlite -diet %make +diet %make -j1 mv libwlite.a libwlitediet.a popd From svn at tinysofa.org Thu Dec 16 11:24:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 16 Dec 2004 06:24:27 -0500 (EST) Subject: [tinysofa-svn] r5216 - in tinysofa/releases/1.1/pkgconfig/current: sources specs Message-ID: <20041216112427.83B1A344261@minbar.tinysofa.org> Author: jh Date: 2004-12-16 06:24:16 -0500 (Thu, 16 Dec 2004) New Revision: 5216 Added: tinysofa/releases/1.1/pkgconfig/current/sources/pkgconfig-0.15.0-automake.patch Modified: tinysofa/releases/1.1/pkgconfig/current/specs/pkgconfig.spec Log: - fix for automake 1.9 Added: tinysofa/releases/1.1/pkgconfig/current/sources/pkgconfig-0.15.0-automake.patch =================================================================== --- tinysofa/releases/1.1/pkgconfig/current/sources/pkgconfig-0.15.0-automake.patch 2004-12-16 11:01:01 UTC (rev 5215) +++ tinysofa/releases/1.1/pkgconfig/current/sources/pkgconfig-0.15.0-automake.patch 2004-12-16 11:24:16 UTC (rev 5216) @@ -0,0 +1,19 @@ +--- pkgconfig-0.15.0/configure.in.orig 2004-12-16 13:11:02.873124930 +0200 ++++ pkgconfig-0.15.0/configure.in 2004-12-16 13:11:16.194568227 +0200 +@@ -1,7 +1,6 @@ + + AC_INIT(pkg-config.1) + +-AM_INIT_AUTOMAKE(pkgconfig, 0.15.0) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +@@ -48,6 +47,8 @@ + AC_CONFIG_SUBDIRS(glib-2.4.2) + fi # !native_win32 + ++AM_INIT_AUTOMAKE(pkgconfig, 0.15.0) ++ + AC_FUNC_ALLOCA + + AC_CHECK_FUNCS(setresuid setreuid,break) Modified: tinysofa/releases/1.1/pkgconfig/current/specs/pkgconfig.spec =================================================================== --- tinysofa/releases/1.1/pkgconfig/current/specs/pkgconfig.spec 2004-12-16 11:01:01 UTC (rev 5215) +++ tinysofa/releases/1.1/pkgconfig/current/specs/pkgconfig.spec 2004-12-16 11:24:16 UTC (rev 5216) @@ -14,6 +14,7 @@ Patch2: pkgconfig-0.14.0-datadir.patch Patch3: pkgconfig-0.15.0-use-glib2.patch Patch4: pkgconfig-0.15.0-quote.patch +Patch5: pkgconfig-0.15.0-automake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -23,15 +24,14 @@ %prep -%setup -q +%setup -q -a 1 %patch1 -p1 -b .lib64 %patch2 -p1 -b .datadir %patch3 -p1 -b .use-glib2 %patch4 -p1 -b .quote +%patch5 -p1 -b .automake -tar jxvf %{SOURCE1} - %build %{__libtoolize} --force %{__aclocal} --force @@ -51,9 +51,7 @@ %makeinstall mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig -strip $RPM_BUILD_ROOT%{_bindir}/* - %clean %clean_buildroot @@ -65,6 +63,7 @@ %{_libdir}/pkgconfig %{_datadir}/aclocal/* + %changelog * Tue Mar 02 2004 Elliot Lee - rebuilt From svn at tinysofa.org Thu Dec 16 11:32:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 16 Dec 2004 06:32:27 -0500 (EST) Subject: [tinysofa-svn] r5217 - contrib/1.1/squirrelmail/current/specs Message-ID: <20041216113227.0A71F344261@minbar.tinysofa.org> Author: gda Date: 2004-12-16 06:32:20 -0500 (Thu, 16 Dec 2004) New Revision: 5217 Modified: contrib/1.1/squirrelmail/current/specs/squirrelmail.spec Log: applied security patch Modified: contrib/1.1/squirrelmail/current/specs/squirrelmail.spec =================================================================== --- contrib/1.1/squirrelmail/current/specs/squirrelmail.spec 2004-12-16 11:24:16 UTC (rev 5216) +++ contrib/1.1/squirrelmail/current/specs/squirrelmail.spec 2004-12-16 11:32:20 UTC (rev 5217) @@ -1,13 +1,14 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.3a -Release: 1gd +Release: 2gd License: GPL URL: http://www.squirrelmail.org/ Vendor: squirrelmail.org Group: contrib Source: %{name}-%{version}.tar.bz2 Source1: config.php.tinysofa +Patch: sm143a-xss.diff BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Requires: httpd, php4 >= 4.0.4, perl, tmpwatch >= 2.8, aspell @@ -24,6 +25,7 @@ %prep %setup -q +%patch -p0 %{__rm} -f plugins/make_archive.pl # Rearrange the documentation @@ -132,6 +134,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Thu Dec 16 2004 Gerald Dachs 1.4.3a-2gd +- applied security patch + * Mon Sep 27 2004 Gerald Dachs 1.4.3a-1gd - new in contrib From svn at tinysofa.org Thu Dec 16 12:02:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 16 Dec 2004 07:02:31 -0500 (EST) Subject: [tinysofa-svn] r5218 - tinysofa/releases/1.1/shadow-utils/current/specs Message-ID: <20041216120231.5A492344267@minbar.tinysofa.org> Author: jh Date: 2004-12-16 07:02:24 -0500 (Thu, 16 Dec 2004) New Revision: 5218 Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec Log: - run libtoolize Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec =================================================================== --- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-12-16 11:32:20 UTC (rev 5217) +++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-12-16 12:02:24 UTC (rev 5218) @@ -45,6 +45,7 @@ managing user accounts. The groupadd, groupdel, and groupmod commands are used for managing group accounts. + %prep %setup -q -n shadow-%{version} %patch0 -p1 -b .redhat @@ -88,10 +89,12 @@ manconv euc-jp utf-8 man/ja/*.* %endif +libtoolize --copy --force aclocal automake -a autoconf + %build %configure \ --disable-desrpc \ @@ -102,6 +105,7 @@ --disable-shared %make + %install make install DESTDIR=$RPM_BUILD_ROOT gnulocaledir=$RPM_BUILD_ROOT/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs install -d -m 755 $RPM_BUILD_ROOT/etc/default @@ -192,9 +196,11 @@ %find_lang shadow + %clean %clean_buildroot + %files -f shadow.lang %defattr(-,root,root) %doc NEWS doc/ANNOUNCE doc/HOWTO doc/LICENSE README doc/README.linux @@ -247,6 +253,7 @@ %{_mandir}/man8/faillog.8* %{_mandir}/*/man8/faillog.8* + %changelog * Fri Nov 5 2004 Jaakko Heinonen 4.0.3-27jh - add 036_CAN-2004-1001_passwd_check.diff to fix security problem From svn at tinysofa.org Thu Dec 16 13:16:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 16 Dec 2004 08:16:12 -0500 (EST) Subject: [tinysofa-svn] r5219 - in tinysofa/releases/1.1/dkms/current: sources specs Message-ID: <20041216131612.63E2D344278@minbar.tinysofa.org> Author: jh Date: 2004-12-16 08:15:58 -0500 (Thu, 16 Dec 2004) New Revision: 5219 Added: tinysofa/releases/1.1/dkms/current/sources/dkms-2.0.4.tar.gz Removed: tinysofa/releases/1.1/dkms/current/sources/dkms-1.09.tar.gz Modified: tinysofa/releases/1.1/dkms/current/specs/dkms.spec Log: - 2.0.4 - spec cleanup Deleted: tinysofa/releases/1.1/dkms/current/sources/dkms-1.09.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/dkms/current/sources/dkms-2.0.4.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/dkms/current/sources/dkms-2.0.4.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/dkms/current/specs/dkms.spec =================================================================== --- tinysofa/releases/1.1/dkms/current/specs/dkms.spec 2004-12-16 12:02:24 UTC (rev 5218) +++ tinysofa/releases/1.1/dkms/current/specs/dkms.spec 2004-12-16 13:15:58 UTC (rev 5219) @@ -1,14 +1,14 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 1.09 -Release: 2ts +Version: 2.0.4 +Release: 1jh License: GPL Group: extra BuildArch: noarch Requires: gcc sed gawk findutils tar cpio gzip grep mktemp Requires: bash > 1.99 -Source: http://linux.dell.com/dkms/dkms-%version.tar.gz -BuildRoot: %{_tmppath}/%{name}-root +Source: http://linux.dell.com/dkms/dkms-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description This package contains the framework for the Dynamic @@ -16,38 +16,51 @@ module RPMS as originally developed by the Dell Computer Corporation. + %prep - %setup -q + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/{var/dkms,/usr/sbin,usr/share/man/man8,etc,etc/init.d} -install -m 755 dkms $RPM_BUILD_ROOT/usr/sbin/dkms -install -m 644 dkms.8.gz $RPM_BUILD_ROOT/usr/share/man/man8 -install -m 644 dkms_framework.conf $RPM_BUILD_ROOT/etc/dkms_framework.conf -install -m 644 dkms_dbversion $RPM_BUILD_ROOT/var/dkms/dkms_dbversion -install -m 755 dkms_autoinstaller $RPM_BUILD_ROOT/etc/init.d/dkms_autoinstaller -install -m 755 dkms_mkkerneldoth $RPM_BUILD_ROOT/usr/sbin/dkms_mkkerneldoth +%{__mkdir_p} \ + %{buildroot}%{_sbindir}/dkms \ + %{buildroot}%{_mandir}/man8 \ + %{buildroot}%{_initrddir} \ + %{buildroot}%{_sysconfdir} \ + %{buildroot}%{_localstatedir}/dkms +install -m 755 dkms %{buildroot}%{_sbindir}/dkms +install -m 644 dkms.8.gz %{buildroot}%{_mandir}/man8 +install -m 644 dkms_framework.conf %{buildroot}%{_sysconfdir} +install -m 644 dkms_dbversion %{buildroot}%{_localstatedir}/dkms +install -m 755 dkms_autoinstaller %{buildroot}%{_initrddir} +install -m 755 dkms_mkkerneldoth %{buildroot}%{_sbindir} + + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +%clean_buildroot + %files %defattr(-,root,root,755) -%attr(0755,root,root) /usr/sbin/dkms -%attr(0755,root,root) /var/dkms -%attr(0755,root,root) /etc/init.d/dkms_autoinstaller -%attr(0755,root,root) /usr/sbin/dkms_mkkerneldoth -%doc %attr(0644,root,root) /usr/share/man/man8/dkms.8.gz %doc %attr(0644,root,root) sample.spec sample.conf AUTHORS COPYING -%config(noreplace) /etc/dkms_framework.conf +%config(noreplace) %{_sysconfdir}/dkms_framework.conf +%{_sbindir}/dkms_mkkerneldoth +%{_sbindir}/dkms +%{_localstatedir}/dkms +%{_initrddir}/dkms_autoinstaller +%{_mandir}/man8/dkms.8.gz + %post #/sbin/chkconfig dkms_autoinstaller on %changelog +* Thu Dec 16 2004 Jaakko Heinonen 2.0.4-1jh +- 2.0.4 +- spec cleanup + * Thu Aug 05 2004 tsintegrate 1.09-2ts - current (1.09-2jh) integrated as 1.09-2ts for release 1.1 From svn at tinysofa.org Fri Dec 17 06:46:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 17 Dec 2004 01:46:19 -0500 (EST) Subject: [tinysofa-svn] r5220 - in tinysofa/releases/1.1/vim/current: sources specs Message-ID: <20041217064619.10072344286@minbar.tinysofa.org> Author: jh Date: 2004-12-17 01:46:07 -0500 (Fri, 17 Dec 2004) New Revision: 5220 Added: tinysofa/releases/1.1/vim/current/sources/vim-6.2-SA13490.patch Modified: tinysofa/releases/1.1/vim/current/specs/vim.spec Log: - fix modelines command execution vulnerabilities (vim-6.2-SA13490.patch) Added: tinysofa/releases/1.1/vim/current/sources/vim-6.2-SA13490.patch =================================================================== --- tinysofa/releases/1.1/vim/current/sources/vim-6.2-SA13490.patch 2004-12-16 13:15:58 UTC (rev 5219) +++ tinysofa/releases/1.1/vim/current/sources/vim-6.2-SA13490.patch 2004-12-17 06:46:07 UTC (rev 5220) @@ -0,0 +1,342 @@ +Problem: Unusual characters in an option value may cause unexpected + behavior, especially for a modeline. (Ciaran McCreesh) +Solution: Don't allow setting termcap options or 'printdevice' or + 'titleold' in a modeline. Don't list options for "termcap" + and "all" in a modeline. Don't allow unusual characters in + 'filetype', 'syntax', 'backupext', 'keymap', 'patchmode' and + 'langmenu'. +Files: src/option.c, runtime/doc/options.txt + + +*** ../vim-6.3.044/src/option.c Mon Sep 13 16:36:12 2004 +--- src/option.c Thu Dec 9 15:41:03 2004 +*************** +*** 293,298 **** +--- 293,299 ---- + #define P_SECURE 0x40000L/* cannot change in modeline or secure mode */ + #define P_GETTEXT 0x80000L/* expand default value with _() */ + #define P_NOGLOB 0x100000L/* do not use local value for global vimrc */ ++ #define P_NFNAME 0x200000L/* only normal file name chars allowed */ + + /* + * options[] is initialized here. +*************** +*** 413,419 **** + {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, + (char_u *)&p_bdir, PV_NONE, + {(char_u *)DFLT_BDIR, (char_u *)0L}}, +! {"backupext", "bex", P_STRING|P_VI_DEF, + (char_u *)&p_bex, PV_NONE, + { + #ifdef VMS +--- 414,420 ---- + {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, + (char_u *)&p_bdir, PV_NONE, + {(char_u *)DFLT_BDIR, (char_u *)0L}}, +! {"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME, + (char_u *)&p_bex, PV_NONE, + { + #ifdef VMS +*************** +*** 846,852 **** + {"fileformats", "ffs", P_STRING|P_VIM|P_COMMA|P_NODUP, + (char_u *)&p_ffs, PV_NONE, + {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}}, +! {"filetype", "ft", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, + #ifdef FEAT_AUTOCMD + (char_u *)&p_ft, PV_FT, + {(char_u *)"", (char_u *)0L} +--- 847,853 ---- + {"fileformats", "ffs", P_STRING|P_VIM|P_COMMA|P_NODUP, + (char_u *)&p_ffs, PV_NONE, + {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}}, +! {"filetype", "ft", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, + #ifdef FEAT_AUTOCMD + (char_u *)&p_ft, PV_FT, + {(char_u *)"", (char_u *)0L} +*************** +*** 1284,1290 **** + {(char_u *)0L, (char_u *)0L} + #endif + }, +! {"keymap", "kmp", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT, + #ifdef FEAT_KEYMAP + (char_u *)&p_keymap, PV_KMAP, + {(char_u *)"", (char_u *)0L} +--- 1285,1291 ---- + {(char_u *)0L, (char_u *)0L} + #endif + }, +! {"keymap", "kmp", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME, + #ifdef FEAT_KEYMAP + (char_u *)&p_keymap, PV_KMAP, + {(char_u *)"", (char_u *)0L} +*************** +*** 1330,1336 **** + {(char_u *)NULL, + #endif + (char_u *)0L}}, +! {"langmenu", "lm", P_STRING|P_VI_DEF, + #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG) + (char_u *)&p_lm, PV_NONE, + #else +--- 1331,1337 ---- + {(char_u *)NULL, + #endif + (char_u *)0L}}, +! {"langmenu", "lm", P_STRING|P_VI_DEF|P_NFNAME, + #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG) + (char_u *)&p_lm, PV_NONE, + #else +*************** +*** 1562,1568 **** + {(char_u *)0L, (char_u *)0L} + #endif + }, +! {"patchmode", "pm", P_STRING|P_VI_DEF, + (char_u *)&p_pm, PV_NONE, + {(char_u *)"", (char_u *)0L}}, + {"path", "pa", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, +--- 1563,1569 ---- + {(char_u *)0L, (char_u *)0L} + #endif + }, +! {"patchmode", "pm", P_STRING|P_VI_DEF|P_NFNAME, + (char_u *)&p_pm, PV_NONE, + {(char_u *)"", (char_u *)0L}}, + {"path", "pa", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, +*************** +*** 1595,1601 **** + (char_u *)NULL, PV_NONE, + #endif + {(char_u *)FALSE, (char_u *)0L}}, +! {"printdevice", "pdev", P_STRING|P_VI_DEF, + #ifdef FEAT_PRINTER + (char_u *)&p_pdev, PV_NONE, + {(char_u *)"", (char_u *)0L} +--- 1596,1602 ---- + (char_u *)NULL, PV_NONE, + #endif + {(char_u *)FALSE, (char_u *)0L}}, +! {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE, + #ifdef FEAT_PRINTER + (char_u *)&p_pdev, PV_NONE, + {(char_u *)"", (char_u *)0L} +*************** +*** 1981,1987 **** + {"switchbuf", "swb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, + (char_u *)&p_swb, PV_NONE, + {(char_u *)"", (char_u *)0L}}, +! {"syntax", "syn", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, + #ifdef FEAT_SYN_HL + (char_u *)&p_syn, PV_SYN, + {(char_u *)"", (char_u *)0L} +--- 1982,1988 ---- + {"switchbuf", "swb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, + (char_u *)&p_swb, PV_NONE, + {(char_u *)"", (char_u *)0L}}, +! {"syntax", "syn", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, + #ifdef FEAT_SYN_HL + (char_u *)&p_syn, PV_SYN, + {(char_u *)"", (char_u *)0L} +*************** +*** 2086,2092 **** + (char_u *)NULL, PV_NONE, + #endif + {(char_u *)85L, (char_u *)0L}}, +! {"titleold", NULL, P_STRING|P_VI_DEF|P_GETTEXT, + #ifdef FEAT_TITLE + (char_u *)&p_titleold, PV_NONE, + {(char_u *)N_("Thanks for flying Vim"), +--- 2087,2093 ---- + (char_u *)NULL, PV_NONE, + #endif + {(char_u *)85L, (char_u *)0L}}, +! {"titleold", NULL, P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE, + #ifdef FEAT_TITLE + (char_u *)&p_titleold, PV_NONE, + {(char_u *)N_("Thanks for flying Vim"), +*************** +*** 2321,2327 **** + {(char_u *)0L, (char_u *)0L}}, + + /* terminal output codes */ +! #define p_term(sss, vvv) {sss, NULL, P_STRING|P_VI_DEF|P_RALL, \ + (char_u *)&vvv, PV_NONE, \ + {(char_u *)"", (char_u *)0L}}, + +--- 2322,2328 ---- + {(char_u *)0L, (char_u *)0L}}, + + /* terminal output codes */ +! #define p_term(sss, vvv) {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \ + (char_u *)&vvv, PV_NONE, \ + {(char_u *)"", (char_u *)0L}}, + +*************** +*** 3310,3316 **** + errmsg = NULL; + startarg = arg; /* remember for error message */ + +! if (STRNCMP(arg, "all", 3) == 0 && !isalpha(arg[3])) + { + /* + * ":set all" show all options. +--- 3311,3318 ---- + errmsg = NULL; + startarg = arg; /* remember for error message */ + +! if (STRNCMP(arg, "all", 3) == 0 && !isalpha(arg[3]) +! && !(opt_flags & OPT_MODELINE)) + { + /* + * ":set all" show all options. +*************** +*** 3326,3332 **** + else + showoptions(1, opt_flags); + } +! else if (STRNCMP(arg, "termcap", 7) == 0) + { + showoptions(2, opt_flags); + show_termcodes(); +--- 3328,3334 ---- + else + showoptions(1, opt_flags); + } +! else if (STRNCMP(arg, "termcap", 7) == 0 && !(opt_flags & OPT_MODELINE)) + { + showoptions(2, opt_flags); + show_termcodes(); +*************** +*** 4611,4616 **** +--- 4613,4627 ---- + ) && (options[opt_idx].flags & P_SECURE)) + { + errmsg = e_secure; ++ } ++ ++ /* Check for a "normal" file name in some options. Disallow a path ++ * separator (slash and/or backslash), wildcards and characters that are ++ * often illegal in a file name. */ ++ else if ((options[opt_idx].flags & P_NFNAME) ++ && vim_strpbrk(*varp, "/\\*?[|<>") != NULL) ++ { ++ errmsg = e_invarg; + } + + /* 'term' */ +*** ../vim-6.3.044/runtime/doc/options.txt Wed Jun 9 14:56:28 2004 +--- runtime/doc/options.txt Thu Dec 9 16:39:07 2004 +*************** +*** 139,144 **** +--- 139,147 ---- + (the ^[ is a real here, use CTRL-V to enter it) + The advantage over a mapping is that it works in all situations. + ++ The t_xx options cannot be set from a |modeline| or in the |sandbox|, for ++ security reasons. ++ + The listing from ":set" looks different from Vi. Long string options are put + at the end of the list. The number of options is quite large. The output of + "set all" probably does not fit on the screen, causing Vim to give the +*************** +*** 945,950 **** +--- 948,954 ---- + accidentally overwriting existing files with a backup file. You might + prefer using ".bak", but make sure that you don't have files with + ".bak" that you want to keep. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'backupskip'* *'bsk'* + 'backupskip' 'bsk' string (default: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*") +*************** +*** 2407,2412 **** +--- 2411,2417 ---- + type that is actually stored with the file. + This option is not copied to another buffer, independent of the 's' or + 'S' flag in 'cpoptions'. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'fillchars'* *'fcs'* + 'fillchars' 'fcs' string (default "vert:|,fold:-") +*************** +*** 3599,3604 **** +--- 3604,3610 ---- + Setting this option to a valid keymap name has the side effect of + setting 'iminsert' to one, so that the keymap becomes effective. + 'imsearch' is also set to one, unless it was -1 ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'keymodel'* *'km'* + 'keymodel' 'km' string (default "") +*************** +*** 3690,3695 **** +--- 3696,3702 ---- + matter what $LANG is set to: > + :set langmenu=nl_NL.ISO_8859-1 + < When 'langmenu' is empty, |v:lang| is used. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + If your $LANG is set to a non-English language but you do want to use + the English menus: > + :set langmenu=none +*************** +*** 4310,4315 **** +--- 4317,4323 ---- + Using 'patchmode' for compressed files appends the extension at the + end (e.g., "file.gz.orig"), thus the resulting name isn't always + recognized as a compressed file. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'path'* *'pa'* *E343* *E345* *E347* + 'path' 'pa' string (default on Unix: ".,/usr/include,," +*************** +*** 4424,4429 **** +--- 4432,4439 ---- + in the standard printer dialog. + If the option is empty, then vim will use the system default printer + for ":hardcopy!" ++ This option cannot be set from a |modeline| or in the |sandbox|, for ++ security reasons. + + *'printencoding'* *'penc'* *E620* + 'printencoding' 'penc' String (default empty, except for: +*************** +*** 5711,5716 **** +--- 5721,5727 ---- + Syntax autocommand event is triggered with the value as argument. + This option is not copied to another buffer, independent of the 's' or + 'S' flag in 'cpoptions'. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'tabstop'* *'ts'* + 'tabstop' 'ts' number (default 8) +*************** +*** 6089,6094 **** +--- 6100,6107 ---- + This option will be used for the window title when exiting Vim if the + original title cannot be restored. Only happens if 'title' is on or + 'titlestring' is not empty. ++ This option cannot be set from a |modeline| or in the |sandbox|, for ++ security reasons. + *'titlestring'* + 'titlestring' string (default "") + global +*** ../vim-6.3.044/src/version.c Wed Dec 8 21:51:39 2004 +--- src/version.c Thu Dec 9 16:23:34 2004 +*************** +*** 643,644 **** +--- 643,646 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 45, + /**/ + +-- +How To Keep A Healthy Level Of Insanity: +7. Finish all your sentences with "in accordance with the prophecy". + + /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ +/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ Project leader for A-A-P -- http://www.A-A-P.org /// + \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html /// Modified: tinysofa/releases/1.1/vim/current/specs/vim.spec =================================================================== --- tinysofa/releases/1.1/vim/current/specs/vim.spec 2004-12-16 13:15:58 UTC (rev 5219) +++ tinysofa/releases/1.1/vim/current/specs/vim.spec 2004-12-17 06:46:07 UTC (rev 5220) @@ -4,7 +4,7 @@ %define patchlevel 532 %define shortname vim62 Version: %srcversion.%patchlevel -Release: 2ts +Release: 3jh License: Charityware Group: main Source0: ftp://ftp.nl.vim.org/pub/vim/unix/%{name}-%{srcversion}.tar.bz2 @@ -15,6 +15,7 @@ Patch4: vim-6.2.301-400.patch Patch5: vim-6.2.401-500.patch Patch6: vim-6.2.501-532.patch +Patch7: vim-6.2-SA13490.patch Patch1000: xxd-locale.patch Requires: gawk BuildRequires: python-devel perl sed @@ -101,6 +102,8 @@ done cd - +%patch7 -p2 + %patch1000 -p1 # fix rogue dependencies from sample code @@ -207,6 +210,9 @@ %changelog +* Fri Dec 17 2004 Jaakko Heinonen 6.2.532-3jh +- fix modelines command execution vulnerabilities (vim-6.2-SA13490.patch) + * Thu Aug 05 2004 tsintegrate 6.2.532-2ts - current (6.2.532-2jh) integrated as 6.2.532-2ts for release 1.1 From svn at tinysofa.org Fri Dec 17 08:06:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 17 Dec 2004 03:06:04 -0500 (EST) Subject: [tinysofa-svn] r5221 - in tinysofa/releases/1.1/php4/current: sources specs Message-ID: <20041217080604.015A6344286@minbar.tinysofa.org> Author: jh Date: 2004-12-17 03:04:31 -0500 (Fri, 17 Dec 2004) New Revision: 5221 Added: tinysofa/releases/1.1/php4/current/sources/php-4.3.10-db4.patch tinysofa/releases/1.1/php4/current/sources/php-4.3.10.tar.bz2 Removed: tinysofa/releases/1.1/php4/current/sources/php-4.3.2-db4.patch tinysofa/releases/1.1/php4/current/sources/php-4.3.6-umask.patch tinysofa/releases/1.1/php4/current/sources/php-4.3.9.tar.bz2 Modified: tinysofa/releases/1.1/php4/current/specs/php4.spec Log: - 4.3.10 Added: tinysofa/releases/1.1/php4/current/sources/php-4.3.10-db4.patch =================================================================== --- tinysofa/releases/1.1/php4/current/sources/php-4.3.10-db4.patch 2004-12-17 06:46:07 UTC (rev 5220) +++ tinysofa/releases/1.1/php4/current/sources/php-4.3.10-db4.patch 2004-12-17 08:04:31 UTC (rev 5221) @@ -0,0 +1,20 @@ +--- php-4.3.10/ext/dba/config.m4.db4 2004-09-25 18:32:20.000000000 +0300 ++++ php-4.3.10/ext/dba/config.m4 2004-12-17 10:00:37.354070919 +0200 +@@ -136,8 +136,7 @@ + dnl parameters(version, library list, function) + AC_DEFUN(PHP_DBA_DB_CHECK,[ + for LIB in $2; do +- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then +- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ ++ PHP_TEMP_LDFLAGS(-l$LIB,[ + AC_TRY_LINK([ + #include "$THIS_INCLUDE" + ],[ +@@ -154,7 +153,6 @@ + ]) + ]) + ]) +- fi + done + if test -z "$THIS_LIBS"; then + AC_MSG_CHECKING(for db$1 major version) Added: tinysofa/releases/1.1/php4/current/sources/php-4.3.10.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/php4/current/sources/php-4.3.10.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.1/php4/current/sources/php-4.3.2-db4.patch =================================================================== --- tinysofa/releases/1.1/php4/current/sources/php-4.3.2-db4.patch 2004-12-17 06:46:07 UTC (rev 5220) +++ tinysofa/releases/1.1/php4/current/sources/php-4.3.2-db4.patch 2004-12-17 08:04:31 UTC (rev 5221) @@ -1,23 +0,0 @@ - -Fix broken db library detection. - ---- php-4.3.2/ext/dba/config.m4.db4 2003-05-21 01:35:29.000000000 +0100 -+++ php-4.3.2/ext/dba/config.m4 2003-05-29 20:46:38.000000000 +0100 -@@ -135,8 +135,7 @@ - dnl parameters(version, library list, function) - AC_DEFUN(PHP_DBA_DB_CHECK,[ - for LIB in $2; do -- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then -- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[ -+ PHP_TEMP_LDFLAGS(-l$LIB,[ - AC_TRY_LINK([ - #include "$THIS_INCLUDE" - ],[ -@@ -153,7 +152,6 @@ - ]) - ]) - ]) -- fi - done - if test -z "$THIS_LIBS"; then - AC_MSG_CHECKING(for db$1 major version) Deleted: tinysofa/releases/1.1/php4/current/sources/php-4.3.6-umask.patch =================================================================== --- tinysofa/releases/1.1/php4/current/sources/php-4.3.6-umask.patch 2004-12-17 06:46:07 UTC (rev 5220) +++ tinysofa/releases/1.1/php4/current/sources/php-4.3.6-umask.patch 2004-12-17 08:04:31 UTC (rev 5221) @@ -1,44 +0,0 @@ - -Save and restore umask across requests correctly. - ---- php-4.3.6/sapi/apache2handler/sapi_apache2.c.umask -+++ php-4.3.6/sapi/apache2handler/sapi_apache2.c -@@ -420,6 +420,19 @@ - return APR_SUCCESS; - } - -+static int saved_umask; -+ -+static void php_save_umask(void) -+{ -+ saved_umask = umask(0777); -+ umask(saved_umask); -+} -+ -+static void php_restore_umask(void) -+{ -+ umask(saved_umask); -+} -+ - static void php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC) - { - char *content_type; -@@ -552,6 +565,8 @@ - } else { - zend_file_handle zfd = {0}; - -+ php_save_umask(); -+ - zfd.type = ZEND_HANDLE_FILENAME; - zfd.filename = (char *) r->filename; - zfd.free_filename = 0; -@@ -562,6 +577,9 @@ - } else { - zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &zfd); - } -+ -+ php_restore_umask(); -+ - #if MEMORY_LIMIT - { - char *mem_usage; Deleted: tinysofa/releases/1.1/php4/current/sources/php-4.3.9.tar.bz2 =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/php4/current/specs/php4.spec =================================================================== --- tinysofa/releases/1.1/php4/current/specs/php4.spec 2004-12-17 06:46:07 UTC (rev 5220) +++ tinysofa/releases/1.1/php4/current/specs/php4.spec 2004-12-17 08:04:31 UTC (rev 5221) @@ -6,7 +6,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php4 -Version: 4.3.9 +Version: 4.3.10 Release: 1jh License: The PHP License Group: main @@ -23,12 +23,11 @@ Patch6: php-4.3.1-tests.patch Patch7: php-4.3.2-libtool15.patch Patch8: php-4.3.3-miscfix.patch -Patch9: php-4.3.6-umask.patch -Patch10: php-4.3.7-handler.patch +Patch9: php-4.3.7-handler.patch # Fixes for extension modules Patch21: php-4.3.1-odbc.patch -Patch22: php-4.3.2-db4.patch +Patch22: php-4.3.10-db4.patch Patch23: php-4.3.7-gmppowm.patch # Functional changes @@ -334,8 +333,7 @@ %patch6 -p1 -b .tests %patch7 -p1 -b .libtool15 %patch8 -p1 -b .miscfix -%patch9 -p1 -b .umask -#%patch10 -p1 -b .handler +#%patch9 -p1 -b .handler %if 0 %patch21 -p1 -b .odbc @@ -612,6 +610,9 @@ %endif %changelog +* Fri Dec 17 2004 Jaakko Heinonen 4.3.10-1jh +- 4.3.10 + * Fri Sep 24 2004 Jaakko Heinonen 4.3.9-1jh - 4.3.9 From svn at tinysofa.org Fri Dec 17 08:36:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 17 Dec 2004 03:36:47 -0500 (EST) Subject: [tinysofa-svn] r5222 - tinysofa/releases/1.1/php4/current/specs Message-ID: <20041217083647.A90A8344286@minbar.tinysofa.org> Author: jh Date: 2004-12-17 03:36:40 -0500 (Fri, 17 Dec 2004) New Revision: 5222 Modified: tinysofa/releases/1.1/php4/current/specs/php4.spec Log: - disable db4 patch Modified: tinysofa/releases/1.1/php4/current/specs/php4.spec =================================================================== --- tinysofa/releases/1.1/php4/current/specs/php4.spec 2004-12-17 08:04:31 UTC (rev 5221) +++ tinysofa/releases/1.1/php4/current/specs/php4.spec 2004-12-17 08:36:40 UTC (rev 5222) @@ -338,7 +338,7 @@ %if 0 %patch21 -p1 -b .odbc %endif -%patch22 -p1 -b .db4 +#%patch22 -p1 -b .db4 #%patch23 -p1 -b .gmppowm %patch30 -p1 -b .dlopen From svn at tinysofa.org Fri Dec 17 08:58:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 17 Dec 2004 03:58:19 -0500 (EST) Subject: [tinysofa-svn] r5223 - in contrib/1.1/squirrelmail/current: sources specs Message-ID: <20041217085819.6D0BE344286@minbar.tinysofa.org> Author: gda Date: 2004-12-17 03:58:06 -0500 (Fri, 17 Dec 2004) New Revision: 5223 Added: contrib/1.1/squirrelmail/current/sources/sm143a-xss.diff Modified: contrib/1.1/squirrelmail/current/sources/config.php.tinysofa contrib/1.1/squirrelmail/current/specs/squirrelmail.spec Log: forgot to add the patch Modified: contrib/1.1/squirrelmail/current/sources/config.php.tinysofa =================================================================== --- contrib/1.1/squirrelmail/current/sources/config.php.tinysofa 2004-12-17 08:36:40 UTC (rev 5222) +++ contrib/1.1/squirrelmail/current/sources/config.php.tinysofa 2004-12-17 08:58:06 UTC (rev 5223) @@ -28,16 +28,16 @@ $domain = 'localhost'; $imapServerAddress = 'localhost'; $imapPort = 143; -$useSendmail = true; +$useSendmail = false; $smtpServerAddress = 'localhost'; $smtpPort = 25; $sendmail_path = '/usr/sbin/sendmail'; $pop_before_smtp = false; -$imap_server_type = '__IMAP_SERVER__'; +$imap_server_type = 'courier'; $invert_time = false; -$optional_delimiter = '__OPT_DELIM__'; +$optional_delimiter = 'detect'; -$default_folder_prefix = '__DEF_FOLDER_PREFIX__'; +$default_folder_prefix = 'INBOX.'; $trash_folder = 'Trash'; $sent_folder = 'Sent'; $draft_folder = 'Drafts'; @@ -57,8 +57,8 @@ $noselect_fix_enable = false; $default_charset = 'iso-8859-1'; -$data_dir = '__PREFSDIR__'; -$attachment_dir = '__ATTDIR__'; +$data_dir = '/var/lib/squirrelmail/prefs/'; +$attachment_dir = '/var/spool/squirrelmail/attach/'; $dir_hash_level = 0; $default_left_size = '150'; $force_username_lowercase = false; @@ -174,4 +174,4 @@ * sent and regular output to begin, which will majorly screw * things up when we try to send more headers later. */ -?> +?> \ No newline at end of file Added: contrib/1.1/squirrelmail/current/sources/sm143a-xss.diff =================================================================== --- contrib/1.1/squirrelmail/current/sources/sm143a-xss.diff 2004-12-17 08:36:40 UTC (rev 5222) +++ contrib/1.1/squirrelmail/current/sources/sm143a-xss.diff 2004-12-17 08:58:06 UTC (rev 5223) @@ -0,0 +1,28 @@ +diff -urN functions/mime.php functions/mime.php +--- functions/mime.php 2004-05-23 19:14:11.000000000 +0300 ++++ functions/mime.php 2004-11-03 19:16:50.000000000 +0200 +@@ -602,13 +602,22 @@ + } + $iLastMatch = $i; + $j = $i; +- $ret .= $res[1]; ++ if ($htmlsave) { ++ $ret .= htmlspecialchars($res[1]); ++ } else { ++ $ret .= $res[1]; ++ } + $encoding = ucfirst($res[3]); + switch ($encoding) + { + case 'B': + $replace = base64_decode($res[4]); +- $ret .= charset_decode($res[2],$replace); ++ if ($utfencode) { ++ $replace = charset_decode($res[2],$replace); ++ } elseif ($htmlsave) { ++ $replace = htmlspecialchars($replace); ++ } ++ $ret .= $replace; + break; + case 'Q': + $replace = str_replace('_', ' ', $res[4]); Modified: contrib/1.1/squirrelmail/current/specs/squirrelmail.spec =================================================================== --- contrib/1.1/squirrelmail/current/specs/squirrelmail.spec 2004-12-17 08:36:40 UTC (rev 5222) +++ contrib/1.1/squirrelmail/current/specs/squirrelmail.spec 2004-12-17 08:58:06 UTC (rev 5223) @@ -136,6 +136,7 @@ %changelog * Thu Dec 16 2004 Gerald Dachs 1.4.3a-2gd - applied security patch +- changed config * Mon Sep 27 2004 Gerald Dachs 1.4.3a-1gd - new in contrib From svn at tinysofa.org Fri Dec 17 09:06:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 17 Dec 2004 04:06:23 -0500 (EST) Subject: [tinysofa-svn] r5224 - in tinysofa/releases/1.1/php4/current: sources specs Message-ID: <20041217090623.5AFAE344288@minbar.tinysofa.org> Author: jh Date: 2004-12-17 04:06:12 -0500 (Fri, 17 Dec 2004) New Revision: 5224 Modified: tinysofa/releases/1.1/php4/current/sources/php-4.3.10-db4.patch tinysofa/releases/1.1/php4/current/specs/php4.spec Log: - fix db4 patch Modified: tinysofa/releases/1.1/php4/current/sources/php-4.3.10-db4.patch =================================================================== --- tinysofa/releases/1.1/php4/current/sources/php-4.3.10-db4.patch 2004-12-17 08:58:06 UTC (rev 5223) +++ tinysofa/releases/1.1/php4/current/sources/php-4.3.10-db4.patch 2004-12-17 09:06:12 UTC (rev 5224) @@ -6,7 +6,7 @@ for LIB in $2; do - if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then - PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ -+ PHP_TEMP_LDFLAGS(-l$LIB,[ ++ PHP_TEMP_LDFLAGS(,-l$LIB,[ AC_TRY_LINK([ #include "$THIS_INCLUDE" ],[ Modified: tinysofa/releases/1.1/php4/current/specs/php4.spec =================================================================== --- tinysofa/releases/1.1/php4/current/specs/php4.spec 2004-12-17 08:58:06 UTC (rev 5223) +++ tinysofa/releases/1.1/php4/current/specs/php4.spec 2004-12-17 09:06:12 UTC (rev 5224) @@ -338,7 +338,7 @@ %if 0 %patch21 -p1 -b .odbc %endif -#%patch22 -p1 -b .db4 +%patch22 -p1 -b .db4 #%patch23 -p1 -b .gmppowm %patch30 -p1 -b .dlopen From svn at tinysofa.org Fri Dec 17 15:00:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 17 Dec 2004 10:00:52 -0500 (EST) Subject: [tinysofa-svn] r5226 - in tinysofa/releases/1.1: postfix/current/specs setup/current/sources setup/current/specs Message-ID: <20041217150052.A3DAC3441B1@minbar.tinysofa.org> Author: jh Date: 2004-12-17 10:00:35 -0500 (Fri, 17 Dec 2004) New Revision: 5226 Added: tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-postfix.patch Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec tinysofa/releases/1.1/setup/current/specs/setup.spec Log: - add postfix to mail group Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec =================================================================== --- tinysofa/releases/1.1/postfix/current/specs/postfix.spec 2004-12-17 09:37:18 UTC (rev 5225) +++ tinysofa/releases/1.1/postfix/current/specs/postfix.spec 2004-12-17 15:00:35 UTC (rev 5226) @@ -266,8 +266,8 @@ /usr/sbin/groupadd -g 107 postdrop fi if [ -z "`getent passwd postfix`" ]; then - /usr/sbin/useradd -d /no/dir -s /sbin/nologin \ - -g postfix -u 102 postfix + /usr/sbin/useradd -d /var/empty -s /sbin/nologin \ + -g postfix -u 102 -G mail postfix fi Added: tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-postfix.patch =================================================================== --- tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-postfix.patch 2004-12-17 09:37:18 UTC (rev 5225) +++ tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-postfix.patch 2004-12-17 15:00:35 UTC (rev 5226) @@ -0,0 +1,11 @@ +--- setup-2.2.5/group.postfix 2004-12-17 16:58:09.439734330 +0200 ++++ setup-2.2.5/group 2004-12-17 16:59:01.953683718 +0200 +@@ -9,7 +9,7 @@ + mem:x:8: + kmem:x:9: + wheel:x:10: +-mail:x:12:mail ++mail:x:12:mail,postfix + news:x:13:news + uucp:x:14:uucp + man:x:15: Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec =================================================================== --- tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-12-17 09:37:18 UTC (rev 5225) +++ tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-12-17 15:00:35 UTC (rev 5226) @@ -9,6 +9,7 @@ Patch1: setup-profile.patch Patch2: setup-2.2.5-sbin-bash.patch Patch3: setup-2.2.5-no-dir.patch +Patch4: setup-2.2.5-postfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Conflicts: initscripts < 4.26 @@ -25,6 +26,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 -b .postfix~ %install From svn at tinysofa.org Sat Dec 18 10:08:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 18 Dec 2004 05:08:12 -0500 (EST) Subject: [tinysofa-svn] r5227 - contrib/1.1/gpm/current/specs Message-ID: <20041218100812.BE0E93441B4@minbar.tinysofa.org> Author: jh Date: 2004-12-18 05:08:05 -0500 (Sat, 18 Dec 2004) New Revision: 5227 Modified: contrib/1.1/gpm/current/specs/gpm.spec Log: - BR: autoconf Modified: contrib/1.1/gpm/current/specs/gpm.spec =================================================================== --- contrib/1.1/gpm/current/specs/gpm.spec 2004-12-17 15:00:35 UTC (rev 5226) +++ contrib/1.1/gpm/current/specs/gpm.spec 2004-12-18 10:08:05 UTC (rev 5227) @@ -24,7 +24,7 @@ # this defines the library version that this package builds. %define LIBVER 1.19.0 BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: sed gawk texinfo bison ncurses-devel +BuildPrereq: sed gawk texinfo bison ncurses-devel autoconf %description Gpm provides mouse support to text-based Linux applications like the From svn at tinysofa.org Sat Dec 18 10:22:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 18 Dec 2004 05:22:09 -0500 (EST) Subject: [tinysofa-svn] r5229 - tinysofa/releases/1.1/postfix/current/sources Message-ID: <20041218102209.DE66E3441B4@minbar.tinysofa.org> Author: jh Date: 2004-12-18 05:21:57 -0500 (Sat, 18 Dec 2004) New Revision: 5229 Modified: tinysofa/releases/1.1/postfix/current/sources/postfix-main.cf tinysofa/releases/1.1/postfix/current/sources/postfix-master.cf Log: - improve default config Modified: tinysofa/releases/1.1/postfix/current/sources/postfix-main.cf =================================================================== --- tinysofa/releases/1.1/postfix/current/sources/postfix-main.cf 2004-12-18 10:20:50 UTC (rev 5228) +++ tinysofa/releases/1.1/postfix/current/sources/postfix-main.cf 2004-12-18 10:21:57 UTC (rev 5229) @@ -456,7 +456,8 @@ # non-UNIX accounts with "User unknown in local recipient table". # #mailbox_transport = lmtp:unix:/file/name -#mailbox_transport = cyrus +# For Cyrus (on tinysofa) use lmtp +#mailbox_transport = lmtp:unix:/var/spool/cyrus-imap/socket/lmtp # The fallback_transport specifies the optional transport in master.cf # to use for recipients that are not found in the UNIX passwd database. Modified: tinysofa/releases/1.1/postfix/current/sources/postfix-master.cf =================================================================== --- tinysofa/releases/1.1/postfix/current/sources/postfix-master.cf 2004-12-18 10:20:50 UTC (rev 5228) +++ tinysofa/releases/1.1/postfix/current/sources/postfix-master.cf 2004-12-18 10:21:57 UTC (rev 5229) @@ -102,9 +102,7 @@ # maildrop unix - n n - - pipe flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient} -# # Use LMTP with Cyrus -# uucp unix - n n - - pipe flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) ifmail unix - n n - - pipe From svn at tinysofa.org Sat Dec 18 11:27:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 18 Dec 2004 06:27:02 -0500 (EST) Subject: [tinysofa-svn] r5230 - in tinysofa/releases/1.1/cyrus-imapd/current: sources specs Message-ID: <20041218112702.95B463441B4@minbar.tinysofa.org> Author: jh Date: 2004-12-18 06:26:52 -0500 (Sat, 18 Dec 2004) New Revision: 5230 Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd.conf tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - change partition-default to /var/spool/cyrus-imap/spool Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd.conf =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd.conf 2004-12-18 10:21:57 UTC (rev 5229) +++ tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd.conf 2004-12-18 11:26:52 UTC (rev 5230) @@ -15,7 +15,7 @@ # directory and file locations configdirectory: /var/spool/cyrus-imap -partition-default: /var/spool/cyrus-imap +partition-default: /var/spool/cyrus-imap/spool sievedir: /var/spool/cyrus-imap/sieve sendmail: /usr/sbin/sendmail Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-18 10:21:57 UTC (rev 5229) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-18 11:26:52 UTC (rev 5230) @@ -132,7 +132,8 @@ # Build and populate /var/spool %{__mkdir_p} -m 0755 \ - %{buildroot}/var/spool/cyrus-imap/{stage,user,quota,proc,log,msg,socket,db} + %{buildroot}/var/spool/cyrus-imap/{stage,user,quota,proc,log,msg,socket,db} \ + %{buildroot}/var/spool/cyrus-imap/spool touch %{buildroot}/var/spool/cyrus-imap/mailboxes export IMAP_DIR="%{buildroot}/var/spool/cyrus-imap/" @@ -250,6 +251,7 @@ - fix startup script with multilib - correct /var/spool/cyrus-imap/mailboxes permissions - create dummy default SSL certificates +- change partition-default to /var/spool/cyrus-imap/spool * Thu Dec 2 2004 Jaakko Heinonen 2.2.10-2jh - major package cleanup From svn at tinysofa.org Sun Dec 19 19:03:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 19 Dec 2004 14:03:41 -0500 (EST) Subject: [tinysofa-svn] r5231 - in tinysofa/releases/1.1/samba/current: sources specs Message-ID: <20041219190341.079A4344201@minbar.tinysofa.org> Author: jh Date: 2004-12-19 13:58:29 -0500 (Sun, 19 Dec 2004) New Revision: 5231 Added: tinysofa/releases/1.1/samba/current/sources/samba-3.0.10.tar.gz tinysofa/releases/1.1/samba/current/sources/samba-3.0.7-64bit.patch Removed: tinysofa/releases/1.1/samba/current/sources/samba-3.0.9.tar.gz Modified: tinysofa/releases/1.1/samba/current/sources/samba-3.0.8-logfiles.patch tinysofa/releases/1.1/samba/current/specs/samba.spec Log: - 3.0.10, CAN-2004-1154 Added: tinysofa/releases/1.1/samba/current/sources/samba-3.0.10.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/samba/current/sources/samba-3.0.10.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.1/samba/current/sources/samba-3.0.7-64bit.patch =================================================================== --- tinysofa/releases/1.1/samba/current/sources/samba-3.0.7-64bit.patch 2004-12-18 11:26:52 UTC (rev 5230) +++ tinysofa/releases/1.1/samba/current/sources/samba-3.0.7-64bit.patch 2004-12-19 18:58:29 UTC (rev 5231) @@ -0,0 +1,27 @@ +These variables will be passed to functions which expect a pointer to a size_t, +which is larger than an int on 64-bit arches. To avoid trashing the stack when +the called function writes to the variable, change the type of the variables. + +--- samba/source/libads/ldap.c 2004-12-16 17:18:33.358425598 -0500 ++++ samba/source/libads/ldap.c 2004-12-16 17:18:27.383227271 -0500 +@@ -2404,7 +2404,7 @@ + int i; + void *res; + const char *attrs[] = {"servicePrincipalName", NULL}; +- int num_principals; ++ size_t num_principals; + + (*workgroup) = NULL; + +--- samba/source/nsswitch/winbindd_ads.c 2004-12-16 22:40:05.000000000 -0500 ++++ samba/source/nsswitch/winbindd_ads.c 2004-12-16 22:40:00.000000000 -0500 +@@ -651,7 +651,8 @@ + NTSTATUS status = NT_STATUS_UNSUCCESSFUL; + char *sidstr; + char **members; +- int i, num_members; ++ int i; ++ size_t num_members; + fstring sid_string; + BOOL more_values; + const char **attrs; Modified: tinysofa/releases/1.1/samba/current/sources/samba-3.0.8-logfiles.patch =================================================================== --- tinysofa/releases/1.1/samba/current/sources/samba-3.0.8-logfiles.patch 2004-12-18 11:26:52 UTC (rev 5230) +++ tinysofa/releases/1.1/samba/current/sources/samba-3.0.8-logfiles.patch 2004-12-19 18:58:29 UTC (rev 5231) @@ -77,8 +77,8 @@ log level = 10 -- log file = /usr/local/samba/lib/log.%m -+ log file = /usr/local/samba/lib/%m.log +- log file = /usr/local/samba/lib/log.%m ++ log file = /usr/local/samba/lib/%m.log include = /usr/local/samba/lib/smb.conf.%m

and create a file /usr/local/samba/lib/smb.conf.machine where Deleted: tinysofa/releases/1.1/samba/current/sources/samba-3.0.9.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec =================================================================== --- tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-12-18 11:26:52 UTC (rev 5230) +++ tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-12-19 18:58:29 UTC (rev 5231) @@ -2,7 +2,7 @@ Summary: The Samba SMB server. Name: samba -Version: 3.0.9 +Version: 3.0.10 Release: 1jh Epoch: 0 License: GNU GPL Version 2 @@ -38,6 +38,7 @@ Patch14: samba-3.0.8-non-ascii-domain.patch Patch15: samba-3.0.9-changetrustpw.patch Patch16: samba-3.0.4-install.mount.smbfs.patch +Patch17: samba-3.0.7-64bit.patch Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version} Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 @@ -125,9 +126,10 @@ %patch11 -p1 -b .use_authtok %patch12 -p1 -b .64bit-timestamps %patch13 -p1 -b .smbmnt -%patch14 -p1 -b .non-ascii-domain +#%patch14 -p1 -b .non-ascii-domain %patch15 -p1 -b .changetrustpw %patch16 -p1 -b .install.mount.smbfs +%patch17 -p1 -b .64bit # crap rm -f examples/VFS/.cvsignore @@ -148,7 +150,7 @@ autoconf EXTRA="-D_LARGEFILE64_SOURCE" %endif -CFLAGS="-D_GNU_SOURCE -fPIC" %configure \ +CFLAGS="-D_GNU_SOURCE" %configure \ --with-acl-support \ --with-automount \ --with-libsmbclient \ @@ -200,7 +202,8 @@ %{buildroot}%{_datadir}/swat/using_samba \ %{buildroot}%{_datadir}/samba/codepages \ %{buildroot}/%{_lib}/security \ - %{buildroot}%{_libdir} + %{buildroot}%{_libdir} \ + %{buildroot}%{_localstatedir}/run/winbindd cd source @@ -415,6 +418,7 @@ #%{_bindir}/vfstest %{_sbindir}/winbindd %dir /var/cache/samba +%dir /var/run/winbindd %attr(750,root,root) %dir /var/cache/samba/winbindd_privileged %config(noreplace) %{_sysconfdir}/samba/smb.conf %config(noreplace) %{_sysconfdir}/samba/lmhosts @@ -435,7 +439,8 @@ %{_mandir}/man1/wbinfo.1* %{_mandir}/man8/winbindd.8* %{_mandir}/man8/net.8* -%{_mandir}/man1/vfstest.1* +#%{_mandir}/man1/vfstest.1* +%{_mandir}/man8/pam_winbind.8* # #%lang(ja) %{_mandir}/ja/man1/make_smbcodepage.1* #%lang(ja) %{_mandir}/ja/man1/testparm.1* @@ -450,6 +455,9 @@ %changelog +* Fri Dec 17 2004 Jaakko Heinonen 3.0.10-1jh +- 3.0.10, CAN-2004-1154 + * Tue Nov 16 2004 Jaakko Heinonen 3.0.8-1jh - 3.0.8, fixes CAN-2004-0882 From svn at tinysofa.org Sun Dec 19 19:14:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 19 Dec 2004 14:14:59 -0500 (EST) Subject: [tinysofa-svn] r5232 - tinysofa/releases/1.1/samba/current/specs Message-ID: <20041219191459.C19CA344201@minbar.tinysofa.org> Author: jh Date: 2004-12-19 14:14:52 -0500 (Sun, 19 Dec 2004) New Revision: 5232 Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec Log: - exclude vfstest.1 Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec =================================================================== --- tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-12-19 18:58:29 UTC (rev 5231) +++ tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-12-19 19:14:52 UTC (rev 5232) @@ -439,7 +439,7 @@ %{_mandir}/man1/wbinfo.1* %{_mandir}/man8/winbindd.8* %{_mandir}/man8/net.8* -#%{_mandir}/man1/vfstest.1* +%exclude %{_mandir}/man1/vfstest.1* %{_mandir}/man8/pam_winbind.8* # #%lang(ja) %{_mandir}/ja/man1/make_smbcodepage.1* From svn at tinysofa.org Sun Dec 19 21:10:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 19 Dec 2004 16:10:21 -0500 (EST) Subject: [tinysofa-svn] r5234 - in tinysofa/releases/1.1/grub/current: sources specs Message-ID: <20041219211021.26E58344201@minbar.tinysofa.org> Author: jh Date: 2004-12-19 16:10:06 -0500 (Sun, 19 Dec 2004) New Revision: 5234 Added: tinysofa/releases/1.1/grub/current/sources/grub-0.94-i2o.patch tinysofa/releases/1.1/grub/current/sources/grub-0.95-moreraid.patch tinysofa/releases/1.1/grub/current/sources/grub-0.95-odirect.patch Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec Log: - add patches from Fedora Added: tinysofa/releases/1.1/grub/current/sources/grub-0.94-i2o.patch =================================================================== --- tinysofa/releases/1.1/grub/current/sources/grub-0.94-i2o.patch 2004-12-19 20:01:23 UTC (rev 5233) +++ tinysofa/releases/1.1/grub/current/sources/grub-0.94-i2o.patch 2004-12-19 21:10:06 UTC (rev 5234) @@ -0,0 +1,55 @@ +Only in grub-0.94/docs: grub.info +Only in grub-0.94/docs: multiboot.info +diff -ur grub-0.94/lib/device.c grub-0.94.new/lib/device.c +--- grub-0.94/lib/device.c 2004-05-07 04:50:36.375238696 +0200 ++++ grub-0.94.new/lib/device.c 2004-05-07 04:48:57.611253104 +0200 +@@ -419,6 +419,12 @@ + { + sprintf (name, "/dev/rd/c%dd%d", controller, drive); + } ++ ++static void ++get_i2o_disk_name (char *name, int unit) ++{ ++ sprintf (name, "/dev/i2o/hd%c", unit + 'a'); ++} + #endif + + /* Check if DEVICE can be read. If an error occurs, return zero, +@@ -789,6 +795,26 @@ + } + } + } ++ ++ /* I2O disks. */ ++ for (i = 0; i < 8; i++) ++ { ++ char name[16]; ++ ++ get_i2o_disk_name (name, i); ++ if (check_device (name)) ++ { ++ (*map)[num_hd + 0x80] = strdup (name); ++ assert ((*map)[num_hd + 0x80]); ++ ++ /* If the device map file is opened, write the map. */ ++ if (fp) ++ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); ++ ++ num_hd++; ++ } ++ } ++ + #endif /* __linux__ */ + + /* OK, close the device map file if opened. */ +@@ -844,7 +870,8 @@ + (strncmp(dev, "/dev/ida/", 9) == 0 || + strncmp(dev, "/dev/ataraid/", 13) == 0 || + strncmp(dev, "/dev/cciss/", 11) == 0 || +- strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "", ++ strncmp(dev, "/dev/rd/", 8) == 0 || ++ strncmp(dev, "/dev/i2o/", 9) == 0) ? "p" : "", + ((partition >> 16) & 0xFF) + 1); + + /* Open the partition. */ Added: tinysofa/releases/1.1/grub/current/sources/grub-0.95-moreraid.patch =================================================================== --- tinysofa/releases/1.1/grub/current/sources/grub-0.95-moreraid.patch 2004-12-19 20:01:23 UTC (rev 5233) +++ tinysofa/releases/1.1/grub/current/sources/grub-0.95-moreraid.patch 2004-12-19 21:10:06 UTC (rev 5234) @@ -0,0 +1,100 @@ +--- grub-0.95/lib/device.c.moreraid 2004-11-30 17:09:36.736099360 -0500 ++++ grub-0.95/lib/device.c 2004-11-30 17:12:17.319686944 -0500 +@@ -544,6 +544,17 @@ + } + + static void ++get_cciss_disk_name (char * name, int controller, int drive) ++{ ++ sprintf (name, "/dev/cciss/c%dd%d", controller, drive); ++} ++ ++static void ++get_cpqarray_disk_name (char * name, int controller, int drive) ++{ ++ sprintf (name, "/dev/ida/c%dd%d", controller, drive); ++} ++static void + get_ataraid_disk_name (char *name, int unit) + { + sprintf (name, "/dev/ataraid/d%c", unit + '0'); +@@ -920,7 +931,7 @@ + + for (controller = 0; controller < 8; controller++) + { +- for (drive = 0; drive < 15; drive++) ++ for (drive = 0; drive < 32; drive++) + { + char name[24]; + +@@ -940,6 +951,70 @@ + } + } + #endif /* __linux__ */ ++ ++#ifdef __linux__ ++ /* This is for cciss - we have ++ /dev/cciss/cdp. ++ ++ cciss driver currently supports up to 8 controllers, 16 logical ++ drives, and 7 partitions. */ ++ { ++ int controller, drive; ++ ++ for (controller = 0; controller < 8; controller++) ++ { ++ for (drive = 0; drive < 16; drive++) ++ { ++ char name[24]; ++ ++ get_cciss_disk_name (name, controller, drive); ++ if (check_device (name)) ++ { ++ (*map)[num_hd + 0x80] = strdup (name); ++ assert ((*map)[num_hd + 0x80]); ++ ++ /* If the device map file is opened, write the map. */ ++ if (fp) ++ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); ++ ++ num_hd++; ++ } ++ } ++ } ++ } ++#endif /* __linux__ */ ++ ++#ifdef __linux__ ++ /* This is for cpqarray - we have ++ /dev/ida/cdp. ++ ++ cpqarray driver currently supports up to 8 controllers, 16 logical ++ drives, and 15 partitions. */ ++ { ++ int controller, drive; ++ ++ for (controller = 0; controller < 8; controller++) ++ { ++ for (drive = 0; drive < 15; drive++) ++ { ++ char name[24]; ++ ++ get_cpqarray_disk_name (name, controller, drive); ++ if (check_device (name)) ++ { ++ (*map)[num_hd + 0x80] = strdup (name); ++ assert ((*map)[num_hd + 0x80]); ++ ++ /* If the device map file is opened, write the map. */ ++ if (fp) ++ fprintf (fp, "(hd%d)\t%s\n", num_hd, name); ++ ++ num_hd++; ++ } ++ } ++ } ++ } ++#endif /* __linux__ */ + + /* OK, close the device map file if opened. */ + if (fp) Added: tinysofa/releases/1.1/grub/current/sources/grub-0.95-odirect.patch =================================================================== --- tinysofa/releases/1.1/grub/current/sources/grub-0.95-odirect.patch 2004-12-19 20:01:23 UTC (rev 5233) +++ tinysofa/releases/1.1/grub/current/sources/grub-0.95-odirect.patch 2004-12-19 21:10:06 UTC (rev 5234) @@ -0,0 +1,115 @@ +--- grub-0.95/grub/asmstub.c.odirect 2004-11-30 16:58:06.577019488 -0500 ++++ grub-0.95/grub/asmstub.c 2004-11-30 16:59:56.057375944 -0500 +@@ -53,6 +53,9 @@ + # ifndef BLKFLSBUF + # define BLKFLSBUF _IO (0x12,97) /* flush buffer cache */ + # endif /* ! BLKFLSBUF */ ++# ifndef O_DIRECT ++# define O_DIRECT 040000 ++# endif /* ! O_DIRECT */ + #endif /* __linux__ */ + + /* We want to prevent any circularararity in our stubs, as well as +@@ -764,7 +767,7 @@ + { + /* The unpartitioned device name: /dev/XdX */ + char *devname = device_map[drive]; +- char buf[512]; ++ char * buf, * buf_unaligned; + + if (! devname) + return -1; +@@ -775,13 +778,13 @@ + + /* Open read/write, or read-only if that failed. */ + if (! read_only) +- disks[drive].flags = open (devname, O_RDWR); ++ disks[drive].flags = open (devname, O_RDWR | O_DIRECT); + + if (disks[drive].flags == -1) + { + if (read_only || errno == EACCES || errno == EROFS || errno == EPERM) + { +- disks[drive].flags = open (devname, O_RDONLY); ++ disks[drive].flags = open (devname, O_RDONLY | O_DIRECT); + if (disks[drive].flags == -1) + { + assign_device_name (drive, 0); +@@ -795,6 +798,10 @@ + } + } + ++ buf_unaligned = malloc((512 * sizeof(char)) + 4095); ++ buf = (char *) (((unsigned long)buf_unaligned + 4096 - 1) & ++ (~(4096-1))); ++ + /* Attempt to read the first sector. */ + if (read (disks[drive].flags, buf, 512) != 512) + { +@@ -806,6 +813,7 @@ + + if (disks[drive].flags != -1) + get_drive_geometry (&disks[drive], device_map, drive); ++ free(buf_unaligned); + } + + if (disks[drive].flags == -1) +@@ -827,24 +835,34 @@ + nread (int fd, char *buf, size_t len) + { + int size = len; ++ char * buf_unaligned, * buff, * obuff; ++ int ret; ++ ++ buf_unaligned = malloc((len * sizeof(char)) + 4095); ++ obuff = buff = (char *) (((unsigned long)buf_unaligned + 4096 - 1) & ++ (~(4096-1))); ++ + + while (len) + { +- int ret = read (fd, buf, len); ++ ret = read (fd, buff, len); + + if (ret <= 0) + { + if (errno == EINTR) + continue; + else +- return ret; ++ break; + } + + len -= ret; +- buf += ret; ++ buff += ret; + } + +- return size; ++ if (!len) ret = size; ++ ++ buf = memcpy(buf, obuff, size); ++ return ret; + } + + /* Write LEN bytes from BUF to FD. Return less than or equal to zero if an +@@ -853,10 +871,18 @@ + nwrite (int fd, char *buf, size_t len) + { + int size = len; ++ char * buf_unaligned, * buff; ++ ++ buf_unaligned = malloc((len * sizeof(char)) + 4095); ++ buff = (char *) (((unsigned long)buf_unaligned + 4096 - 1) & ++ (~(4096-1))); + + while (len) + { +- int ret = write (fd, buf, len); ++ int ret; ++ ++ memcpy(buff, buf, len); ++ ret = write (fd, buff, len); + + if (ret <= 0) + { Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec =================================================================== --- tinysofa/releases/1.1/grub/current/specs/grub.spec 2004-12-19 20:01:23 UTC (rev 5233) +++ tinysofa/releases/1.1/grub/current/specs/grub.spec 2004-12-19 21:10:06 UTC (rev 5234) @@ -1,6 +1,6 @@ Name: grub Version: 0.95 -Release: 1jh +Release: 2jh Summary: GRUB - the Grand Unified Boot Loader. Group: main License: GPL @@ -46,7 +46,14 @@ # for some reason, using the initrd max part of the setup.S structure # causes problems on x86_64 and with 4G/4G Patch501: grub-0.94-initrdmax.patch +# i2o device support +Patch503: grub-0.94-i2o.patch +# detect cciss/ida/i2o +Patch504: grub-0.95-moreraid.patch +# we need to use O_DIRECT to avoid hitting oddities with caching +Patch800: grub-0.95-odirect.patch + # the 2.6 kernel no longer does geometry fixups. so now I get to do it # instead in userspace everywhere. Patch1000: grub-0.94-geometry-26kernel.patch @@ -89,10 +96,14 @@ %patch500 -p1 -b .raid %patch501 -p1 -b .initrdmax +%patch503 -p1 -b .i2o +%patch504 -p1 -b .moreraid -#%patch1000 -p1 -b .26geom +%patch800 -p1 -b .odirect +%patch1000 -p1 -b .26geom + %build autoreconf --install --force CFLAGS="-Os -g %{?no_stack_protector}" ; export CFLAGS @@ -129,6 +140,9 @@ %changelog +* Sun Dec 19 2004 Jaakko Heinonen 0.95-2jh +- add patches from Fedora + * Mon Nov 8 2004 Jaakko Heinonen 0.94-4jh - exclude info documents - build statically on x86_64 From svn at tinysofa.org Sun Dec 19 22:07:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 19 Dec 2004 17:07:47 -0500 (EST) Subject: [tinysofa-svn] r5235 - in contrib/1.1: . silc-client silc-client/current silc-client/current/sources silc-client/current/specs Message-ID: <20041219220747.DAC9D344201@minbar.tinysofa.org> Author: jh Date: 2004-12-19 17:07:06 -0500 (Sun, 19 Dec 2004) New Revision: 5235 Added: contrib/1.1/silc-client/ contrib/1.1/silc-client/current/ contrib/1.1/silc-client/current/sources/ contrib/1.1/silc-client/current/sources/silc-client-0.9.10-aliases.patch contrib/1.1/silc-client/current/sources/silc-client-0.9.12-uidchk.patch contrib/1.1/silc-client/current/sources/silc-client-1.0.1.tar.bz2 contrib/1.1/silc-client/current/specs/ contrib/1.1/silc-client/current/specs/silc-client.spec contrib/1.1/silc-client/pristine/ contrib/1.1/silc-client/releases/ Log: - add silc-client Added: contrib/1.1/silc-client/current/sources/silc-client-0.9.10-aliases.patch =================================================================== --- contrib/1.1/silc-client/current/sources/silc-client-0.9.10-aliases.patch 2004-12-19 21:10:06 UTC (rev 5234) +++ contrib/1.1/silc-client/current/sources/silc-client-0.9.10-aliases.patch 2004-12-19 22:07:06 UTC (rev 5235) @@ -0,0 +1,10 @@ +--- silc-client-0.9.10/irssi/silc.conf.johnny Sat Nov 30 09:30:47 2002 ++++ silc-client-0.9.10/irssi/silc.conf Fri Dec 6 17:32:26 2002 +@@ -38,6 +38,7 @@ + SIGNOFF = "quit"; + DESCRIBE = "action"; + LAST = "lastlog"; ++ DCC = "FILE $0 $2 $1 $3-"; + SAY = "msg *"; + WHO = "users *"; + WI = "whois"; Added: contrib/1.1/silc-client/current/sources/silc-client-0.9.12-uidchk.patch =================================================================== --- contrib/1.1/silc-client/current/sources/silc-client-0.9.12-uidchk.patch 2004-12-19 21:10:06 UTC (rev 5234) +++ contrib/1.1/silc-client/current/sources/silc-client-0.9.12-uidchk.patch 2004-12-19 22:07:06 UTC (rev 5235) @@ -0,0 +1,60 @@ +--- silc-client-0.9.12/irssi/src/fe-text/silc.c.johnny Wed Jan 15 17:01:13 2003 ++++ silc-client-0.9.12/irssi/src/fe-text/silc.c Tue Mar 18 14:12:19 2003 +@@ -74,7 +74,7 @@ + void term_dummy_init(void); + void term_dummy_deinit(void); + +-static int dirty, full_redraw, dummy; ++static int dirty, full_redraw, dummy, forceroot; + + static GMainLoop *main_loop; + int quitting; +@@ -280,6 +280,32 @@ + g_free(path); + } + ++static void check_uid(void) ++{ ++ unsigned int my_uid; ++ ++ my_uid = getuid(); ++ if (my_uid != geteuid()) { ++ fprintf(stderr, "\nWarning! SILC client was not designed to be run as setuid.\n"); ++ fprintf(stderr, "We *STRONGLY* suggest you to remove the setuid bit from the executable.\n\n"); ++ goto go_out; ++ } ++ ++ if (!forceroot && (my_uid == 0)) { ++ fprintf(stderr, "\nWarning, you are trying to run SILC as root!\n\n"); ++ fprintf(stderr, "This is a bad idea because this software was not developed to be ran as" ++ "a privileged user.\n"); ++ fprintf(stderr, "If you understand this and you *REALLY* want to run the client as root\n" ++ "start it with the `-r' (`--forceroot') command line switch.\n\n"); ++ goto go_out; ++ } ++ ++ return; ++ ++go_out: ++ exit(1); ++} ++ + static void check_files(void) + { + struct stat statbuf; +@@ -313,6 +339,7 @@ + #if 0 /* --dummy is not available in SILC Client */ + { "dummy", 'd', POPT_ARG_NONE, &dummy, 0, "Use the dummy terminal mode", NULL }, + #endif ++ { "forceroot", 'r', POPT_ARG_NONE, &forceroot, 0, "Force allow running as root (discouraged)", NULL }, + { NULL, '\0', 0, NULL } + }; + +@@ -345,6 +372,7 @@ + textui_init(); + args_register(options); + args_execute(argc, argv); ++ check_uid(); + + if (!dummy && !term_init()) { + fprintf(stderr, "Can't initialize screen handling, quitting.\n"); Added: contrib/1.1/silc-client/current/sources/silc-client-1.0.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/silc-client/current/sources/silc-client-1.0.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.1/silc-client/current/specs/silc-client.spec =================================================================== --- contrib/1.1/silc-client/current/specs/silc-client.spec 2004-12-19 21:10:06 UTC (rev 5234) +++ contrib/1.1/silc-client/current/specs/silc-client.spec 2004-12-19 22:07:06 UTC (rev 5235) @@ -0,0 +1,272 @@ +%define _silcdatadir %{_datadir}/silc +%define _silclibdir %{_libdir}/silc +%define _silcetcdir %{_sysconfdir}/silc +%define with_perl 1 + +Summary: A fully encrypted IRC-style chat client +Name: silc-client +Version: 1.0.1 +Release: 1jh +License: GPL +Group: contrib +URL: http://www.silcnet.org/ +Source: ftp://ftp.silcnet.org/silc/client/sources/silc-client-%{version}.tar.bz2 +Patch1: silc-client-0.9.10-aliases.patch +Patch2: silc-client-0.9.12-uidchk.patch +Requires: ncurses >= 5.2 +BuildRequires: ncurses-devel >= 5.2 glib-devel gmp-devel perl perl-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +SILC (Secure Internet Live Conferencing) is a protocol which provides +secure conferencing services on the Internet over insecure channel. +SILC is IRC-like software although internally they are very different. +The biggest similarity between SILC and IRC is that they both provide +conferencing services and that SILC has almost the same commands as IRC. +Other than that they are nothing alike. Major differences are that SILC +is secure what IRC is not in any way. The network model is also entirely +different compared to IRC. + + +%prep +%setup -q +%patch1 -p1 -b .aliases +%patch2 -p1 -b .uidchk +chmod 644 CHANGES COPYING CREDITS README TODO doc/FAQ +chmod 644 doc/example_silcd.conf doc/silcalgs.conf doc/*.txt +chmod 644 irssi/docs/*.txt irssi/docs/*.html + + +%build +%configure --cache-file=`pwd`/config.cache --with-etcdir=%{_silcetcdir} \ +--with-helpdir=%{_silcdatadir}/help --with-logsdir=%{_var}/log/silc \ +--with-simdir=%{_silclibdir}/modules --disable-ipv6 --disable-debug \ +--with-silcd-pid-file=%{_var}/run/silcd.pid --with-perl=module \ +--with-perl-lib=%{_libdir}/perl5/%{perl_version} --with-gmp + +# Set the built-in default perl module dir +# We don't care even if it doesn't exist yet +%make -j1 \ + PERL_USE_LIB=%{_silclibdir}/perl5 \ + CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT" + + +%install +%makeinstall_std PREFIX="$RPM_BUILD_ROOT%{_prefix}" + +# put the silc.conf file back in its place +cp -p $RPM_BUILD_ROOT%{_prefix}/doc/example_silc.conf $RPM_BUILD_ROOT%{_silcetcdir}/silc.conf + +# Now install the perl support related files +%if %{with_perl} +mkdir -p $RPM_BUILD_ROOT%{_silclibdir} +pushd $RPM_BUILD_ROOT%{_silclibdir} +mkdir perl5 +cp -a $RPM_BUILD_ROOT/usr/lib/perl5/5.?.*/*linux*/* perl5 +# clean not needed files +rm -f perl5/perllocal.pod +find perl5 -name .packlist -exec rm -f '{}' \; +popd +%endif + +rm -fr \ + $RPM_BUILD_ROOT%{_prefix}/doc \ + $RPM_BUILD_ROOT%{_prefix}/*.{a,la} \ + $RPM_BUILD_ROOT%{_libdir}/perl5 + + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root) +%doc CHANGES COPYING CREDITS README TODO doc/FAQ +%doc irssi/docs/signals.txt +%doc irssi/docs/formats.txt +%doc irssi/docs/manual.txt +%doc irssi/docs/startup-HOWTO.html +%doc irssi/docs/special_vars.txt + +%{_bindir}/silc +%{_mandir}/man1/*.1* + +%dir %{_silcdatadir} +%{_silcdatadir}/help +%{_silcdatadir}/scripts + +%dir %{_silcdatadir}/themes +%config %{_silcdatadir}/themes/default.theme + +%if %{with_perl} +%dir %{_silclibdir} +%{_silclibdir}/perl5 +%dir %{_silclibdir}/modules +%exclude %{_silclibdir}/modules/* +%{_silclibdir}/modules/libfe_perl.so +%{_silclibdir}/modules/libperl_core.so +%endif + +%dir %{_silcetcdir} +%config %{_silcetcdir}/silc.conf + + +%changelog +* Sun Dec 19 2004 Jaakko Heinonen 1.0.1-1jh +- tinysofa contrib + +* Thu Jan 15 2004 Giovanni Giacobbi 1.0.1-1 +- Updated packate to version 1.0.1 + +* Thu Nov 27 2003 Giovanni Giacobbi 1.0-1 +- Updated packate to version 1.0 +- Fixed perl5 installation path + +* Sat Oct 25 2003 Giovanni Giacobbi 0.9.14-1 +- Updated packate to version v0.9.14 + +* Fri Oct 17 2003 Giovanni Giacobbi 0.9.13-1 +- Updated packate to version v0.9.13 +- Removed manfix patch (no longer needed) + +* Tue Mar 18 2003 Giovanni Giacobbi 0.9.12-1 +- Updated package to version v0.9.12 +- Updated packager's info + +* Wed Jan 8 2003 Giovanni Giacobbi 0.9.11-1 +- Updated package to version v0.9.11 +- Removed merged patches +- Restored the perl support + +* Fri Dec 13 2002 Giovanni Giacobbi 0.9.10-3 +- Fixed a bug in packaging (modules dir was not owned by the package) +- Fixed the default.theme file for the broken query nickname + +* Fri Dec 6 2002 Giovanni Giacobbi 0.9.10-2 +- Updated the aliases patch +- Updated package to version v0.9.10 + +* Fri Nov 29 2002 Giovanni Giacobbi 0.9.9-2 +- Updated package to version v0.9.9 +- Added a patch for installing man pages properly +- Temporarily removed the perl support because of the broken libtool + building support. + +* Tue Oct 22 2002 Giovanni Giacobbi 0.9.7-1 +- Updated the obsolete "Copyright:" header +- Updated package to version v0.9.7 +- Removed following patches (merged): clientftp, hostname, nomime. + +* Tue Sep 10 2002 Giovanni Giacobbi 0.9.5-4 +- Updated the fix for the bug [#24] (official one) +- Added some warning messages when using setuid binary or root user. + +* Sun Sep 8 2002 Giovanni Giacobbi 0.9.5-3 +- Added some user-friendly aliases +- Removed some unsafe code from the original client +- Also fixed temporarily the /detach bug [#24] + +* Sat Sep 7 2002 Giovanni Giacobbi 0.9.5-2 +- Updated package to version v0.9.5 +- Added a temporary fix for the "(null)" hostname bug + +* Mon Jun 24 2002 Giovanni Giacobbi 0.9.4-1 +- Updated package to version v0.9.4 + +* Wed Jun 19 2002 Giovanni Giacobbi 0.9.2-1 +- Updated package to version v0.9.2 + +* Sat May 18 2002 Giovanni Giacobbi 0.9.1-1 +- Updated package to version v0.9.1 + +* Thu May 16 2002 Giovanni Giacobbi 0.9-1 +- Updated package to version v0.9 + +* Tue Apr 16 2002 Giovanni Giacobbi +- Updated package to version v0.8.6 + +* Sun Mar 31 2002 Giovanni Giacobbi +- Updated package to version v0.8.5 + +* Thu Mar 28 2002 Giovanni Giacobbi +- Updated package to version v0.8.4 + +* Wed Mar 27 2002 Giovanni Giacobbi +- Updated package to version v0.8.3 +- Modularized Irssi perl support since it was causing too many troubles. + +* Tue Mar 12 2002 Giovanni Giacobbi +- Updated package to version v0.8.1 + +* Sun Mar 10 2002 Calum Selkirk +- changed /5.6.0/i386-linux/* perl5 to /5.6.*/*linux*/* perl5 + to make it less arch and perl version specific + +* Fri Mar 1 2002 Giovanni Giacobbi +- Added another silc path alias + +* Wed Feb 27 2002 Giovanni Giacobbi +- Updated package to version v0.8 +- Moved client help files to the datadir +- Added some Irssi documentation +- Added perl support related files +- Removed old buildfix patch, new config file style does not require it + +* Sun Feb 3 2002 Giovanni Giacobbi +- Updated package to version v0.7.6 +- And then, updated package to version v0.7.6.1. + +* Thu Jan 31 2002 Giovanni Giacobbi +- Updated package to version v0.7.4 +- And then, updated package to version v0.7.5. Hi Pekka! :-) + +* Wed Jan 23 2002 Giovanni Giacobbi +- Removed client config file patch (merged) +- Updated package to version v0.7.3 + +* Sat Jan 5 2002 Giovanni Giacobbi +- Fixed default client config file containing an unknown entry +- Updated package to version v0.7.2 + +* Thu Dec 20 2001 Giovanni Giacobbi +- Removed shared modules from the client rpm +- Updated package to version v0.7.1 + +* Mon Dec 10 2001 Giovanni Giacobbi +- Updated description text +- Updated source location to match new ftp tree +- Updated package to version v0.7 +- Added two options to the configure command + +* Wed Nov 14 2001 Giovanni Giacobbi +- Updated package to version v0.6.6 + +* Sun Nov 11 2001 Giovanni Giacobbi +- Updated package to version v0.6.5 + +* Wed Nov 7 2001 Giovanni Giacobbi +- removed some client unrelated documentation + +* Sun Nov 4 2001 Giovanni Giacobbi +- Updated package to version v0.6.4 + +* Tue Oct 30 2001 Giovanni Giacobbi +- Updated package to version v0.6.3 + +* Mon Oct 29 2001 Giovanni Giacobbi +- Updated package to version v0.6.2 +- Fixed chmod permissions of doc files + +* Tue Oct 23 2001 Giovanni Giacobbi +- Updated package to version v0.6.1 + +* Thu Oct 20 2001 Giovanni Giacobbi +- Fixed a bug where the Makefile installer was checking if the + non-chrooted file existed before installing the chrooted one +- Fixed the doclist adding also a patch-backup file + +* Thu Oct 18 2001 Giovanni Giacobbi +- Updated package to version v0.6 + +* Tue Oct 4 2001 Giovanni Giacobbi +- First testing package v0.5.4 From svn at tinysofa.org Mon Dec 20 09:59:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 04:59:06 -0500 (EST) Subject: [tinysofa-svn] r5236 - in tinysofa/releases/1.1: cyrus-imapd/current/sources cyrus-imapd/current/specs cyrus-sasl/current/sources cyrus-sasl/current/specs setup/current/sources setup/current/specs Message-ID: <20041220095906.331C1344201@minbar.tinysofa.org> Author: jh Date: 2004-12-20 04:58:02 -0500 (Mon, 20 Dec 2004) New Revision: 5236 Added: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.20.tar.gz tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-sasl.patch Removed: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.19.tar.gz Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec tinysofa/releases/1.1/setup/current/specs/setup.spec Log: - new cyrus-sasl upstream - add sasldb group for cyrys sasl database - cyrus-imapd file permissions/owners rationalization Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc 2004-12-19 22:07:06 UTC (rev 5235) +++ tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc 2004-12-20 09:58:02 UTC (rev 5236) @@ -19,6 +19,8 @@ prog="Cyrus IMAP" master=/usr/lib/cyrus-imapd/bin/master +umask 027 + stop() { echo -n $"Stopping $prog: " killproc cyrus-master Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-19 22:07:06 UTC (rev 5235) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-20 09:58:02 UTC (rev 5236) @@ -20,15 +20,18 @@ Patch3: cyrus-imapd-perl-path2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: cyrus-sasl, db4, imapd-pam, libcom_err +# for sasldb group +PreReq: cyrus-sasl +Requires: db4, imapd-pam, libcom_err BuildRequires: cyrus-sasl-devel, e2fsprogs-devel, perl, perl-devel, tcp_wrappers-devel BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel BuildRequires: autoconf, byacc, bison, flex -Prereq: shadow-utils, glibc, coreutils, openssl >= 0.9.7e-2jh +Prereq: shadow-utils, glibc, coreutils, openssl >= 0.9.7e-2jh, make %service_requires Provides: imapd %define mail_gid 12 %define cyrus_uid 110 +%define cyrus_gid 110 %description The Cyrus IMAP server is a scaleable enterprise mail system @@ -181,9 +184,12 @@ if [ -z "`getent group mail`" ]; then /usr/sbin/groupadd -g %{mail_gid} mail fi +if [ -z "`getent group cyrus`" ]; then + /usr/sbin/groupadd -g %{cyrus_gid} cyrus +fi if [ -z "`getent passwd cyrus`" ]; then /usr/sbin/useradd -d /var/spool/cyrus-imap -s /bin/sh \ - -g mail -u %{cyrus_uid} cyrus + -g cyrus -G sasldb -u %{cyrus_uid} cyrus fi %post @@ -231,9 +237,17 @@ %config(noreplace) %{_sysconfdir}/%{name}/cyrus.conf %config(noreplace) %{_sysconfdir}/%{name}/imapd.conf %attr(0755,root,root) %{_initrddir}/cyrus -%attr(0750,cyrus,mail) /var/spool/cyrus-imap -%exclude /var/spool/cyrus-imap/mailboxes -%attr(0640,cyrus,mail) /var/spool/cyrus-imap/mailboxes +%attr(0750,cyrus,mail) %dir /var/spool/cyrus-imap +%attr(0640,cyrus,cyrus) /var/spool/cyrus-imap/mailboxes +%attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/db +%attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/log +%attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/msg +%attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/proc +%attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/quota +%attr(0750,cyrus,mail) /var/spool/cyrus-imap/socket +%attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/spool +%attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/stage +%attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/user %{perl_sitearch}/Cyrus %{perl_sitearch}/auto/Cyrus %{_libdir}/%{name} Deleted: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.19.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.20.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-sasl-2.1.20.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec =================================================================== --- tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2004-12-19 22:07:06 UTC (rev 5235) +++ tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2004-12-20 09:58:02 UTC (rev 5236) @@ -1,21 +1,23 @@ -%define _plugindir2 %{_libdir}/sasl2 +%define _plugindir2 %{_libdir}/sasl2 +%define sasldb_group 113 Summary: The Cyrus SASL library. Name: cyrus-sasl -Version: 2.1.19 +Version: 2.1.20 Release: 1jh License: Distributable Group: main Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz Source1: cyrus-saslauthd.init Source2: cyrus-saslauthd-sysconfig -Patch: cyrus-sasl-CAN-2004-0884.patch URL: http://asg.web.cmu.edu/sasl/sasl-library.html BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libtool, groff BuildRequires: db4-devel, openssl-devel, pam-devel, autoconf, automake, gcc-c++ BuildRequires: mysql-devel, mysql-libs, postgresql-devel %service_requires +%accountman_requires +PreReq: /sbin/ldconfig Requires: pam, db4, openssl %description @@ -23,7 +25,6 @@ SASL is the Simple Authentication and Security Layer, a method for adding authentication support to connection-based protocols. - %package devel Requires: %{name} = %{version}-%{release} Group: development @@ -49,7 +50,6 @@ The %{name}-plain package contains the Cyrus SASL plugins which support PLAIN and LOGIN authentication schemes. - %package md5 Requires: %{name} = %{version}-%{release} Group: extra @@ -59,7 +59,6 @@ The %{name}-md5 package contains the Cyrus SASL plugins which support CRAM-MD5 and DIGEST-MD5 authentication schemes. - %package sql Requires: %{name} = %{version}-%{release} Requires: mysql-libs,postgresql-libs @@ -84,10 +83,8 @@ %prep %setup -q -n cyrus-sasl-%{version} -%patch -p0 -b .CAN-2004-0884 -# FIXME - this is just weird -rm config/ltconfig config/libtool.m4 +rm -fr autom4te.cache config/ltconfig config/libtool.m4 libtoolize -f -c aclocal -I config -I cmulocal automake -a -c -f @@ -110,7 +107,7 @@ --disable-gssapi \ --with-rc4 \ --with-dblib=berkeley \ - --with-dbpath=/etc/sasl/sasldb \ + --with-dbpath=%{_sysconfdir}/sasl/sasldb \ --with-saslauthd=/var/run/saslauthd \ --without-pwcheck \ --enable-anon \ @@ -119,9 +116,9 @@ --enable-plain \ --enable-login \ --enable-sql \ - --with-pam=/usr/include/security \ - --with-pgsql=/usr/include/postgresql \ - --with-mysql=/usr + --with-pam=%{_includedir}/security \ + --with-pgsql=%{_includedir}/postgresql \ + --with-mysql=%{_prefix} %make @@ -143,27 +140,28 @@ install -m644 saslauthd/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/ # Create the sasldb2 directory. -install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl +install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl touch $RPM_BUILD_ROOT/%{_sysconfdir}/sasl/sasldb -chmod 600 $RPM_BUILD_ROOT/%{_sysconfdir}/sasl/sasldb # Create the saslauthd listening directory. -install -m755 -d $RPM_BUILD_ROOT/var/run/saslauthd -install -m755 -d $RPM_BUILD_ROOT/etc/init.d -install -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/saslauthd -install -m755 -d $RPM_BUILD_ROOT/etc/sysconfig -install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd +install -m755 -d %{buildroot}/var/run/saslauthd +install -m755 -d %{buildroot}%{_initrddir} +install -m755 %{SOURCE1} %{buildroot}%{_initrddir}/saslauthd +install -m755 -d %{buildroot}%{_sysconfdir}/sysconfig +install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/saslauthd %clean %clean_buildroot +%pre +%groupadd sasldb %{sasldb_group) + %post /sbin/ldconfig %service_post saslauthd - %preun %service_preun saslauthd @@ -178,15 +176,15 @@ %{_libdir}/libsasl*.so.* %dir %{_plugindir2}/ %dir %{_sysconfdir}/sasl/ -%config(noreplace) %attr(600,root,root)%{_sysconfdir}/sasl/sasldb +%config(noreplace) %attr(640,root,sasldb)%{_sysconfdir}/sasl/sasldb %dir /var/run/saslauthd/ %{_plugindir2}/*anonymous*.so* %{_plugindir2}/*sasldb*.so* %{_mandir}/man8/* -%{_mandir}/cat8/* +%exclude %{_mandir}/cat8 %{_sbindir}/saslauthd -%attr(0755,root,root) /etc/init.d/saslauthd -%attr(0644,root,root) /etc/sysconfig/saslauthd +%attr(0755,root,root) %{_initrddir}/saslauthd +%attr(0644,root,root) %{_sysconfdir}/sysconfig/saslauthd %files utils %defattr(-,root,root) @@ -225,6 +223,11 @@ %changelog +* Mon Dec 20 2004 Jaakko Heinonen 2.1.20-1jh +- 2.1.20 +- spec cleanups +- create sasldb group + * Sat Oct 9 2004 Jaakko Heinonen 2.1.19-1jh - update to 2.1.19 Added: tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-sasl.patch =================================================================== --- tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-sasl.patch 2004-12-19 22:07:06 UTC (rev 5235) +++ tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-sasl.patch 2004-12-20 09:58:02 UTC (rev 5236) @@ -0,0 +1,7 @@ +--- setup-2.2.5/group.sasl 2004-12-20 10:23:33.453436323 +0200 ++++ setup-2.2.5/group 2004-12-20 10:23:58.380747699 +0200 +@@ -39,3 +39,4 @@ + cyrus:x:110: + slapd:x:111: + tftpd:x:112: ++sasldb:x:113:cyrus Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec =================================================================== --- tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-12-19 22:07:06 UTC (rev 5235) +++ tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-12-20 09:58:02 UTC (rev 5236) @@ -10,6 +10,7 @@ Patch2: setup-2.2.5-sbin-bash.patch Patch3: setup-2.2.5-no-dir.patch Patch4: setup-2.2.5-postfix.patch +Patch5: setup-2.2.5-sasl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Conflicts: initscripts < 4.26 @@ -27,6 +28,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -b .postfix~ +%patch5 -p1 -b .sasl~ %install From svn at tinysofa.org Mon Dec 20 11:36:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 06:36:18 -0500 (EST) Subject: [tinysofa-svn] r5237 - tinysofa/releases/1.1/fcron/current/specs Message-ID: <20041220113618.72D52344201@minbar.tinysofa.org> Author: jh Date: 2004-12-20 06:36:11 -0500 (Mon, 20 Dec 2004) New Revision: 5237 Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec Log: - change fcron.{deny,allow,conf} permissions Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec =================================================================== --- tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2004-12-20 09:58:02 UTC (rev 5236) +++ tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2004-12-20 11:36:11 UTC (rev 5237) @@ -1,7 +1,7 @@ Summary: The fcron daemon for executing specified programs at set times Name: fcron Version: 2.9.5.1 -Release: 1jh +Release: 2jh License: GPL Group: main Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz @@ -120,9 +120,9 @@ %{_mandir}/man5/fcron.conf.5* %{_mandir}/man3/bitstring.3* %defattr(-,root,root) -%attr(640,root,fcron) %config(noreplace) %{_sysconfdir}/fcron.conf -%attr(640,root,fcron) %config(noreplace) %{_sysconfdir}/fcron.allow -%attr(640,root,fcron) %config(noreplace) %{_sysconfdir}/fcron.deny +%attr(644,root,fcron) %config(noreplace) %{_sysconfdir}/fcron.conf +%attr(644,root,fcron) %config(noreplace) %{_sysconfdir}/fcron.allow +%attr(644,root,fcron) %config(noreplace) %{_sysconfdir}/fcron.deny %{_initrddir}/fcron %attr(6755,root,root) %{_bindir}/convert-fcrontab %attr(6755,root,root) %{_bindir}/fcronsighup @@ -134,6 +134,9 @@ %changelog +* Mon Dec 20 2004 Jaakko Heinonen 2.9.5.1-2jh +- change fcron.{deny,allow,conf} permissions + * Tue Nov 16 2004 Jaakko Heinonen 2.9.5.1-1jh - 2.9.5.1 which fixes fcronsighup vulnerabilities From svn at tinysofa.org Mon Dec 20 12:42:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 07:42:29 -0500 (EST) Subject: [tinysofa-svn] r5238 - contrib/1.1/silc-client/current/specs Message-ID: <20041220124229.ACA76344201@minbar.tinysofa.org> Author: jh Date: 2004-12-20 07:42:22 -0500 (Mon, 20 Dec 2004) New Revision: 5238 Modified: contrib/1.1/silc-client/current/specs/silc-client.spec Log: - BR: glib 1.2 instead of 2.0 Modified: contrib/1.1/silc-client/current/specs/silc-client.spec =================================================================== --- contrib/1.1/silc-client/current/specs/silc-client.spec 2004-12-20 11:36:11 UTC (rev 5237) +++ contrib/1.1/silc-client/current/specs/silc-client.spec 2004-12-20 12:42:22 UTC (rev 5238) @@ -14,7 +14,7 @@ Patch1: silc-client-0.9.10-aliases.patch Patch2: silc-client-0.9.12-uidchk.patch Requires: ncurses >= 5.2 -BuildRequires: ncurses-devel >= 5.2 glib-devel gmp-devel perl perl-devel +BuildRequires: ncurses-devel >= 5.2 glib12-devel gmp-devel perl perl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root %description From svn at tinysofa.org Mon Dec 20 16:24:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 11:24:07 -0500 (EST) Subject: [tinysofa-svn] r5239 - in tinysofa/releases/1.1: cyrus-imapd/current/specs cyrus-sasl/current/specs Message-ID: <20041220162407.60E63344288@minbar.tinysofa.org> Author: jh Date: 2004-12-20 11:23:53 -0500 (Mon, 20 Dec 2004) New Revision: 5239 Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec Log: - minor cleanups Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-20 12:42:22 UTC (rev 5238) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-20 16:23:53 UTC (rev 5239) @@ -180,7 +180,6 @@ %pre -# Dynamically add the cyrus user BEFORE installing package if [ -z "`getent group mail`" ]; then /usr/sbin/groupadd -g %{mail_gid} mail fi @@ -193,11 +192,12 @@ fi %post -# force synchronous updates -# Note: This will slow down user creation for 10.000+ users! -chattr -R +S /var/spool/cyrus-imap 2>/dev/null +if [ $1 -le 1 ]; then + # force synchronous updates on fresh installs + # Note: This will slow down user creation for 10.000+ users! + chattr -R +S /var/spool/cyrus-imap 2>/dev/null +fi %service_post cyrus -echo "Don't forget to activate the mail transport to cyrus in postfix" # Create SSL certificates exec > /dev/null 2> /dev/null Modified: tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec =================================================================== --- tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2004-12-20 12:42:22 UTC (rev 5238) +++ tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2004-12-20 16:23:53 UTC (rev 5239) @@ -1,5 +1,5 @@ %define _plugindir2 %{_libdir}/sasl2 -%define sasldb_group 113 +%define sasldb_gid 113 Summary: The Cyrus SASL library. Name: cyrus-sasl @@ -156,7 +156,7 @@ %pre -%groupadd sasldb %{sasldb_group) +%groupadd sasldb %{sasldb_gid) %post /sbin/ldconfig From svn at tinysofa.org Mon Dec 20 16:42:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 11:42:33 -0500 (EST) Subject: [tinysofa-svn] r5240 - tinysofa/releases/1.1/tcp_wrappers/current/specs Message-ID: <20041220164233.09CA3344288@minbar.tinysofa.org> Author: jh Date: 2004-12-20 11:42:26 -0500 (Mon, 20 Dec 2004) New Revision: 5240 Modified: tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec Log: - add missing defattr Modified: tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec =================================================================== --- tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec 2004-12-20 16:23:53 UTC (rev 5239) +++ tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec 2004-12-20 16:42:26 UTC (rev 5240) @@ -126,6 +126,7 @@ %{_sbindir}/* %files devel +%defattr(-,root,root) %{_includedir}/* %{_libdir}/*.a %{_libdir}/*.so From svn at tinysofa.org Mon Dec 20 18:23:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 13:23:21 -0500 (EST) Subject: [tinysofa-svn] r5242 - contrib/1.1/xpdf/current/specs Message-ID: <20041220182321.1A237344288@minbar.tinysofa.org> Author: gda Date: 2004-12-20 13:23:14 -0500 (Mon, 20 Dec 2004) New Revision: 5242 Modified: contrib/1.1/xpdf/current/specs/xpdf.spec Log: new requirements for xorg-x11 6.8.1 Modified: contrib/1.1/xpdf/current/specs/xpdf.spec =================================================================== --- contrib/1.1/xpdf/current/specs/xpdf.spec 2004-12-20 16:59:00 UTC (rev 5241) +++ contrib/1.1/xpdf/current/specs/xpdf.spec 2004-12-20 18:23:14 UTC (rev 5242) @@ -7,7 +7,7 @@ Summary: A PDF file viewer for the X Window System. Name: xpdf Version: 3.00 -Release: 3jh +Release: 4gd License: GPL Epoch: 0 Url: http://www.foolabs.com/xpdf/ @@ -37,13 +37,15 @@ # security fix Patch100: xpdf-3.00-overflow.patch +Requires: xorg-x11-deprecated-libs + # for ghostscript fonts Requires: ghostscript #Requires: urw-fonts #Requires: htmlview BuildPrereq: lesstif-devel autoconf gcc-c++ -BuildPrereq: xorg-x11-devel +BuildPrereq: xorg-x11-devel xorg-x11-deprecated-libs-devel BuildPrereq: freetype-devel >= 2.1.7 BuildPrereq: fileutils @@ -237,6 +239,9 @@ %lang(ko) %{_datadir}/xpdf/korean %changelog +* Mon Dec 20 2004 Gerald Dachs 3.00-4gd +- fixed requirements for xorg-x11 6.8.1 + * Wed Oct 27 2004 Jaakko Heinonen 3.00-3jh - patch for can-2004-0888, can-2004-0889 - other patches From svn at tinysofa.org Mon Dec 20 18:37:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 13:37:29 -0500 (EST) Subject: [tinysofa-svn] r5243 - contrib/1.1/lesstif/current/specs Message-ID: <20041220183729.AFCAA344288@minbar.tinysofa.org> Author: gda Date: 2004-12-20 13:37:22 -0500 (Mon, 20 Dec 2004) New Revision: 5243 Modified: contrib/1.1/lesstif/current/specs/lesstif.spec Log: new requirements for xorg-x11 6.8.1 Modified: contrib/1.1/lesstif/current/specs/lesstif.spec =================================================================== --- contrib/1.1/lesstif/current/specs/lesstif.spec 2004-12-20 18:23:14 UTC (rev 5242) +++ contrib/1.1/lesstif/current/specs/lesstif.spec 2004-12-20 18:37:22 UTC (rev 5243) @@ -3,7 +3,7 @@ Summary: An OSF/Motif(R) clone. Name: lesstif Version: 0.94.0 -Release: 1jh +Release: 2gd License: LGPL Group: contrib Source: ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/lesstif-%{version}.tar.bz2 @@ -12,7 +12,7 @@ Obsoletes: lesstif-clients Obsoletes: lesstif-mwm -BuildRequires: xorg-x11-devel gcc-c++ +BuildRequires: xorg-x11-devel gcc-c++ xorg-x11-deprecated-libs-devel BuildRequires: bison BuildRequires: flex @@ -32,7 +32,7 @@ %package devel Summary: Static library and header files for LessTif/Motif development. Group: contrib -Requires: xorg-x11-devel, lesstif = %{version} +Requires: xorg-x11-devel, lesstif = %{version}, xorg-x11-deprecated-libs-devel %description devel Lesstif-devel contains the lesstif static library and header files @@ -155,6 +155,9 @@ %changelog +* Mon Dec 20 2004 Gerald Dachs 0.94.0-2gd +- fixed requirements for xorg-x11 6.8.1 + * Wed Dec 15 2004 Jaakko Heinonen 0.94.0-1jh - 0.94.0, fixes CAN-2004-0914 From svn at tinysofa.org Mon Dec 20 19:52:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 14:52:22 -0500 (EST) Subject: [tinysofa-svn] r5244 - contrib/1.1/ddd/current/specs Message-ID: <20041220195222.1E4A7344288@minbar.tinysofa.org> Author: gda Date: 2004-12-20 14:52:15 -0500 (Mon, 20 Dec 2004) New Revision: 5244 Modified: contrib/1.1/ddd/current/specs/ddd.spec Log: new requirements for xorg-x11 6.8.1 Modified: contrib/1.1/ddd/current/specs/ddd.spec =================================================================== --- contrib/1.1/ddd/current/specs/ddd.spec 2004-12-20 18:37:22 UTC (rev 5243) +++ contrib/1.1/ddd/current/specs/ddd.spec 2004-12-20 19:52:15 UTC (rev 5244) @@ -6,7 +6,7 @@ Summary: A GUI for several command-line debuggers. Name: ddd Version: 3.3.9 -Release: 1gd +Release: 2gd License: GPL or BSD Group: contrib URL: http://www.gnu.org/software/ddd/ @@ -20,10 +20,11 @@ BuildPreReq: lesstif-devel BuildPreReq: libtermcap-devel BuildPreReq: xorg-x11-devel +BuildPreReq: xorg-x11-deprecated-libs-devel BuildPreReq: ncurses-devel BuildPreReq: gcc-c++ -Requires: lesstif +Requires: lesstif xorg-x11-deprecated-libs %description The Data Display Debugger (DDD) is a popular GUI for command-line @@ -88,6 +89,9 @@ %changelog +* Mon Dec 20 2004 Gerald Dachs 3.3.9-2gd +- fixed requirements for xorg-x11 6.8.1 + * Thu Oct 14 2004 Gerald Dachs 3.3.9-1gd - new in tinysofa contrib From svn at tinysofa.org Mon Dec 20 20:02:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 15:02:18 -0500 (EST) Subject: [tinysofa-svn] r5245 - contrib/1.1/nedit/current/specs Message-ID: <20041220200218.7584C344288@minbar.tinysofa.org> Author: gda Date: 2004-12-20 15:02:11 -0500 (Mon, 20 Dec 2004) New Revision: 5245 Modified: contrib/1.1/nedit/current/specs/nedit.spec Log: new requirements for xorg-x11 6.8.1 Modified: contrib/1.1/nedit/current/specs/nedit.spec =================================================================== --- contrib/1.1/nedit/current/specs/nedit.spec 2004-12-20 19:52:15 UTC (rev 5244) +++ contrib/1.1/nedit/current/specs/nedit.spec 2004-12-20 20:02:11 UTC (rev 5245) @@ -6,7 +6,7 @@ Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.4 -Release: 4jh +Release: 5gd Source: http://nedit.org/ftp/v5_3/nedit-%{version}-source.tar.gz Source1: nedit.desktop Source2: nedit-icon.png @@ -17,8 +17,9 @@ URL: http://nedit.org License: distributable Group: contrib +Requires: xorg-x11-deprecated-libs BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: lesstif-devel xorg-x11-devel +BuildRequires: lesstif-devel xorg-x11-devel xorg-x11-deprecated-libs-devel %if %{desktop_file} BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} %endif @@ -89,6 +90,9 @@ %endif %changelog +* Mon Dec 20 2004 Gerald Dachs 5.4-4gd +- fixed requirements for xorg-x11 6.8.1 + * Sat Oct 2 2004 Jaakko Heinonen 5.4-3jh - add icewm menu file From svn at tinysofa.org Mon Dec 20 22:21:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 20 Dec 2004 17:21:59 -0500 (EST) Subject: [tinysofa-svn] r5247 - in tinysofa/releases/1.1: cyrus-imapd/current/specs sysstat/current/specs Message-ID: <20041220222159.D801E344288@minbar.tinysofa.org> Author: jh Date: 2004-12-20 17:21:46 -0500 (Mon, 20 Dec 2004) New Revision: 5247 Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec Log: - multilib fixes Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-20 20:51:41 UTC (rev 5246) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-12-20 22:21:46 UTC (rev 5247) @@ -131,7 +131,9 @@ # Install rc script install -m 755 %{SOURCE14} %{buildroot}/%{_initrddir}/cyrus # fix libdir -perl -pi -e 's|/usr/lib|%{_libdir}|g' %{buildroot}/%{_initrddir}/cyrus +perl -pi -e 's|/usr/lib|%{_libdir}|g' \ + %{buildroot}%{_initrddir}/cyrus \ + %{buildroot}%{_sysconfdir}/cron.daily/%{name} # Build and populate /var/spool %{__mkdir_p} -m 0755 \ Modified: tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec =================================================================== --- tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2004-12-20 20:51:41 UTC (rev 5246) +++ tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2004-12-20 22:21:46 UTC (rev 5247) @@ -17,7 +17,7 @@ Patch5: sysstat-5.0.5-lib64init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: kernel >= 2.2.16-21 /sbin/chkconfig -Prereq: coreutils grep /etc/cron.daily +Prereq: coreutils grep %{_sysconfdir}/cron.daily BuildRequires: perl %{_includedir}/linux/if.h BuildRequires: gettext Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id @@ -73,11 +73,13 @@ DOC_DIR=%{_docdir} \ INIT_DIR=%{_initrddir} -mkdir -p %{buildroot}/etc/{cron.daily,cron.d,sysconfig} +mkdir -p %{buildroot}%{_sysconfdir}/{cron.daily,cron.d,sysconfig} -#install -m 0644 sysstat.crond %{buildroot}/etc/cron.d/sysstat -install %{SOURCE2} %{buildroot}/etc/cron.daily/sysstat -install -m 0644 %{SOURCE3} %{buildroot}/etc/sysconfig/sysstat +#install -m 0644 sysstat.crond %{buildroot}%{_sysconfdir}/cron.d/sysstat +install -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/sysstat +perl -pi -e "s|/usr/lib|%{_libdir}|g" \ + %{buildroot}%{_sysconfdir}/cron.daily/sysstat +install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/sysstat mkdir -p %{buildroot}%{_initrddir} install -m 0755 sysstat %{buildroot}%{_initrddir}/ @@ -107,9 +109,9 @@ %files -f %{name}.lang %defattr(-,root,root) %doc CHANGES COPYING CREDITS README TODO -#config(noreplace) /etc/cron.d/sysstat -%config(noreplace) /etc/cron.daily/sysstat -%config(noreplace) /etc/sysconfig/sysstat +#config(noreplace) %{_sysconfdir}/cron.d/sysstat +%config(noreplace) %{_sysconfdir}/cron.daily/sysstat +%config(noreplace) %{_sysconfdir}/sysconfig/sysstat %{_initrddir}/sysstat %{_bindir}/* %{_libdir}/sa From svn at tinysofa.org Tue Dec 21 06:50:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 21 Dec 2004 01:50:55 -0500 (EST) Subject: [tinysofa-svn] r5249 - in contrib/1.1: . ucarp ucarp/current ucarp/current/sources ucarp/current/specs Message-ID: <20041221065055.3A82B344288@minbar.tinysofa.org> Author: jh Date: 2004-12-21 01:50:37 -0500 (Tue, 21 Dec 2004) New Revision: 5249 Added: contrib/1.1/ucarp/ contrib/1.1/ucarp/current/ contrib/1.1/ucarp/current/sources/ contrib/1.1/ucarp/current/sources/carp.init contrib/1.1/ucarp/current/sources/ucarp-1.1.tar.bz2 contrib/1.1/ucarp/current/sources/vip-001.conf.example contrib/1.1/ucarp/current/specs/ contrib/1.1/ucarp/current/specs/ucarp.spec contrib/1.1/ucarp/pristine/ contrib/1.1/ucarp/releases/ Log: - add ucarp Added: contrib/1.1/ucarp/current/sources/carp.init =================================================================== --- contrib/1.1/ucarp/current/sources/carp.init 2004-12-20 23:52:23 UTC (rev 5248) +++ contrib/1.1/ucarp/current/sources/carp.init 2004-12-21 06:50:37 UTC (rev 5249) @@ -0,0 +1,143 @@ +#!/bin/bash +# $Id: carp.init 1527 2004-07-09 15:23:54Z dude $ +# +# chkconfig: - 91 09 +# description: Starts and stops ucarp. \ +# used to provide common address redundancy. + +# Source function library. +. /etc/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +get_files() { + FILES=`find /etc/sysconfig/carp -type f -name 'vip-*.conf' -maxdepth 1 \ + -printf "%f\n" | LC_COLLATE="C" sort` +} + +prog=$"common address redundancy protocol daemon" +RETVAL=0 + +start() { + echo -n $"Starting ${prog}: " + + get_files + + if [ -z "${FILES}" ]; then + failure $"no virtual addresses are configured in /etc/sysconfig/carp/" + RETVAL=1 + else + for FILE in ${FILES}; do + # Check that the file name gives us an ID between 1 and 255 + ID=`echo ${FILE}| sed 's/^vip-\(.*\).conf/\1/'` + if [ ${ID} -lt 1 -o ${ID} -gt 255 ]; then + initlog $INITLOG_ARGS -n carp -s "configuration file name ${FILE} gave us a bad ID of ${ID}:" -e 2 + RETVAL=1 + break + fi + + # Source ucarp settings + . /etc/sysconfig/carp/${FILE} + + # Check that we have the ifcfg- file for the main interface + if [ -f /etc/sysconfig/network-scripts/ifcfg-${BIND_INTERFACE} ]; then + . /etc/sysconfig/network-scripts/ifcfg-${BIND_INTERFACE} + else + initlog $INITLOG_ARGS -n carp -s $"no ifcfg-${BIND_INTERFACE} file found for carp ${FILE} configuration:" -e 2 + RETVAL=1 + break + fi + # Check that the ifcfg- file does have an IPADDR + BIND_ADDRESS=${IPADDR} + if [ -z "${BIND_ADDRESS}" ]; then + initlog $INITLOG_ARGS -n carp -s $"no IPADDR found in interface file ifcfg-${BIND_INTERFACE}:" -e 2 + RETVAL=1 + break + fi + + # Check that we have the ifcfg- file for the virtual interface + if [ -f /etc/sysconfig/network-scripts/ifcfg-${VIP_INTERFACE} ]; then + . /etc/sysconfig/network-scripts/ifcfg-${VIP_INTERFACE} + else + initlog $INITLOG_ARGS -n carp -s $"no ifcfg-${VIP_INTERFACE} file found for carp ${FILE} configuration:" -e 2 + RETVAL=1 + break + fi + # Check that the ifcfg- file does have an IPADDR + VIP_ADDRESS=${IPADDR} + if [ -z "${VIP_ADDRESS}" ]; then + initlog $INITLOG_ARGS -n carp -s "no IPADDR found in interface file ifcfg-${VIP_INTERFACE}:" -e 2 + RETVAL=1 + break + fi + + daemon /usr/sbin/ucarp -v ${ID} -p ${PASSWORD} -s ${BIND_ADDRESS} -a ${VIP_ADDRESS} -i ${VIP_INTERFACE} ${OPTIONS} -B --upscript=/etc/sysconfig/carp/vip-up --downscript=/etc/sysconfig/carp/vip-down + LAUNCH_RETVAL=$? + [ ${LAUNCH_RETVAL} -ne 0 ] && RETVAL=1 + done + [ "${RETVAL}" -ne 0 ] && failure $"error in one or more of the carp configurations, see above:" + fi + echo + [ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/carp +} + +stop() { + echo -n $"Shutting down $prog: " + killproc /usr/sbin/ucarp + RETVAL=$? + + # We put all interfaces managed by ucarp down when stopping the service + # to avoid conflicting "leftovers" + + get_files + + [ ! -z "${FILES}" ] && \ + for FILE in ${FILES}; do + + # Source ucarp settings + . /etc/sysconfig/carp/${FILE} + + # Check that we have the ifcfg- file for the virtual interface + if [ -f /etc/sysconfig/network-scripts/ifcfg-${VIP_INTERFACE} ]; then + if /sbin/ifconfig ${VIP_INTERFACE} down >/dev/null 2>&1; then + initlog $INITLOG_ARGS -n carp -s $"bringing down carp managed interface ${VIP_INTERFACE}:" -e 1 + else + initlog $INITLOG_ARGS -n carp -s $"bringing down carp managed interface ${VIP_INTERFACE}:" -e 2 + fi + fi + done + echo + [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/carp +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + condrestart|try-restart) + if [ -f /var/lock/subsys/carp ]; then + stop + start + fi + ;; + status) + status /usr/sbin/ucarp + ;; + *) + echo $"Usage: $0 {start|stop|restart|try-restart|status}" + exit 1 +esac + +exit $RETVAL Property changes on: contrib/1.1/ucarp/current/sources/carp.init ___________________________________________________________________ Name: svn:executable + * Added: contrib/1.1/ucarp/current/sources/ucarp-1.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/ucarp/current/sources/ucarp-1.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.1/ucarp/current/sources/vip-001.conf.example =================================================================== --- contrib/1.1/ucarp/current/sources/vip-001.conf.example 2004-12-20 23:52:23 UTC (rev 5248) +++ contrib/1.1/ucarp/current/sources/vip-001.conf.example 2004-12-21 06:50:37 UTC (rev 5249) @@ -0,0 +1,20 @@ +# Virtual IP configuration file for UCARP +# The number (from 001 to 255) in the name of the file is the identifier +# $Id: vip-001.conf.example 1527 2004-07-09 15:23:54Z dude $ + +# Set the same password on all mamchines sharing the same virtual IP +PASSWORD="love" + +# You are required to have an IPADDR= line in the configuration file for +# this interface (so no DHCP allowed) +BIND_INTERFACE="eth0" + +# Do *NOT* use a main interface for the virtual IP, use an ethX:Y alias +# with the corresponding /etc/sysconfig/network-scripts/ifcfg-ethX:Y file +# already configured and ith ONBOOT=no +VIP_INTERFACE="eth0:0" + +# If you have extra options to add, see "ucarp --help" output +# (the lower the "-k " the higher priority and "-P" to become master ASAP) +OPTIONS="-k 128 -P" + Added: contrib/1.1/ucarp/current/specs/ucarp.spec =================================================================== --- contrib/1.1/ucarp/current/specs/ucarp.spec 2004-12-20 23:52:23 UTC (rev 5248) +++ contrib/1.1/ucarp/current/specs/ucarp.spec 2004-12-21 06:50:37 UTC (rev 5249) @@ -0,0 +1,92 @@ +Summary: Common Address Redundancy Protocol (CARP) for Unix +Name: ucarp +Version: 1.1 +Release: 1jh +License: BSD +Group: contrib +URL: http://www.ucarp.org/ +Source: http://www.pureftpd.org/ucarp/ucarp-%{version}.tar.bz2 +Source1: carp.init +Source2: vip-001.conf.example +BuildRoot: %{_tmppath}/%{name}-%{version}-root +%service_requires +BuildRequires: libpcap, gettext + + +%description +UCARP allows a couple of hosts to share common virtual IP addresses in order +to provide automatic failover. It is a portable userland implementation of the +secure and patent-free Common Address Redundancy Protocol (CARP, OpenBSD's +alternative to the patents-bloated VRRP). +Strong points of the CARP protocol are: very low overhead, cryptographically +signed messages, interoperability between different operating systems and no +need for any dedicated extra network link between redundant hosts. + + +%prep +%setup -q + + +%build +export CPPFLAGS="$CPPFLAGS -I%{_includedir}/pcap" +%configure +%make + + +%install +%makeinstall +%find_lang %{name} + +# Install the init script +%{__install} -D -m 0755 %{SOURCE1} \ + %{buildroot}%{_initrddir}/carp + +# Install the example config file +%{__install} -D -m 0600 %{SOURCE2} \ + %{buildroot}/etc/sysconfig/carp/vip-001.conf.example + +# Install trivial interface up/down scripts +%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-up +#!/bin/sh +# We could use ifup directly, but it complains if the address is already used +#/sbin/ifup $1 +. /etc/sysconfig/network-scripts/ifcfg-$1 +#exec /sbin/ip addr add ${IPADDR}/${NETMASK} dev "$1" +exec /sbin/ifconfig $1 ${IPADDR} netmask ${NETMASK} up +EOF +%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-down +#!/bin/sh +#. /etc/sysconfig/network-scripts/ifcfg-$1 +#exec /sbin/ip addr del ${IPADDR}/${NETMASK} dev "$1" +exec /sbin/ifconfig $1 down +EOF + + +%clean +%clean_buildroot + + +%post +%service_post carp + +%preun +%service_preun carp + +%postun +%service_postun carp + + +%files -f %{name}.lang +%defattr(-, root, root, 0755) +%doc AUTHORS COPYING ChangeLog NEWS README examples/linux/*.sh +%{_initrddir}/carp +/etc/sysconfig/carp/vip-001.conf.example +%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-up +%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-down +%{_sbindir}/ucarp + + +%changelog +* Fri Jul 9 2004 Matthias Saou 1.0-1 +- Initial RPM release. + From svn at tinysofa.org Tue Dec 21 08:46:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 21 Dec 2004 03:46:52 -0500 (EST) Subject: [tinysofa-svn] r5250 - tinysofa/releases/1.1/dovecot/current/sources Message-ID: <20041221084652.2223E344288@minbar.tinysofa.org> Author: jh Date: 2004-12-21 03:46:44 -0500 (Tue, 21 Dec 2004) New Revision: 5250 Modified: tinysofa/releases/1.1/dovecot/current/sources/dovecot-conf.patch Log: - fix home directory location in default config Modified: tinysofa/releases/1.1/dovecot/current/sources/dovecot-conf.patch =================================================================== --- tinysofa/releases/1.1/dovecot/current/sources/dovecot-conf.patch 2004-12-21 06:50:37 UTC (rev 5249) +++ tinysofa/releases/1.1/dovecot/current/sources/dovecot-conf.patch 2004-12-21 08:46:44 UTC (rev 5250) @@ -34,7 +34,7 @@ # default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n # -#default_mail_env = -+default_mail_env = maildir:/home/users/%u/Maildir ++default_mail_env = maildir:/home/%u/Maildir # Space-separated list of fields to cache for all mails. Currently these # fields are allowed followed by a list of commands they speed up: From svn at tinysofa.org Tue Dec 21 10:13:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 21 Dec 2004 05:13:38 -0500 (EST) Subject: [tinysofa-svn] r5251 - tinysofa/releases/1.1/texinfo/current/specs Message-ID: <20041221101338.95F7A344288@minbar.tinysofa.org> Author: jh Date: 2004-12-21 05:13:31 -0500 (Tue, 21 Dec 2004) New Revision: 5251 Modified: tinysofa/releases/1.1/texinfo/current/specs/texinfo.spec Log: - cleanups - make it compile if debug packages are enabled Modified: tinysofa/releases/1.1/texinfo/current/specs/texinfo.spec =================================================================== --- tinysofa/releases/1.1/texinfo/current/specs/texinfo.spec 2004-12-21 08:46:44 UTC (rev 5250) +++ tinysofa/releases/1.1/texinfo/current/specs/texinfo.spec 2004-12-21 10:13:31 UTC (rev 5251) @@ -1,3 +1,5 @@ +%define with_i18n 0 + Summary: Tools needed to create Texinfo format documentation files. Name: texinfo Version: 4.7 @@ -12,10 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel, libtermcap-devel -# Redifine this to "dir" in the info directory isn't compressed -%define __spec_install_post /usr/lib/rpm/brp-strip \; /usr/lib/rpm/brp-strip-comment-note \; rm -f - - %description Texinfo is a documentation system that can produce both online information and printed output from a single source file. Normally, @@ -39,23 +37,25 @@ %build %configure %make -rm -f util/install-info ||: -make -C util LIBS=%{_libdir}/libz.a cd doc ../makeinfo/makeinfo --html --no-split texinfo.txi %install -mkdir -p $RPM_BUILD_ROOT/%{_htmldir}/texinfo +mkdir -p %{buildroot}%{_htmldir}/texinfo +rm -f util/install-info %makeinstall -install -m644 doc/texinfo.html $RPM_BUILD_ROOT/%{_htmldir}/texinfo +install -m644 doc/texinfo.html %{buildroot}%{_htmldir}/texinfo %nuke_info +%if %{with_i18n} %find_lang %{name} -rm -fr $RPM_BUILD_ROOT/usr/share/locale +%else +rm -fr %{buildroot}/usr/share/locale +%endif %clean @@ -69,8 +69,11 @@ %info_postun -#%files -f %{name}.lang +%if %{with_i18n} +%files -f %{name}.lang +%else %files +%endif %defattr(-,root,root) %doc AUTHORS ChangeLog INSTALL INTRODUCTION NEWS README TODO %doc info/README From svn at tinysofa.org Tue Dec 21 11:04:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 21 Dec 2004 06:04:53 -0500 (EST) Subject: [tinysofa-svn] r5252 - in tinysofa/releases/1.1/gdb/current: sources specs Message-ID: <20041221110453.BFC8A344288@minbar.tinysofa.org> Author: jh Date: 2004-12-21 06:00:23 -0500 (Tue, 21 Dec 2004) New Revision: 5252 Added: tinysofa/releases/1.1/gdb/current/sources/gdb-6.3.tar.bz2 Removed: tinysofa/releases/1.1/gdb/current/sources/gdb-6.2.1.tar.bz2 Modified: tinysofa/releases/1.1/gdb/current/specs/gdb.spec Log: - update to 6.3 Deleted: tinysofa/releases/1.1/gdb/current/sources/gdb-6.2.1.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/gdb/current/sources/gdb-6.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/gdb/current/sources/gdb-6.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/gdb/current/specs/gdb.spec =================================================================== --- tinysofa/releases/1.1/gdb/current/specs/gdb.spec 2004-12-21 10:13:31 UTC (rev 5251) +++ tinysofa/releases/1.1/gdb/current/specs/gdb.spec 2004-12-21 11:00:23 UTC (rev 5252) @@ -1,6 +1,6 @@ Summary: A GNU source-level debugger for C, C++ and other languages. Name: gdb -Version: 6.2.1 +Version: 6.3 Release: 1jh License: GPL Group: development @@ -54,6 +54,9 @@ %changelog +* Tue Dec 21 2004 Jaakko Heinonen 6.3-1jh +- 6.3 + * Tue Oct 19 2004 Jaakko Heinonen 6.2.1-1jh - 6.2.1 - fix configure call From svn at tinysofa.org Tue Dec 21 11:34:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 21 Dec 2004 06:34:12 -0500 (EST) Subject: [tinysofa-svn] r5253 - in tinysofa/releases/1.1/nasm/current: sources specs Message-ID: <20041221113412.99CAD344288@minbar.tinysofa.org> Author: jh Date: 2004-12-21 06:34:01 -0500 (Tue, 21 Dec 2004) New Revision: 5253 Added: tinysofa/releases/1.1/nasm/current/sources/nasm-0.98.38-overflow.patch Modified: tinysofa/releases/1.1/nasm/current/specs/nasm.spec Log: - fix a buffer overflow (nasm-0.98.38-overflow.patch) - use macros Added: tinysofa/releases/1.1/nasm/current/sources/nasm-0.98.38-overflow.patch =================================================================== --- tinysofa/releases/1.1/nasm/current/sources/nasm-0.98.38-overflow.patch 2004-12-21 11:00:23 UTC (rev 5252) +++ tinysofa/releases/1.1/nasm/current/sources/nasm-0.98.38-overflow.patch 2004-12-21 11:34:01 UTC (rev 5253) @@ -0,0 +1,370 @@ +--- ./preproc.c.orig 2004-12-16 10:49:55 -0500 ++++ ./preproc.c 2004-12-16 10:51:48 -0500 +@@ -528,7 +528,7 @@ + fname++; + fnlen = strcspn(fname, "\""); + line = nasm_malloc(20 + fnlen); +- sprintf(line, "%%line %d %.*s", lineno, fnlen, fname); ++ snprintf(line, 20+fnlen,"%%line %d %.*s", lineno, fnlen, fname); + nasm_free(oldline); + } + if (tasm_compatible_mode) +@@ -1043,7 +1043,7 @@ + char *p, *q = t->text + 2; + + q += strspn(q, "$"); +- sprintf(buffer, "..@%lu.", ctx->number); ++ snprintf(buffer, sizeof(buffer), "..@%lu.", ctx->number); + p = nasm_strcat(buffer, q); + nasm_free(t->text); + t->text = p; +@@ -1520,23 +1520,30 @@ + t = t->next; + continue; + } +- else if (tt->type == TOK_WHITESPACE) ++ if (tt->type == TOK_WHITESPACE) + { + tt = tt->next; + continue; + } +- else if (tt->type != t->type || +- mstrcmp(tt->text, t->text, casesense)) ++ if (tt->type != t->type) + { + j = FALSE; /* found mismatching tokens */ + break; + } +- else ++ /* Unify surrounding quotes for strings */ ++ if (t->type == TOK_STRING) + { +- t = t->next; +- tt = tt->next; +- continue; ++ tt->text[0] = t->text[0]; ++ tt->text[strlen(tt->text) - 1] = t->text[0]; + } ++ if (mstrcmp(tt->text, t->text, casesense) != 0) ++ { ++ j = FALSE; /* found mismatching tokens */ ++ break; ++ } ++ ++ t = t->next; ++ tt = tt->next; + } + if ((t->type != TOK_OTHER || strcmp(t->text, ",")) || tt) + j = FALSE; /* trailing gunk on one end or other */ +@@ -1954,7 +1961,7 @@ + free_tlist(tt); + + /* Now define the macro for the argument */ +- sprintf(directive, "%%define %s (%s+%d)", arg, StackPointer, ++ snprintf(directive, sizeof(directive), "%%define %s (%s+%d)", arg, StackPointer, + offset); + do_directive(tokenise(directive)); + offset += size; +@@ -2051,13 +2058,13 @@ + free_tlist(tt); + + /* Now define the macro for the argument */ +- sprintf(directive, "%%define %s (%s-%d)", local, StackPointer, ++ snprintf(directive, sizeof(directive), "%%define %s (%s-%d)", local, StackPointer, + offset); + do_directive(tokenise(directive)); + offset += size; + + /* Now define the assign to setup the enter_c macro correctly */ +- sprintf(directive, "%%assign %%$localsize %%$localsize+%d", ++ snprintf(directive, sizeof(directive), "%%assign %%$localsize %%$localsize+%d", + size); + do_directive(tokenise(directive)); + +@@ -3182,12 +3189,12 @@ + */ + case '0': + type = TOK_NUMBER; +- sprintf(tmpbuf, "%d", mac->nparam); ++ snprintf(tmpbuf, sizeof(tmpbuf), "%d", mac->nparam); + text = nasm_strdup(tmpbuf); + break; + case '%': + type = TOK_ID; +- sprintf(tmpbuf, "..@%lu.", mac->unique); ++ snprintf(tmpbuf, sizeof(tmpbuf), "..@%lu.", mac->unique); + text = nasm_strcat(tmpbuf, t->text + 2); + break; + case '-': +@@ -4067,7 +4074,7 @@ + return; + + va_start(arg, fmt); +- vsprintf(buff, fmt, arg); ++ vsnprintf(buff, sizeof(buff), fmt, arg); + va_end(arg); + + if (istk && istk->mstk && istk->mstk->name) +@@ -4530,7 +4537,7 @@ + make_tok_num(Token * tok, long val) + { + char numbuf[20]; +- sprintf(numbuf, "%ld", val); ++ snprintf(numbuf, sizeof(numbuf), "%ld", val); + tok->text = nasm_strdup(numbuf); + tok->type = TOK_NUMBER; + } +--- ./disasm.c.orig 2003-02-24 18:22:45.000000000 -0500 ++++ ./disasm.c 2004-12-15 18:00:13.000000000 -0500 +@@ -484,8 +484,8 @@ + return data - origdata; + } + +-long disasm (unsigned char *data, char *output, int segsize, long offset, +- int autosync, unsigned long prefer) ++long disasm (unsigned char *data, char *output, int outbufsize, int segsize, ++ long offset, int autosync, unsigned long prefer) + { + struct itemplate **p, **best_p; + int length, best_length = 0; +@@ -583,26 +583,26 @@ + slen = 0; + + if (lock) +- slen += sprintf(output+slen, "lock "); ++ slen += snprintf(output+slen, outbufsize-slen, "lock "); + for (i = 0; i < ins.nprefix; i++) + switch (ins.prefixes[i]) { +- case P_REP: slen += sprintf(output+slen, "rep "); break; +- case P_REPE: slen += sprintf(output+slen, "repe "); break; +- case P_REPNE: slen += sprintf(output+slen, "repne "); break; +- case P_A16: slen += sprintf(output+slen, "a16 "); break; +- case P_A32: slen += sprintf(output+slen, "a32 "); break; +- case P_O16: slen += sprintf(output+slen, "o16 "); break; +- case P_O32: slen += sprintf(output+slen, "o32 "); break; ++ case P_REP: slen += snprintf(output+slen, outbufsize-slen, "rep "); break; ++ case P_REPE: slen += snprintf(output+slen, outbufsize-slen, "repe "); break; ++ case P_REPNE: slen += snprintf(output+slen, outbufsize-slen, "repne "); break; ++ case P_A16: slen += snprintf(output+slen, outbufsize-slen, "a16 "); break; ++ case P_A32: slen += snprintf(output+slen, outbufsize-slen, "a32 "); break; ++ case P_O16: slen += snprintf(output+slen, outbufsize-slen, "o16 "); break; ++ case P_O32: slen += snprintf(output+slen, outbufsize-slen, "o32 "); break; + } + + for (i = 0; i < elements(ico); i++) + if ((*p)->opcode == ico[i]) { +- slen += sprintf(output+slen, "%s%s", icn[i], ++ slen += snprintf(output+slen, outbufsize-slen, "%s%s", icn[i], + whichcond(ins.condition)); + break; + } + if (i >= elements(ico)) +- slen += sprintf(output+slen, "%s", insn_names[(*p)->opcode]); ++ slen += snprintf(output+slen, outbufsize-slen, "%s", insn_names[(*p)->opcode]); + colon = FALSE; + length += data - origdata; /* fix up for prefixes */ + for (i=0; i<(*p)->operands; i++) { +@@ -633,14 +633,14 @@ + ins.oprs[i].basereg = whichreg ((*p)->opd[i], + ins.oprs[i].basereg); + if ( (*p)->opd[i] & TO ) +- slen += sprintf(output+slen, "to "); +- slen += sprintf(output+slen, "%s", ++ slen += snprintf(output+slen, outbufsize-slen, "to "); ++ slen += snprintf(output+slen, outbufsize-slen, "%s", + reg_names[ins.oprs[i].basereg-EXPR_REG_START]); + } else if (!(UNITY & ~(*p)->opd[i])) { + output[slen++] = '1'; + } else if ( (*p)->opd[i] & IMMEDIATE ) { + if ( (*p)->opd[i] & BITS8 ) { +- slen += sprintf(output+slen, "byte "); ++ slen += snprintf(output+slen, outbufsize-slen, "byte "); + if (ins.oprs[i].segment & SEG_SIGNED) { + if (ins.oprs[i].offset < 0) { + ins.oprs[i].offset *= -1; +@@ -649,17 +649,17 @@ + output[slen++] = '+'; + } + } else if ( (*p)->opd[i] & BITS16 ) { +- slen += sprintf(output+slen, "word "); ++ slen += snprintf(output+slen, outbufsize-slen, "word "); + } else if ( (*p)->opd[i] & BITS32 ) { +- slen += sprintf(output+slen, "dword "); ++ slen += snprintf(output+slen, outbufsize-slen, "dword "); + } else if ( (*p)->opd[i] & NEAR ) { +- slen += sprintf(output+slen, "near "); ++ slen += snprintf(output+slen, outbufsize-slen, "near "); + } else if ( (*p)->opd[i] & SHORT ) { +- slen += sprintf(output+slen, "short "); ++ slen += snprintf(output+slen, outbufsize-slen, "short "); + } +- slen += sprintf(output+slen, "0x%lx", ins.oprs[i].offset); ++ slen += snprintf(output+slen, outbufsize-slen, "0x%lx", ins.oprs[i].offset); + } else if ( !(MEM_OFFS & ~(*p)->opd[i]) ) { +- slen += sprintf(output+slen, "[%s%s%s0x%lx]", ++ slen += snprintf(output+slen, outbufsize-slen, "[%s%s%s0x%lx]", + (segover ? segover : ""), + (segover ? ":" : ""), + (ins.oprs[i].addr_size == 32 ? "dword " : +@@ -669,30 +669,30 @@ + } else if ( !(REGMEM & ~(*p)->opd[i]) ) { + int started = FALSE; + if ( (*p)->opd[i] & BITS8 ) +- slen += sprintf(output+slen, "byte "); ++ slen += snprintf(output+slen, outbufsize-slen, "byte "); + if ( (*p)->opd[i] & BITS16 ) +- slen += sprintf(output+slen, "word "); ++ slen += snprintf(output+slen, outbufsize-slen, "word "); + if ( (*p)->opd[i] & BITS32 ) +- slen += sprintf(output+slen, "dword "); ++ slen += snprintf(output+slen, outbufsize-slen, "dword "); + if ( (*p)->opd[i] & BITS64 ) +- slen += sprintf(output+slen, "qword "); ++ slen += snprintf(output+slen, outbufsize-slen, "qword "); + if ( (*p)->opd[i] & BITS80 ) +- slen += sprintf(output+slen, "tword "); ++ slen += snprintf(output+slen, outbufsize-slen, "tword "); + if ( (*p)->opd[i] & FAR ) +- slen += sprintf(output+slen, "far "); ++ slen += snprintf(output+slen, outbufsize-slen, "far "); + if ( (*p)->opd[i] & NEAR ) +- slen += sprintf(output+slen, "near "); ++ slen += snprintf(output+slen, outbufsize-slen, "near "); + output[slen++] = '['; + if (ins.oprs[i].addr_size) +- slen += sprintf(output+slen, "%s", ++ slen += snprintf(output+slen, outbufsize-slen, "%s", + (ins.oprs[i].addr_size == 32 ? "dword " : + ins.oprs[i].addr_size == 16 ? "word " : "")); + if (segover) { +- slen += sprintf(output+slen, "%s:", segover); ++ slen += snprintf(output+slen, outbufsize-slen, "%s:", segover); + segover = NULL; + } + if (ins.oprs[i].basereg != -1) { +- slen += sprintf(output+slen, "%s", ++ slen += snprintf(output+slen, outbufsize-slen, "%s", + reg_names[(ins.oprs[i].basereg - + EXPR_REG_START)]); + started = TRUE; +@@ -700,11 +700,11 @@ + if (ins.oprs[i].indexreg != -1) { + if (started) + output[slen++] = '+'; +- slen += sprintf(output+slen, "%s", ++ slen += snprintf(output+slen, outbufsize-slen, "%s", + reg_names[(ins.oprs[i].indexreg - + EXPR_REG_START)]); + if (ins.oprs[i].scale > 1) +- slen += sprintf(output+slen, "*%d", ins.oprs[i].scale); ++ slen += snprintf(output+slen, outbufsize-slen, "*%d", ins.oprs[i].scale); + started = TRUE; + } + if (ins.oprs[i].segment & SEG_DISP8) { +@@ -713,20 +713,20 @@ + ins.oprs[i].offset = - (signed char) ins.oprs[i].offset; + sign = '-'; + } +- slen += sprintf(output+slen, "%c0x%lx", sign, ++ slen += snprintf(output+slen, outbufsize-slen, "%c0x%lx", sign, + ins.oprs[i].offset); + } else if (ins.oprs[i].segment & SEG_DISP16) { + if (started) + output[slen++] = '+'; +- slen += sprintf(output+slen, "0x%lx", ins.oprs[i].offset); ++ slen += snprintf(output+slen, outbufsize-slen, "0x%lx", ins.oprs[i].offset); + } else if (ins.oprs[i].segment & SEG_DISP32) { + if (started) + output[slen++] = '+'; +- slen += sprintf(output+slen, "0x%lx", ins.oprs[i].offset); ++ slen += snprintf(output+slen, outbufsize-slen, "0x%lx", ins.oprs[i].offset); + } + output[slen++] = ']'; + } else { +- slen += sprintf(output+slen, "", i); ++ slen += snprintf(output+slen, outbufsize-slen, "", i); + } + } + output[slen] = '\0'; +@@ -741,8 +741,8 @@ + return length; + } + +-long eatbyte (unsigned char *data, char *output) ++long eatbyte (unsigned char *data, char *output, int outbufsize) + { +- sprintf(output, "db 0x%02X", *data); ++ snprintf(output, outbufsize, "db 0x%02X", *data); + return 1; + } +--- ./ndisasm.c.orig 2002-04-30 17:04:18.000000000 -0400 ++++ ./ndisasm.c 2004-12-15 13:27:21.000000000 -0500 +@@ -243,10 +243,10 @@ + nextsync = next_sync (offset, &synclen); + } + while (p > q && (p - q >= INSN_MAX || lenread == 0)) { +- lendis = disasm (q, outbuf, bits, offset, autosync, prefer); ++ lendis = disasm (q, outbuf, sizeof(outbuf), bits, offset, autosync, prefer); + if (!lendis || lendis > (p - q) || + (unsigned long)lendis > nextsync-offset) +- lendis = eatbyte (q, outbuf); ++ lendis = eatbyte (q, outbuf, sizeof(outbuf)); + output_ins (offset, q, lendis, outbuf); + q += lendis; + offset += lendis; +--- ./listing.c.orig 2002-09-11 22:23:54.000000000 -0400 ++++ ./listing.c 2004-12-15 13:05:05.000000000 -0500 +@@ -192,7 +192,7 @@ + else if (typ == OUT_RESERVE) + { + char q[20]; +- sprintf(q, "", size); ++ snprintf(q, sizeof(q), "", size); + list_out (offset, q); + } + } +--- ./labels.c.orig 2003-09-07 20:30:40.000000000 -0400 ++++ ./labels.c 2004-12-15 13:03:20.000000000 -0500 +@@ -221,7 +221,7 @@ + slen += strlen(lpostfix); + slen++; /* room for that null char */ + xsymbol = nasm_malloc(slen); +- sprintf(xsymbol,"%s%s%s",lprefix,lptr->defn.label,lpostfix); ++ snprintf(xsymbol,slen,"%s%s%s",lprefix,lptr->defn.label,lpostfix); + + ofmt->symdef (xsymbol, segment, offset, exi, + special ? special : lptr->defn.special); +@@ -286,7 +286,7 @@ + slen += strlen(lpostfix); + slen++; /* room for that null char */ + xsymbol = nasm_malloc(slen); +- sprintf(xsymbol,"%s%s%s",lprefix,lptr->defn.label,lpostfix); ++ snprintf(xsymbol,slen,"%s%s%s",lprefix,lptr->defn.label,lpostfix); + + ofmt->symdef (xsymbol, segment, offset, exi, + special ? special : lptr->defn.special); +--- ./nasm.c.orig 2003-09-10 19:34:23.000000000 -0400 ++++ ./nasm.c 2004-12-15 12:10:25.000000000 -0500 +@@ -185,7 +185,7 @@ + /* define some macros dependent of command-line */ + { + char temp [64]; +- sprintf (temp, "__OUTPUT_FORMAT__=%s\n", ofmt->shortname); ++ snprintf (temp, sizeof(temp), "__OUTPUT_FORMAT__=%s\n", ofmt->shortname); + pp_pre_define (temp); + } + +--- ./disasm.h.orig 2002-04-30 16:56:44.000000000 -0400 ++++ ./disasm.h 2004-12-15 13:26:37.000000000 -0500 +@@ -11,8 +11,8 @@ + + #define INSN_MAX 32 /* one instruction can't be longer than this */ + +-long disasm (unsigned char *data, char *output, int segsize, long offset, +- int autosync, unsigned long prefer); +-long eatbyte (unsigned char *data, char *output); ++long disasm (unsigned char *data, char *output, int outbufsize, int segsize, ++ long offset, int autosync, unsigned long prefer); ++long eatbyte (unsigned char *data, char *output, int outbufsize); + + #endif Modified: tinysofa/releases/1.1/nasm/current/specs/nasm.spec =================================================================== --- tinysofa/releases/1.1/nasm/current/specs/nasm.spec 2004-12-21 11:00:23 UTC (rev 5252) +++ tinysofa/releases/1.1/nasm/current/specs/nasm.spec 2004-12-21 11:34:01 UTC (rev 5253) @@ -1,14 +1,15 @@ Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax Name: nasm Version: 0.98.38 -Release: 6ts +Release: 7jh License: LGPL Group: development Source: http://unc.dl.sourceforge.net/sourceforge/nasm/nasm-%{version}.tar.bz2 Patch0: nasm-0.98.34-fixdoc.patch Patch1: nasm-0.98.34-noinfo.patch +Patch2: nasm-0.98.38-overflow.patch URL: http://www.cryogen.com/Nasm/ -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description NASM is the Netwide Assembler, a free portable assembler for the Intel @@ -24,46 +25,55 @@ is sometimes used with the Netwide Assembler (NASM). These tools include linker, library manager, loader, and information dump. + %prep %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 -b .overflow~ + %build -CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s ./configure \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} -make everything +%configure +%make everything + %install -mkdir -p "$RPM_BUILD_ROOT"/usr/{bin,share/man/man1} +%{__mkdir_p} \ + %{buildroot}%{_bindir} \ + %{buildroot}%{_mandir}/man1 -make INSTALLROOT="$RPM_BUILD_ROOT" install_everything +make INSTALLROOT="%{buildroot}" install_everything -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.gz || : %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files %defattr(-,root,root) %doc CHANGES COPYING ChangeLog README TODO -/usr/bin/nasm -/usr/bin/ndisasm -/usr/share/man/man1/* +%{_bindir}/nasm +%{_bindir}/ndisasm +%{_mandir}/man1/* %files rdoff %defattr(-,root,root) -/usr/bin/ldrdf -/usr/bin/rdf2bin -/usr/bin/rdf2com -/usr/bin/rdf2ihx -/usr/bin/rdfdump -/usr/bin/rdflib -/usr/bin/rdx %doc rdoff/README +%{_bindir}/ldrdf +%{_bindir}/rdf2bin +%{_bindir}/rdf2com +%{_bindir}/rdf2ihx +%{_bindir}/rdfdump +%{_bindir}/rdflib +%{_bindir}/rdx + %changelog +* Tue Dec 21 2004 Jaakko Heinonen 0.98.38-7jh +- fix a buffer overflow (nasm-0.98.38-overflow.patch) +- use macros + * Thu Aug 05 2004 tsintegrate 0.98.38-6ts - current (0.98.38-6jh) integrated as 0.98.38-6ts for release 1.1 From svn at tinysofa.org Tue Dec 21 17:10:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 21 Dec 2004 12:10:00 -0500 (EST) Subject: [tinysofa-svn] r5254 - tinysofa/releases/1.1/initscripts/current/specs Message-ID: <20041221171000.264CC344289@minbar.tinysofa.org> Author: jh Date: 2004-12-21 12:09:52 -0500 (Tue, 21 Dec 2004) New Revision: 5254 Modified: tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec Log: - fix /etc/sysconfig/init permissions Modified: tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec 2004-12-21 11:34:01 UTC (rev 5253) +++ tinysofa/releases/1.1/initscripts/current/specs/initscripts.spec 2004-12-21 17:09:52 UTC (rev 5254) @@ -139,7 +139,7 @@ %dir /etc/ppp/peers %attr(-,root,root) %{_mandir}/man*/* %config(noreplace) %verify(not md5 mtime size) /etc/adjtime -%config(noreplace) /etc/sysconfig/init +%config(noreplace) %attr(0644,root,root) /etc/sysconfig/init %config(noreplace) %attr(0644,root,root) /etc/sysconfig/rawdevices %config(noreplace) /etc/rc.local %config(noreplace) %attr(0644,root,root) /etc/sysctl.conf From svn at tinysofa.org Tue Dec 21 18:21:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 21 Dec 2004 13:21:46 -0500 (EST) Subject: [tinysofa-svn] r5255 - in contrib/1.1/ucarp/current: sources specs Message-ID: <20041221182146.7979B344289@minbar.tinysofa.org> Author: jh Date: 2004-12-21 13:21:36 -0500 (Tue, 21 Dec 2004) New Revision: 5255 Modified: contrib/1.1/ucarp/current/sources/vip-001.conf.example contrib/1.1/ucarp/current/specs/ucarp.spec Log: - minor cleanups Modified: contrib/1.1/ucarp/current/sources/vip-001.conf.example =================================================================== --- contrib/1.1/ucarp/current/sources/vip-001.conf.example 2004-12-21 17:09:52 UTC (rev 5254) +++ contrib/1.1/ucarp/current/sources/vip-001.conf.example 2004-12-21 18:21:36 UTC (rev 5255) @@ -11,7 +11,7 @@ # Do *NOT* use a main interface for the virtual IP, use an ethX:Y alias # with the corresponding /etc/sysconfig/network-scripts/ifcfg-ethX:Y file -# already configured and ith ONBOOT=no +# already configured and with ONBOOT=no VIP_INTERFACE="eth0:0" # If you have extra options to add, see "ucarp --help" output Modified: contrib/1.1/ucarp/current/specs/ucarp.spec =================================================================== --- contrib/1.1/ucarp/current/specs/ucarp.spec 2004-12-21 17:09:52 UTC (rev 5254) +++ contrib/1.1/ucarp/current/specs/ucarp.spec 2004-12-21 18:21:36 UTC (rev 5255) @@ -43,20 +43,20 @@ # Install the example config file %{__install} -D -m 0600 %{SOURCE2} \ - %{buildroot}/etc/sysconfig/carp/vip-001.conf.example + %{buildroot}%{_sysconfdir}/sysconfig/carp/vip-001.conf.example # Install trivial interface up/down scripts -%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-up +%{__cat} << 'EOF' > %{buildroot}%{_sysconfdir}/sysconfig/carp/vip-up #!/bin/sh # We could use ifup directly, but it complains if the address is already used #/sbin/ifup $1 -. /etc/sysconfig/network-scripts/ifcfg-$1 +. %{_sysconfdir}/sysconfig/network-scripts/ifcfg-$1 #exec /sbin/ip addr add ${IPADDR}/${NETMASK} dev "$1" exec /sbin/ifconfig $1 ${IPADDR} netmask ${NETMASK} up EOF -%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-down +%{__cat} << 'EOF' > %{buildroot}%{_sysconfdir}/sysconfig/carp/vip-down #!/bin/sh -#. /etc/sysconfig/network-scripts/ifcfg-$1 +#. %{_sysconfdir}/sysconfig/network-scripts/ifcfg-$1 #exec /sbin/ip addr del ${IPADDR}/${NETMASK} dev "$1" exec /sbin/ifconfig $1 down EOF @@ -80,9 +80,9 @@ %defattr(-, root, root, 0755) %doc AUTHORS COPYING ChangeLog NEWS README examples/linux/*.sh %{_initrddir}/carp -/etc/sysconfig/carp/vip-001.conf.example -%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-up -%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-down +%{_sysconfdir}/sysconfig/carp/vip-001.conf.example +%attr(0700, root, root) %config(noreplace) %{_sysconfdir}/sysconfig/carp/vip-up +%attr(0700, root, root) %config(noreplace) %{_sysconfdir}/sysconfig/carp/vip-down %{_sbindir}/ucarp From svn at tinysofa.org Tue Dec 21 21:07:13 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 21 Dec 2004 16:07:13 -0500 (EST) Subject: [tinysofa-svn] r5256 - in contrib/1.1/unarj/current: sources specs Message-ID: <20041221210713.0785D344289@minbar.tinysofa.org> Author: jh Date: 2004-12-21 16:06:55 -0500 (Tue, 21 Dec 2004) New Revision: 5256 Added: contrib/1.1/unarj/current/sources/unarj-2.65-overflow.diff contrib/1.1/unarj/current/sources/unarj-2.65-path.diff contrib/1.1/unarj/current/sources/unarj-2.65-time.diff contrib/1.1/unarj/current/sources/unarj-2.65.tar.bz2 Removed: contrib/1.1/unarj/current/sources/unarj_2.65.orig.tar.gz Modified: contrib/1.1/unarj/current/specs/unarj.spec Log: - use suse tarball - add patches from suse, fixes CAN-2004-0947 Added: contrib/1.1/unarj/current/sources/unarj-2.65-overflow.diff =================================================================== --- contrib/1.1/unarj/current/sources/unarj-2.65-overflow.diff 2004-12-21 18:21:36 UTC (rev 5255) +++ contrib/1.1/unarj/current/sources/unarj-2.65-overflow.diff 2004-12-21 21:06:55 UTC (rev 5256) @@ -0,0 +1,49 @@ +Index: unarj-2.65/unarj.c +================================================================================ +--- unarj.c ++++ unarj.c +@@ -217,7 +217,7 @@ + static short method; + static uint file_mode; + static ulong time_stamp; +-static short entry_pos; ++static ushort entry_pos; + static ushort host_data; + static uchar *get_ptr; + static UCRC file_crc; +@@ -608,6 +608,7 @@ + error(M_BADHEADR, ""); + + crc = CRC_MASK; ++ memset(header, 0, sizeof(header)); + fread_crc(header, (int) headersize, fd); + header_crc = fget_crc(fd); + if ((crc ^ CRC_MASK) != header_crc) +@@ -632,9 +633,13 @@ + + if (origsize < 0 || compsize < 0) + error(M_HEADRCRC, ""); ++ if(first_hdr_size > headersize-2) /* need two \0 for file and comment */ ++ error(M_BADHEADR, ""); + + hdr_filename = (char *)&header[first_hdr_size]; + strncopy(filename, hdr_filename, sizeof(filename)); ++ if(entry_pos >= strlen(filename)) ++ error(M_BADHEADR, ""); + if (host_os != OS) + strparity((uchar *)filename); + if ((arj_flags & PATHSYM_FLAG) != 0) +@@ -733,11 +738,11 @@ + + no_output = 0; + if (command == 'E') +- strcpy(name, &filename[entry_pos]); ++ strncopy(name, &filename[entry_pos], sizeof(name)); + else + { + strcpy(name, DEFAULT_DIR); +- strcat(name, filename); ++ strncopy(name+strlen(name), filename, sizeof(name)-strlen(name)); + } + + if (host_os != OS) Added: contrib/1.1/unarj/current/sources/unarj-2.65-path.diff =================================================================== --- contrib/1.1/unarj/current/sources/unarj-2.65-path.diff 2004-12-21 18:21:36 UTC (rev 5255) +++ contrib/1.1/unarj/current/sources/unarj-2.65-path.diff 2004-12-21 21:06:55 UTC (rev 5256) @@ -0,0 +1,129 @@ +Index: unarj-2.65/sanitize.c +================================================================================ +--- Makefile ++++ Makefile +@@ -6,8 +6,8 @@ + CFLAGS = -O2 -Wall -ansi -pedantic -DUNIX + INSTALLDIR=/usr/local/bin + +-unarj: unarj.o decode.o environ.o +- $(CC) $(CFLAGS) -o unarj unarj.o decode.o environ.o ++unarj: unarj.o decode.o environ.o sanitize.o ++ $(CC) $(CFLAGS) -o unarj unarj.o decode.o environ.o sanitize.o + strip unarj + + clean: +@@ -19,3 +19,4 @@ + unarj.o: unarj.c unarj.h Makefile + environ.o: environ.c unarj.h Makefile + decode.o: decode.c unarj.h Makefile ++sanitize.o: sanitize.c unarj.h Makefile +--- sanitize.c ++++ sanitize.c +@@ -0,0 +1,81 @@ ++/* ++ * Path sanitation code by Ludwig Nussel . Public Domain. ++ */ ++ ++#include "unarj.h" ++ ++#include ++#include ++#include ++ ++#ifndef PATH_CHAR ++#define PATH_CHAR '/' ++#endif ++#ifndef MIN ++#define MIN(x,y) ((x)<(y)?(x):(y)) ++#endif ++ ++/* copy src into dest converting the path to a relative one inside the current ++ * directory. dest must hold at least len bytes */ ++void copy_path_relative(char *dest, char *src, size_t len) ++{ ++ char* o = dest; ++ char* p = src; ++ ++ *o = '\0'; ++ ++ while(*p && *p == PATH_CHAR) ++p; ++ for(; len && *p;) ++ { ++ src = p; ++ p = strchr(src, PATH_CHAR); ++ if(!p) p = src+strlen(src); ++ ++ /* . => skip */ ++ if(p-src == 1 && *src == '.' ) ++ { ++ if(*p) src = ++p; ++ } ++ /* .. => pop one */ ++ else if(p-src == 2 && *src == '.' && src[1] == '.') ++ { ++ if(o != dest) ++ { ++ char* tmp; ++ *o = '\0'; ++ tmp = strrchr(dest, PATH_CHAR); ++ if(!tmp) ++ { ++ len += o-dest; ++ o = dest; ++ if(*p) ++p; ++ } ++ else ++ { ++ len += o-tmp; ++ o = tmp; ++ if(*p) ++p; ++ } ++ } ++ else /* nothing to pop */ ++ if(*p) ++p; ++ } ++ else ++ { ++ size_t copy; ++ if(o != dest) ++ { ++ --len; ++ *o++ = PATH_CHAR; ++ } ++ copy = MIN(p-src,len); ++ memcpy(o, src, copy); ++ len -= copy; ++ src += copy; ++ o += copy; ++ if(*p) ++p; ++ } ++ while(*p && *p == PATH_CHAR) ++p; ++ } ++ o[len?0:-1] = '\0'; ++} +--- unarj.c ++++ unarj.c +@@ -235,6 +235,8 @@ + + /* Functions */ + ++void copy_path_relative(char *dest, char *src, size_t len); ++ + static void + make_crctable() + { +@@ -738,11 +740,11 @@ + + no_output = 0; + if (command == 'E') +- strncopy(name, &filename[entry_pos], sizeof(name)); ++ copy_path_relative(name, &filename[entry_pos], sizeof(name)); + else + { + strcpy(name, DEFAULT_DIR); +- strncopy(name+strlen(name), filename, sizeof(name)-strlen(name)); ++ copy_path_relative(name+strlen(name), filename, sizeof(name)-strlen(name)); + } + + if (host_os != OS) Added: contrib/1.1/unarj/current/sources/unarj-2.65-time.diff =================================================================== --- contrib/1.1/unarj/current/sources/unarj-2.65-time.diff 2004-12-21 18:21:36 UTC (rev 5255) +++ contrib/1.1/unarj/current/sources/unarj-2.65-time.diff 2004-12-21 21:06:55 UTC (rev 5256) @@ -0,0 +1,87 @@ +--- environ.c ++++ environ.c +@@ -431,6 +431,8 @@ + #define SUBS_DEFINED + + #include ++#include ++#include + + #ifndef time_t + #define time_t long +@@ -558,12 +560,10 @@ + mstonix(tstamp) + ulong tstamp; + { ++ time_t tt; ++ struct tm tm; + uint date, time; +- int year, month, day, hour, min, sec, daycount; +- long longtime; +- /* no. of days to beginning of month for each month */ +- static int dsboy[12] = +- { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; ++ int year, month, day, hour, min, sec; + + date = (uint) ((tstamp >> 16) & 0xffff); + time = (uint) (tstamp & 0xffff); +@@ -577,18 +577,16 @@ + min = (time >> 5) & 0x3f; + sec = (time & 0x1f) * 2; + +- daycount = 365 * (year - 1970) + /* days due to whole years */ +- (year - 1969) / 4 + /* days due to leap years */ +- dsboy[month-1] + /* days since beginning of this year */ +- day-1; /* days since beginning of month */ +- +- if (year % 4 == 0 && +- year % 400 != 0 && month >= 3) /* if this is a leap year and month */ +- daycount++; /* is March or later, add a day */ +- +- longtime = daycount * 24L * 60L * 60L + +- hour * 60L * 60L + min * 60 + sec; +- return longtime; ++ tm.tm_sec = sec; ++ tm.tm_min = min; ++ tm.tm_hour = hour; ++ tm.tm_mday = day; ++ tm.tm_mon = month - 1; ++ tm.tm_year = year - 1900; ++ tm.tm_isdst = -1; ++ ++ tt = mktime (&tm); ++ return tt; + } + + int +@@ -599,20 +597,21 @@ + uint host; + { + time_t m_time; +- struct utimbuf +- { +- time_t atime; /* New access time */ +- time_t mtime; /* New modification time */ +- } tb; ++ struct utimbuf tb; + + (char *) name; + (uint) attribute; + (uint) host; + +- m_time = mstonix(tstamp) + gettz(); +- +- tb.mtime = m_time; /* Set modification time */ +- tb.atime = m_time; /* Set access time */ ++ m_time = mstonix(tstamp); /* + gettz(); */ ++ if (m_time < 0) ++ { ++ printf ("Invalid time, set to current time!"); ++ m_time = time ((time_t *) NULL); ++ } ++ ++ tb.actime = m_time; /* Set modification time */ ++ tb.modtime = m_time; /* Set access time */ + + /* set the time stamp on the file */ + return utime(name, &tb); Added: contrib/1.1/unarj/current/sources/unarj-2.65.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/unarj/current/sources/unarj-2.65.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: contrib/1.1/unarj/current/sources/unarj_2.65.orig.tar.gz =================================================================== (Binary files differ) Modified: contrib/1.1/unarj/current/specs/unarj.spec =================================================================== --- contrib/1.1/unarj/current/specs/unarj.spec 2004-12-21 18:21:36 UTC (rev 5255) +++ contrib/1.1/unarj/current/specs/unarj.spec 2004-12-21 21:06:55 UTC (rev 5256) @@ -1,11 +1,14 @@ Summary: An uncompressor for .arj format archive files. Name: unarj Version: 2.65 -Release: 1ok +Release: 2jh Group: contrib License: distributable -Source: http://www.amavis.org/contrib/%{name}_%{version}.orig.tar.gz +Source: %{name}-%{version}.tar.bz2 Patch: http://www.amavis.org/contrib/%{name}_%{version}-1.diff.gz +Patch1: unarj-2.65-overflow.diff +Patch2: unarj-2.65-path.diff +Patch3: unarj-2.65-time.diff BuildRoot: %{_tmppath}/%{name}-root %description @@ -16,12 +19,14 @@ archives. %prep -%setup -q -n %{name}-%{version}.orig -%patch -p1 +%setup -q -n %{name}-%{version} +#%patch -p1 +%patch1 -p0 -b .overflow~ +%patch2 -p0 -b .path~ +%patch3 -p0 -b .time~ %build -make clean -make +make CFLAGS="$RPM_OPT_FLAGS -Wall -ansi -pedantic -DUNIX" %install rm -rf %{buildroot} @@ -38,6 +43,10 @@ %{_bindir}/unarj %changelog +* Tue Dec 21 2004 Jaakko Heinonen 2.65-2jh +- use suse tarball +- add patches from suse, fixes CAN-2004-0947 + * Mon Sep 13 2004 tsintegrate 2.65-1ok - current (2.65-1ok) integrated as 2.65-1ok From svn at tinysofa.org Tue Dec 21 22:17:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 21 Dec 2004 17:17:30 -0500 (EST) Subject: [tinysofa-svn] r5257 - in tinysofa/releases/1.1/krb5/current: sources specs Message-ID: <20041221221730.B53B4344289@minbar.tinysofa.org> Author: jh Date: 2004-12-21 17:15:10 -0500 (Tue, 21 Dec 2004) New Revision: 5257 Added: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6-prof_err.patch tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6.tar.gz tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6.tar.gz.asc Removed: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz.asc Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec Log: +- 1.3.6, fixes CAN-2004-1189 Deleted: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz =================================================================== (Binary files differ) Deleted: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz.asc =================================================================== --- tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz.asc 2004-12-21 21:06:55 UTC (rev 5256) +++ tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.5.tar.gz.asc 2004-12-21 22:15:10 UTC (rev 5257) @@ -1,9 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.5 (SunOS) - -iQCVAwUAQUISYKbDgE/zdoE9AQEq3QP+LF6rwRM9AUVi00ZmUl3BUvZrlZKHLxHx -sl6hYdS+yCqhvHSIpCkVa8BgHCtgpP138le1DyLmQBOSQ2a8SpG1RV1mORTa8Lf5 -tfFlN3LhXWreuGVurgR8rXy+6fmC2AviLWpn8s4h7Oo6OhMakMFB58g4IcKhgjEy -Uh+0Sza8Rm4= -=o8Ec ------END PGP SIGNATURE----- Added: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6-prof_err.patch =================================================================== --- tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6-prof_err.patch 2004-12-21 21:06:55 UTC (rev 5256) +++ tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6-prof_err.patch 2004-12-21 22:15:10 UTC (rev 5257) @@ -0,0 +1,30 @@ +--- krb5-1.3.6/src/util/profile/prof_err.et.prof_err 2004-12-22 00:07:24.312649601 +0200 ++++ krb5-1.3.6/src/util/profile/prof_err.et 2004-12-22 00:07:46.247811773 +0200 +@@ -8,14 +8,11 @@ + error_code PROF_MAGIC_NODE, "Bad magic value in profile_node" + error_code PROF_NO_SECTION, "Profile section not found" + error_code PROF_NO_RELATION, "Profile relation not found" +-error_code PROF_ADD_NOT_SECTION, +- "Attempt to add a relation to node which is not a section" +-error_code PROF_SECTION_WITH_VALUE, +- "A profile section header has a non-zero value" ++error_code PROF_ADD_NOT_SECTION, "Attempt to add a relation to node which is not a section" ++error_code PROF_SECTION_WITH_VALUE, "A profile section header has a non-zero value" + error_code PROF_BAD_LINK_LIST, "Bad linked list in profile structures" + error_code PROF_BAD_GROUP_LVL, "Bad group level in profile strctures" +-error_code PROF_BAD_PARENT_PTR, +- "Bad parent pointer in profile strctures" ++error_code PROF_BAD_PARENT_PTR, "Bad parent pointer in profile strctures" + error_code PROF_MAGIC_ITERATOR, "Bad magic value in profile iterator" + error_code PROF_SET_SECTION_VALUE, "Can't set value on section node" + error_code PROF_EINVAL, "Invalid argument passed to profile library" +@@ -36,8 +33,7 @@ + # + error_code PROF_MAGIC_PROFILE, "Bad magic value in profile_t" + error_code PROF_MAGIC_SECTION, "Bad magic value in profile_section_t" +-error_code PROF_TOPSECTION_ITER_NOSUPP, +- "Iteration through all top level section not supported" ++error_code PROF_TOPSECTION_ITER_NOSUPP, "Iteration through all top level section not supported" + error_code PROF_INVALID_SECTION, "Invalid profile_section object" + error_code PROF_END_OF_SECTIONS, "No more sections" + error_code PROF_BAD_NAMESET, "Bad nameset passed to query routine" Added: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6.tar.gz.asc =================================================================== --- tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6.tar.gz.asc 2004-12-21 21:06:55 UTC (rev 5256) +++ tinysofa/releases/1.1/krb5/current/sources/krb5-1.3.6.tar.gz.asc 2004-12-21 22:15:10 UTC (rev 5257) @@ -0,0 +1,9 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.5 (SunOS) + +iQCVAwUAQcdTbqbDgE/zdoE9AQFb+wP8D0Lt+DNq87iMHLNqgBbzWdKi2xtchxMD +GkbKgxy8VAtI7FlYpZv9yCYVPn6opFGNTwgBotSgPJGkvT2EcUua4lcld1aUzDXX +ZpkH6uduas+F0qrq+VTVhA8wmzR3z2fpqBoS1NxFgwXErv+6tFMAcKegHrLTiTuq +egN5hNUVeho= +=LCLh +-----END PGP SIGNATURE----- Modified: tinysofa/releases/1.1/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2004-12-21 21:06:55 UTC (rev 5256) +++ tinysofa/releases/1.1/krb5/current/specs/krb5.spec 2004-12-21 22:15:10 UTC (rev 5257) @@ -1,9 +1,10 @@ Summary: Kerberos is a network authentication protocol. Name: krb5 -Version: 1.3.5 -Release: 2jh +Version: 1.3.6 +Release: 1jh Group: main Source0: krb5-%{version}.tar.gz +Patch0: krb5-1.3.6-prof_err.patch URL: http://web.mit.edu/kerberos License: Distributable Requires: libcom_err libtermcap ncurses @@ -40,6 +41,7 @@ %prep %setup -q -n krb5-%{version} +%patch0 -p1 -b .prof_err~ %build @@ -56,10 +58,10 @@ --with-system-et \ --enable-dns \ --with-netlib=-lresolv - %make popd + %install pushd src %makeinstall_std @@ -93,6 +95,9 @@ %changelog +* Tue Dec 21 2004 Jaakko Heinonen 1.3.6-1jh +- 1.3.6, fixes CAN-2004-1189 + * Tue Nov 16 2004 Jaakko Heinonen 1.3.5-2jh - -devel requires now the same version of the -libs - rename to krb5 From svn at tinysofa.org Wed Dec 22 07:09:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 22 Dec 2004 02:09:02 -0500 (EST) Subject: [tinysofa-svn] r5258 - tinysofa/releases/1.1/e2fsprogs/current/specs Message-ID: <20041222070902.861B8344289@minbar.tinysofa.org> Author: jh Date: 2004-12-22 02:08:55 -0500 (Wed, 22 Dec 2004) New Revision: 5258 Modified: tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec Log: - run ldconfig for libcom_err - correct the requirements of the devel packages Modified: tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec =================================================================== --- tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec 2004-12-21 22:15:10 UTC (rev 5257) +++ tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec 2004-12-22 07:08:55 UTC (rev 5258) @@ -7,7 +7,7 @@ Source: http://belnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Prereq: glibc Requires: libcom_err -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gettext %description @@ -28,7 +28,7 @@ %package devel Summary: Ext2 filesystem-specific static libraries and headers. Group: development -Requires: e2fsprogs +Requires: e2fsprogs = %{name}-%{version} Requires: libcom_err-devel %description devel @@ -49,15 +49,19 @@ %package -n libcom_err-devel Group: development Summary: Com_err Development library +Requires: libcom_err = %{version}-%{release} %description -n libcom_err-devel Com_err is an error message display library, development files. + %prep %setup -q + %build -CFLAGS="$RPM_OPT_FLAGS" \ +# e2fsck may work will full optimizations but without strict-aliasing +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure \ --prefix=/ \ --enable-elf-shlibs \ @@ -66,6 +70,7 @@ make libs progs + %install export PATH=/sbin:$PATH make install install-libs DESTDIR="$RPM_BUILD_ROOT" @@ -83,14 +88,20 @@ %find_lang %{name} + %clean %clean_buildroot -%post -/sbin/ldconfig +%post -p /sbin/ldconfig + %postun -p /sbin/ldconfig +%post -n libcom_err -p /sbin/ldconfig + +%postun -n libcom_err -p /sbin/ldconfig + + %files -f %{name}.lang %defattr(-,root,root) %doc README RELEASE-NOTES @@ -147,6 +158,10 @@ %changelog +* Wed Dec 22 2004 Jaakko Heinonen +- run ldconfig for libcom_err +- correct the requirements of the devel packages + * Thu Aug 05 2004 tsintegrate 1.35-8ts - current (1.35-8jh) integrated as 1.35-8ts for release 1.1 From svn at tinysofa.org Wed Dec 22 19:21:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 22 Dec 2004 14:21:35 -0500 (EST) Subject: [tinysofa-svn] r5266 - tinysofa/releases/1.1/initscripts/current/sources Message-ID: <20041222192135.029243442A3@minbar.tinysofa.org> Author: jh Date: 2004-12-22 14:21:29 -0500 (Wed, 22 Dec 2004) New Revision: 5266 Modified: tinysofa/releases/1.1/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch Log: - enterprise -> classic Modified: tinysofa/releases/1.1/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch =================================================================== --- tinysofa/releases/1.1/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch 2004-12-22 17:11:19 UTC (rev 5265) +++ tinysofa/releases/1.1/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch 2004-12-22 19:21:29 UTC (rev 5266) @@ -540,7 +540,7 @@ +++ initscripts-7.31.9.EL.tinysofa/sysctl.conf 2004-05-13 17:19:11.000000000 +1000 @@ -1,4 +1,4 @@ -# Kernel sysctl configuration file for Red Hat Linux -+# Kernel sysctl configuration file for tinysofa enterprise server ++# Kernel sysctl configuration file for tinysofa classic server # # For binary values, 0 is disabled, 1 is enabled. See sysctl(8) and # sysctl.conf(5) for more details. @@ -565,7 +565,7 @@ +++ initscripts-7.31.9.EL.tinysofa/sysvinitfiles 2004-05-13 16:45:09.000000000 +1000 @@ -1,20 +1,16 @@ -Writing System V init scripts for Red Hat Linux -+Writing System V init scripts for tinysofa enterprise server ++Writing System V init scripts for tinysofa classic server =============================================== -All System V init scripts are named /etc/rc.d/init.d/ From svn at tinysofa.org Wed Dec 22 12:35:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 22 Dec 2004 07:35:39 -0500 (EST) Subject: [tinysofa-svn] r5259 - tinysofa/releases/1.1/e2fsprogs/current/specs Message-ID: <20041222123539.C916A344289@minbar.tinysofa.org> Author: jh Date: 2004-12-22 07:35:32 -0500 (Wed, 22 Dec 2004) New Revision: 5259 Modified: tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec Log: - fix devel requirement Modified: tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec =================================================================== --- tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec 2004-12-22 07:08:55 UTC (rev 5258) +++ tinysofa/releases/1.1/e2fsprogs/current/specs/e2fsprogs.spec 2004-12-22 12:35:32 UTC (rev 5259) @@ -28,7 +28,7 @@ %package devel Summary: Ext2 filesystem-specific static libraries and headers. Group: development -Requires: e2fsprogs = %{name}-%{version} +Requires: e2fsprogs = %{version}-%{release} Requires: libcom_err-devel %description devel From svn at tinysofa.org Wed Dec 22 16:48:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 22 Dec 2004 11:48:42 -0500 (EST) Subject: [tinysofa-svn] r5263 - in tinysofa/releases/1.1/m4/current: sources specs Message-ID: <20041222164842.81A1E3442A0@minbar.tinysofa.org> Author: jh Date: 2004-12-22 11:48:32 -0500 (Wed, 22 Dec 2004) New Revision: 5263 Removed: tinysofa/releases/1.1/m4/current/sources/m4-1.4-glibc.patch tinysofa/releases/1.1/m4/current/sources/m4-1.4.1.tar.gz Modified: tinysofa/releases/1.1/m4/current/specs/m4.spec Log: - 1.4.1 - new spec Deleted: tinysofa/releases/1.1/m4/current/sources/m4-1.4-glibc.patch =================================================================== --- tinysofa/releases/1.1/m4/current/sources/m4-1.4-glibc.patch 2004-12-22 13:34:53 UTC (rev 5262) +++ tinysofa/releases/1.1/m4/current/sources/m4-1.4-glibc.patch 2004-12-22 16:48:32 UTC (rev 5263) @@ -1,11 +0,0 @@ ---- m4-1.4/src/m4.c.ewt Mon Jun 2 21:22:37 1997 -+++ m4-1.4/src/m4.c Mon Jun 2 21:22:41 1997 -@@ -19,7 +19,7 @@ - #include "m4.h" - - #include --#include -+#include - - static void usage _((int)); - Deleted: tinysofa/releases/1.1/m4/current/sources/m4-1.4.1.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/m4/current/specs/m4.spec =================================================================== --- tinysofa/releases/1.1/m4/current/specs/m4.spec 2004-12-22 13:34:53 UTC (rev 5262) +++ tinysofa/releases/1.1/m4/current/specs/m4.spec 2004-12-22 16:48:32 UTC (rev 5263) @@ -1,14 +1,13 @@ Summary: The GNU macro processor. Name: m4 -Version: 1.4.1 -Release: 2ts +Version: 1.4.2 +Release: 1jh License: GPL Group: development -Source: ftp://ftp.gnu.org/pub/gnu/m4/m4-%{version}.tar.gz -Patch: m4-1.4-glibc.patch -BuildRequires: texinfo -Prereq: htmlinfo -BuildRoot: %{_tmppath}/%{name}-root +Source: ftp://ftp.gnu.org/gnu/m4/m4-1.4.2.tar.gz +URL: http://www.gnu.org/software/m4/ +Buildroot: %{_tmppath}/%{name}-%{version}-root +%info_requires %description A GNU implementation of the traditional UNIX macro processor. M4 is @@ -23,81 +22,99 @@ %prep %setup -q -%patch -p1 %build -./configure --prefix=%{_prefix} -make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s +%configure +%make + cd doc makeinfo --html --no-split --force m4.texinfo || : %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %makeinstall -strip $RPM_BUILD_ROOT/usr/bin/m4 -mkdir -p $RPM_BUILD_ROOT/usr/share/html/m4 -install -m644 doc/m4.html $RPM_BUILD_ROOT/usr/share/html/m4/ -rm -rf $RPM_BUILD_ROOT/usr/share/info +%copy_htmlinfo doc/m4.html +%nuke_info + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %post -/usr/sbin/htmlinfo_update.sh +%info_post %postun -/usr/sbin/htmlinfo_update.sh +%info_postun %files %defattr(-,root,root) -%doc NEWS README -/usr/bin/m4 -%dir /usr/share/html/m4 -/usr/share/html/m4/m4.html +%doc NEWS README THANKS TODO +%{_bindir}/m4 +%{_htmldir}/%{name} %changelog -* Thu Aug 05 2004 tsintegrate 1.4.1-2ts -- current (1.4.1-2jh) integrated as 1.4.1-2ts for release 1.1 +* Sun Dec 12 2004 Miloslav Trmac - 1.4.2-1 +- Update to m4-1.4.2 -* Fri Jun 18 2004 tsintegrate 1.4.1-1ts -- current (1.4.1-26ts) integrated as 1.4.1-1ts for release 1.0-U2 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 19 2004 tsintegrate 1.4-26ts -- current (1.4-25ts) integrated as 1.4-26ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Dec 9 2003 Erlend Midttun 1.4-22tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Jun 23 2003 Erlend Midttun 1.4-21tr -- Added %defattr. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 1.4-20tr -- Big rebuild +* Mon Nov 11 2002 Florian La Roche +- add french translation file -* Mon Mar 24 2003 Erlend Midttun 1.4-19em -- Rebuilt against glibc 2.3.2. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Fri Oct 25 2002 Christian H. Toldnes 1.4-18ct -- Replaced ugly info2man-hack with cute htmlinfo setup. +* Wed Jun 19 2002 Florian La Roche +- do not strip apps -* Tue Sep 3 2002 Goetz Bock 1.4-17bg -- removed info stuff -- cleaned up spec file +* Fri Jun 14 2002 Florian La Roche +- rebuild -* Wed Jul 24 2002 Daniel Meyer 1.4-16dm -- rebuild for Trustix Secure Linux 2.0 +* Thu May 23 2002 Tim Powers +- automated rebuild -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Thu Mar 07 2002 Florian La Roche +- use _infodir on popular request #47465 -* Mon Feb 28 2000 Lars Gaarden -- Moved info files to /usr/share/info, FHS +* Sat Jan 05 2002 Florian La Roche +- add URL tag +- improved spec file +- add hack to update config.guess config.sub +- fix to build with newer autoconf versions +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Tue Feb 13 2001 Florian La Roche +- signal patch is not necessary anymore +- fix printf buffer overflow problem + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jun 17 2000 Matt Wilson +- added defattr + +* Mon Jun 5 2000 Bernhard Rosenkraenzer +- FHS compliance +- 1.4.1 +- some fixes to spec file + * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 12) @@ -115,3 +132,4 @@ * Mon Jun 02 1997 Erik Troan - built against glibc + From svn at tinysofa.org Wed Dec 22 16:57:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 22 Dec 2004 11:57:38 -0500 (EST) Subject: [tinysofa-svn] r5264 - in tinysofa/releases/1.1/nc/current: sources specs Message-ID: <20041222165738.11B673442A1@minbar.tinysofa.org> Author: jh Date: 2004-12-22 11:57:17 -0500 (Wed, 22 Dec 2004) New Revision: 5264 Added: tinysofa/releases/1.1/nc/current/sources/nc-1.10-return.patch tinysofa/releases/1.1/nc/current/sources/nc-1.10-sigalrm.patch tinysofa/releases/1.1/nc/current/sources/nc-1.10-timeout.patch tinysofa/releases/1.1/nc/current/sources/netcat-1.10-ranges05.patch Modified: tinysofa/releases/1.1/nc/current/sources/nc.1 tinysofa/releases/1.1/nc/current/sources/nc110.tgz tinysofa/releases/1.1/nc/current/specs/nc.spec Log: - spec cleanup - add patches from Fedora Added: tinysofa/releases/1.1/nc/current/sources/nc-1.10-return.patch =================================================================== --- tinysofa/releases/1.1/nc/current/sources/nc-1.10-return.patch 2004-12-22 16:48:32 UTC (rev 5263) +++ tinysofa/releases/1.1/nc/current/sources/nc-1.10-return.patch 2004-12-22 16:57:17 UTC (rev 5264) @@ -0,0 +1,21 @@ +--- nc/netcat.c.return 2004-11-01 13:58:00.177235344 +0100 ++++ nc/netcat.c 2004-11-01 14:07:08.646855288 +0100 +@@ -104,6 +104,9 @@ + #endif + #define MAXHOSTNAMELEN 256 + ++/* define helpme function */ ++void helpme(); ++ + struct host_poop { + char name[MAXHOSTNAMELEN]; /* dns name */ + char addrs[8][24]; /* ascii-format IP addresses */ +@@ -1697,7 +1700,7 @@ + #ifdef HAVE_HELP /* unless we wanna be *really* cryptic */ + /* helpme : + the obvious */ +-helpme() ++void helpme() + { + o_verbose = 1; + holler ("[v1.10]\n\ Added: tinysofa/releases/1.1/nc/current/sources/nc-1.10-sigalrm.patch =================================================================== --- tinysofa/releases/1.1/nc/current/sources/nc-1.10-sigalrm.patch 2004-12-22 16:48:32 UTC (rev 5263) +++ tinysofa/releases/1.1/nc/current/sources/nc-1.10-sigalrm.patch 2004-12-22 16:57:17 UTC (rev 5264) @@ -0,0 +1,25 @@ +--- nc/netcat.c/sigalrm 1996-03-20 19:38:04.000000000 -0500 ++++ nc/netcat.c 2004-08-31 16:10:58.274650672 -0400 +@@ -1313,7 +1313,8 @@ + USHORT hiport = 0; + USHORT curport = 0; + char * randports = NULL; +- ++ sigset_t sigset; ++ + #ifdef HAVE_BIND + /* can *you* say "cc -yaddayadda netcat.c -lresolv -l44bsd" on SunLOSs? */ + res_init(); +@@ -1332,6 +1333,12 @@ + gatesptr = 4; + h_errno = 0; + ++/* make sure SIGALRM is not blocked by some bozo */ ++ sigemptyset (&sigset); ++ sigaddset (&sigset, SIGALRM); ++ if (sigprocmask (SIG_UNBLOCK, &sigset, NULL) < 0) ++ bail("could not unblock SIGALRM: ", strerror(errno)); ++ + /* catch a signal or two for cleanup */ + signal (SIGINT, catch); + signal (SIGQUIT, catch); Added: tinysofa/releases/1.1/nc/current/sources/nc-1.10-timeout.patch =================================================================== --- tinysofa/releases/1.1/nc/current/sources/nc-1.10-timeout.patch 2004-12-22 16:48:32 UTC (rev 5263) +++ tinysofa/releases/1.1/nc/current/sources/nc-1.10-timeout.patch 2004-12-22 16:57:17 UTC (rev 5264) @@ -0,0 +1,118 @@ +--- nc/netcat.c.orig Wed May 2 15:45:17 2001 ++++ nc/netcat.c Mon May 14 14:27:25 2001 +@@ -59,6 +59,14 @@ + #define RAND rand + #endif /* HAVE_RANDOM */ + ++/* #define POSIX_SETJMP /* If you want timeouts to work under the */ ++ /* posixly correct, yet non-standard glibc-2.x*/ ++ /* then define this- you may also need it for */ ++ /* IRIX, and maybe some others */ ++#ifdef LINUX ++#define POSIX_SETJMP ++#endif ++ + /* includes: */ + #include /* timeval, time_t */ + #include /* jmp_buf et al */ +@@ -106,7 +117,11 @@ + #define PINF struct port_poop + + /* globals: */ ++#ifdef POSIX_SETJMP ++sigjmp_buf jbuf; /* timer crud */ ++#else + jmp_buf jbuf; /* timer crud */ ++#endif + int jval = 0; /* timer crud */ + int netfd = -1; + int ofd = 0; /* hexdump output fd */ +@@ -232,7 +247,11 @@ + alarm (0); + if (jval == 0) + bail ("spurious timer interrupt!"); ++#ifdef POSIX_SETJMP ++ siglongjmp (jbuf, jval); ++#else + longjmp (jbuf, jval); ++#endif + } + + /* arm : +@@ -744,12 +763,21 @@ + + /* wrap connect inside a timer, and hit it */ + arm (1, o_wait); ++#ifdef POSIX_SETJMP ++ if (sigsetjmp (jbuf,1) == 0) { ++ rr = connect (nnetfd, (SA *)remend, sizeof (SA)); ++ } else { /* setjmp: connect failed... */ ++ rr = -1; ++ errno = ETIMEDOUT; /* fake it */ ++ } ++#else + if (setjmp (jbuf) == 0) { + rr = connect (nnetfd, (SA *)remend, sizeof (SA)); + } else { /* setjmp: connect failed... */ + rr = -1; + errno = ETIMEDOUT; /* fake it */ + } ++#endif + arm (0, 0); + if (rr == 0) + return (nnetfd); +@@ -821,7 +849,8 @@ + if (o_udpmode) { + x = sizeof (SA); /* retval for recvfrom */ + arm (2, o_wait); /* might as well timeout this, too */ +- if (setjmp (jbuf) == 0) { /* do timeout for initial connect */ ++#ifdef POSIX_SETJMP ++ if (sigsetjmp (jbuf,1) == 0) { /* do timeout for initial connect */ + rr = recvfrom /* and here we block... */ + (nnetfd, bigbuf_net, BIGSIZ, MSG_PEEK, (SA *) remend, &x); + Debug (("dolisten/recvfrom ding, rr = %d, netbuf %s ", rr, bigbuf_net)) +@@ -842,14 +871,44 @@ + rr = connect (nnetfd, (SA *)remend, sizeof (SA)); + goto whoisit; + } /* o_udpmode */ ++#else ++ if (setjmp (jbuf) == 0) { /* do timeout for initial connect */ ++ rr = recvfrom /* and here we block... */ ++ (nnetfd, bigbuf_net, BIGSIZ, MSG_PEEK, (SA *) remend, &x); ++Debug (("dolisten/recvfrom ding, rr = %d, netbuf %s ", rr, bigbuf_net)) ++ } else ++ goto dol_tmo; /* timeout */ ++ arm (0, 0); ++/* I'm not completely clear on how this works -- BSD seems to make UDP ++ just magically work in a connect()ed context, but we'll undoubtedly run ++ into systems this deal doesn't work on. For now, we apparently have to ++ issue a connect() on our just-tickled socket so we can write() back. ++ Again, why the fuck doesn't it just get filled in and taken care of?! ++ This hack is anything but optimal. Basically, if you want your listener ++ to also be able to send data back, you need this connect() line, which ++ also has the side effect that now anything from a different source or even a ++ different port on the other end won't show up and will cause ICMP errors. ++ I guess that's what they meant by "connect". ++ Let's try to remember what the "U" is *really* for, eh? */ ++ rr = connect (nnetfd, (SA *)remend, sizeof (SA)); ++ goto whoisit; ++ } /* o_udpmode */ ++#endif + + /* fall here for TCP */ + x = sizeof (SA); /* retval for accept */ + arm (2, o_wait); /* wrap this in a timer, too; 0 = forever */ ++#ifdef POSIX_SETJMP ++ if (sigsetjmp (jbuf,1) == 0) { ++ rr = accept (nnetfd, (SA *)remend, &x); ++ } else ++ goto dol_tmo; /* timeout */ ++#else + if (setjmp (jbuf) == 0) { + rr = accept (nnetfd, (SA *)remend, &x); + } else + goto dol_tmo; /* timeout */ ++#endif + arm (0, 0); + close (nnetfd); /* dump the old socket */ + nnetfd = rr; /* here's our new one */ Modified: tinysofa/releases/1.1/nc/current/sources/nc.1 =================================================================== --- tinysofa/releases/1.1/nc/current/sources/nc.1 2004-12-22 16:48:32 UTC (rev 5263) +++ tinysofa/releases/1.1/nc/current/sources/nc.1 2004-12-22 16:57:17 UTC (rev 5264) @@ -162,6 +162,7 @@ displayed unless .Fl v is specified twice. +.El .Sh EXAMPLES .Bl -tag -width x .It Li "nc" Modified: tinysofa/releases/1.1/nc/current/sources/nc110.tgz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/nc/current/sources/netcat-1.10-ranges05.patch =================================================================== --- tinysofa/releases/1.1/nc/current/sources/netcat-1.10-ranges05.patch 2004-12-22 16:48:32 UTC (rev 5263) +++ tinysofa/releases/1.1/nc/current/sources/netcat-1.10-ranges05.patch 2004-12-22 16:57:17 UTC (rev 5264) @@ -0,0 +1,26 @@ +diff -ur nc-1.10/netcat.c nc-1.10-ranges/netcat.c +--- nc-1.10/netcat.c 1996-03-21 01:38:04.000000000 +0100 ++++ nc-1.10-ranges/netcat.c 2002-06-10 16:10:28.000000000 +0200 +@@ -1552,8 +1552,9 @@ + argument, so we can control the pattern somewhat. */ + while (argv[optind]) { + hiport = loport = 0; +- cp = strchr (argv[optind], '-'); /* nn-mm range? */ +- if (cp) { ++ cp = strchr (argv[optind], '-'); /* nn-mm range? (dash in arg) */ ++ if (cp && (argv[optind][0] >= '0') && (argv[optind][0] <= '9')) { ++ /* have dash and arg is numeric */ + *cp = '\0'; + cp++; + hiport = getportpoop (cp, 0); +--- nc/Makefile.foo 2002-07-18 19:42:16.000000000 -0400 ++++ nc/Makefile 2002-07-18 19:42:34.000000000 -0400 +@@ -15,7 +15,7 @@ + # -Bstatic for sunos, -static for gcc, etc. You want this, trust me. + STATIC = + CC = cc $(CFLAGS) +-LD = $(CC) -s # linker; defaults to stripped executables ++LD = $(CC) # linker; defaults to stripped executables + o = o # object extension + + ALL = nc Modified: tinysofa/releases/1.1/nc/current/specs/nc.spec =================================================================== --- tinysofa/releases/1.1/nc/current/specs/nc.spec 2004-12-22 16:48:32 UTC (rev 5263) +++ tinysofa/releases/1.1/nc/current/specs/nc.spec 2004-12-22 16:57:17 UTC (rev 5264) @@ -1,15 +1,19 @@ Summary: Reads and writes data across network connections using TCP or UDP. Name: nc Version: 1.10 -Release: 11ts -Source0: http://www.atstake.com/research/tools/network_utilities/nc110.tgz +Release: 12jh +Source0: ftp://ftp.avian.org/src/hacks/nc110.tgz Source1: http://www.openbsd.org/src/usr.bin/nc/nc.1 Patch0: nc-arm.patch Patch1: nc-1.10-halfclose.patch Patch2: nc-proto.patch +Patch3: nc-1.10-timeout.patch +Patch4: netcat-1.10-ranges05.patch +Patch5: nc-1.10-sigalrm.patch +Patch6: nc-1.10-return.patch License: GPL Group: extra -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The nc package contains Netcat (the program is actually nc), a simple @@ -24,55 +28,85 @@ network and you'd like to use its debugging and network exploration capabilities. + %prep %setup -c -n nc -q %patch0 -p1 %patch1 -p1 -b .halfclose %patch2 -p1 -b .proto +%patch3 -p1 -b .timeout +%patch4 -p1 -b .range +%patch5 -p1 -b .sigalrm +%patch6 -p1 -b .return + cp %{SOURCE1} . + %build # XXX Make linux is supported, but it makes a static binary. -make CFLAGS="$RPM_OPT_FLAGS" generic +%make CFLAGS="$RPM_OPT_FLAGS" generic + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -install -d ${RPM_BUILD_ROOT}/usr/bin -install -d ${RPM_BUILD_ROOT}/usr/share/man/man1 -install -m 755 nc ${RPM_BUILD_ROOT}/usr/bin -install -m 644 nc.1 ${RPM_BUILD_ROOT}/usr/share/man/man1 +install -d %{buildroot}%{_bindir} +install -m 755 nc %{buildroot}%{_bindir} +install -d %{buildroot}%{_mandir}/man1 +install -m 644 nc.1 %{buildroot}%{_mandir}/man1 + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +%clean_buildroot + %files %defattr(-,root,root) %doc README Changelog scripts -/usr/bin/nc -/usr/share/man/man1/nc.1* +%{_bindir}/nc +%{_mandir}/man1/nc.1* + %changelog -* Thu Aug 05 2004 tsintegrate 1.10-11ts -- current (1.10-11jh) integrated as 1.10-11ts for release 1.1 +* Mon Nov 01 2004 Radek Vokal 1.10-23 +- return value of help function fixed (#137785) -* Wed May 19 2004 tsintegrate 1.10-10ts -- current (1.10-9ts) integrated as 1.10-10ts for release 1.0-U1 +* Tue Sep 21 2004 Radek Vokal 1.10-22 +- timeout option patch when SIGALRM blocked (#132973) -* Sat Dec 6 2003 Erlend Midttun 1.10-6tr -- Big rebuild +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 1.10-5tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 1.10-4em -- Rebuilt against glibc 2.3.2. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Jul 24 2002 Daniel Meyer 1.10-3dm -- rebuild for Trustix Secure Linux 2.0 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Wed Feb 21 2001 Oren Tirosh -- Updated man path to /usr/share/man +* Wed Dec 11 2002 Tim Powers 1.10-17 +- rebuild on all arches +* Tue Jul 23 2002 Bill Nottingham 1.10-16 +- fix for the parsing patch () + +* Thu Jul 18 2002 Bill Nottingham 1.10-15 +- don't strip binaries +- fix parsing of some services (#52874) () +- fix man page (#63544) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue May 15 2001 Bill Nottingham +- add patch to fix timeouts (#40689, ) + * Fri Oct 20 2000 Bill Nottingham - include reslov.h for res_init prototype From svn at tinysofa.org Wed Dec 22 12:40:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 22 Dec 2004 07:40:44 -0500 (EST) Subject: [tinysofa-svn] r5260 - in tinysofa/releases/1.1/bison/current: sources specs Message-ID: <20041222124044.0E3C6344291@minbar.tinysofa.org> Author: jh Date: 2004-12-22 07:40:09 -0500 (Wed, 22 Dec 2004) New Revision: 5260 Added: tinysofa/releases/1.1/bison/current/sources/bison-1.875c.tar.gz Removed: tinysofa/releases/1.1/bison/current/sources/bison-1.875.tar.bz2 tinysofa/releases/1.1/bison/current/sources/yacc.c.diff Modified: tinysofa/releases/1.1/bison/current/specs/bison.spec Log: - 1.875c - new spec file Deleted: tinysofa/releases/1.1/bison/current/sources/bison-1.875.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/bison/current/sources/bison-1.875c.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/bison/current/sources/bison-1.875c.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.1/bison/current/sources/yacc.c.diff =================================================================== --- tinysofa/releases/1.1/bison/current/sources/yacc.c.diff 2004-12-22 12:35:32 UTC (rev 5259) +++ tinysofa/releases/1.1/bison/current/sources/yacc.c.diff 2004-12-22 12:40:09 UTC (rev 5260) @@ -1,82 +0,0 @@ -=================================================================== -RCS file: /cvsroot/bison/bison/data/yacc.c,v -retrieving revision 1.47 -retrieving revision 1.51 -diff -u -r1.47 -r1.51 ---- bison/bison/data/yacc.c 2002/12/28 08:36:02 1.47 -+++ bison/bison/data/yacc.c 2003/01/22 06:38:32 1.51 -@@ -1,7 +1,7 @@ - m4_divert(-1) -*- C -*- - - # Yacc compatible skeleton for Bison --# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 -+# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify -@@ -134,7 +134,7 @@ - m4_divert(0)dnl - @output @output_parser_name@ - b4_copyright([Skeleton parser for Yacc-like parsing with Bison], -- [1984, 1989, 1990, 2000, 2001, 2002])[ -+ [1984, 1989, 1990, 2000, 2001, 2002, 2003])[ - - /* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. -@@ -465,7 +465,15 @@ - - #define YYACCEPT goto yyacceptlab - #define YYABORT goto yyabortlab --#define YYERROR goto yyerrlab1 -+#define YYERROR ]b4_location_if([do \ -+ { \ -+ yylerrsp = yylsp; \ -+ *++yylerrsp = yyloc; \ -+ goto yyerrlab1; \ -+ } \ -+ while (0)], -+ [goto yyerrlab1])[ -+ - - /* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. -@@ -1103,29 +1111,13 @@ - - /* Else will try to reuse lookahead token after shifting the error - token. */ -- goto yyerrlab2; -+ goto yyerrlab1; - - - /*----------------------------------------------------. - | yyerrlab1 -- error raised explicitly by an action. | - `----------------------------------------------------*/ - yyerrlab1: -- -- /* Suppress GCC warning that yyerrlab1 is unused when no action -- invokes YYERROR. */ --#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) -- __attribute__ ((__unused__)) --#endif -- --]b4_location_if([ yylerrsp = yylsp; -- *++yylerrsp = yyloc;])[ -- goto yyerrlab2; -- -- --/*---------------------------------------------------------------. --| yyerrlab2 -- pop states until the error token can be shifted. | --`---------------------------------------------------------------*/ --yyerrlab2: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) -@@ -1204,7 +1196,7 @@ - m4_if(b4_defines_flag, 0, [], - [@output @output_header_name@ - b4_copyright([Skeleton parser for Yacc-like parsing with Bison], -- [1984, 1989, 1990, 2000, 2001, 2002]) -+ [1984, 1989, 1990, 2000, 2001, 2002, 2003]) - - /* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. Modified: tinysofa/releases/1.1/bison/current/specs/bison.spec =================================================================== --- tinysofa/releases/1.1/bison/current/specs/bison.spec 2004-12-22 12:35:32 UTC (rev 5259) +++ tinysofa/releases/1.1/bison/current/specs/bison.spec 2004-12-22 12:40:09 UTC (rev 5260) @@ -1,142 +1,177 @@ Summary: A GNU general-purpose parser generator. Name: bison -Version: 1.875 -Release: 13ts +Version: 1.875c +Release: 1jh License: GPL Group: development -Source: ftp://ftp.gnu.org/gnu/bison/bison-%{version}.tar.bz2 -Requires: m4 -BuildRequires: texinfo m4 -PreReq: htmlinfo -BuildRoot: %{_tmppath}/%{name}-root -Patch0: yacc.c.diff +#Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 +Source: ftp://alpha.gnu.org/gnu/bison/bison-%{version}.tar.gz +Url: http://www.gnu.org/software/bison/bison.html +BuildRoot: %{_tmppath}/%{name}-%{version}-root +%info_requires +Requires: m4 >= 1.4 +BuildRequires: m4 >= 1.4 %description -Bison is a general purpose parser generator which converts a grammar -description for an LALR(1) context-free grammar into a C program to parse -that grammar. Bison can be used to develop a wide range of language -parsers, from ones used in simple desk calculators to complex programming -languages. Bison is upwardly compatible with Yacc, so any correctly -written Yacc grammar should work with Bison without any changes. If -you know Yacc, you shouldn't have any trouble using Bison. You do need -to be very proficient in C programming to be able to use Bison). Bison -is only needed on systems that are used for development. +Bison is a general purpose parser generator that converts a grammar +description for an LALR(1) context-free grammar into a C program to +parse that grammar. Bison can be used to develop a wide range of +language parsers, from ones used in simple desk calculators to complex +programming languages. Bison is upwardly compatible with Yacc, so any +correctly written Yacc grammar should work with Bison without any +changes. If you know Yacc, you shouldn't have any trouble using +Bison. You do need to be very proficient in C programming to be able +to use Bison. Bison is only needed on systems that are used for +development. -If your system will be used for C development, you should install Bison -since it is used to build many C programs. +If your system will be used for C development, you should install +Bison. + %prep %setup -q -%patch0 -p2 + %build -%configure -make LDFLAGS=-s +%configure +%make -# HTMLise info -cd doc -makeinfo --html --no-split bison.texinfo %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR=${RPM_BUILD_ROOT} install +%makeinstall -strip ${RPM_BUILD_ROOT}%{_prefix}/bin/* || true -mkdir -p $RPM_BUILD_ROOT/usr/share/html/%{name} -install -m 644 doc/%{name}.html $RPM_BUILD_ROOT/usr/share/html/%{name}/ +%install_info doc/bison.texinfo -# Let byacc provice yacc alone: -rm $RPM_BUILD_ROOT/%{_prefix}/bin/yacc +# Remove unpackaged files. +rm -f $RPM_BUILD_ROOT/%{_bindir}/yacc +%nuke_info -# nuke info pages -rm -rf $RPM_BUILD_ROOT/usr/share/info - %find_lang %{name} -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %post -/usr/sbin/htmlinfo_update.sh +%info_post %postun -/usr/sbin/htmlinfo_update.sh +%info_postun + %files -f %{name}.lang %defattr(-,root,root) +%{_mandir}/*/bison* +%{_datadir}/bison +%{_bindir}/bison %{_libdir}/liby.a -%{_mandir}/*/* -%{_prefix}/share/bison -%{_prefix}/share/html/%{name} -%{_prefix}/bin/* +%{_htmldir}/%{name} + +%clean +%clean_buildroot + + %changelog -* Thu Aug 05 2004 tsintegrate 1.875-13ts -- current (1.875-13jh) integrated as 1.875-13ts for release 1.1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 19 2004 tsintegrate 1.875-12ts -- current (1.875-11ts) integrated as 1.875-12ts for release 1.0-U1 +* Fri Jun 4 2004 Roland McGrath 1.875c-1 +- new upstream version (fixes bug #116823) -* Tue May 11 2004 Omar Kilani 1.875-11ts -- Remove BuildRequires /usr/bin/makeinfo. -- Add BuildRequires texinfo. -- Add BuildRequires m4. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Sun Mar 28 2004 Omar Kilani 1.875-11ts -- initial tinysofa release -- nuke info pages -- find_lang -- add liby.a to files. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri Dec 12 2003 Erlend Midttun 1.875-8tr -- Big rebuild +* Thu Oct 30 2003 Roland McGrath 1.875-6 +- add dependency on m4 (bug #108655) -* Wed Jun 18 2003 Erlend Midttun 1.875-7tr -- Big rebuild +* Wed Sep 24 2003 Roland McGrath 1.875-5 +- remove problematic __attribute__ use for label (bug #105034) -* Thu May 22 2003 Erlend Midttun 1.875-6em -- Req: m4 +* Fri Aug 1 2003 Havoc Pennington 1.875-3 +- put #ifndef __cplusplus around attribute(unused) on goto label in yacc.c -* Wed Apr 9 2003 Gerald Dachs 1.875-5gd -- Added PreReq on htmlinfo +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 1.875-4em -- Rebuilt against glibc 2.3.2. +* Sat Mar 22 2003 Roland McGrath 1.875-2 +- update specs for new files installed by new version -* Wed Mar 12 2003 Ken A. Rederg?rd 1.875-3kr -- Added patch that lets g++3.2 compile bison generated code +* Wed Mar 19 2003 Roland McGrath 1.875-1 +- new upstream version 1.875 (bug #83184) -* Thu Feb 6 2003 Christian H. Toldnes 1.875-2ct -- Let byacc provide /usr/bin/yacc +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Sun Jan 12 2003 Goetz Bock 1.875-1bg -- new upstream: 1.875 +* Wed Nov 27 2002 Than Ngo 1.35-5 +- rebuild in new build enviroment +- remove unneeded file -* Thu Oct 24 2002 Christian H. Toldnes 1.75-2ct -- introduced htmlinfo. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Sun Oct 20 2002 Goetz Bock 1.75-1bg -- new upstream version -- removed info +* Tue Jun 18 2002 Than Ngo 1.35-3 +- don't forcibly strip binaries -* Thu Jul 25 2002 Nico Erfurth 1.35-1ne -- new upstream version -- cleaned specfile -- bison.parsers are in /usr/share/bison now +* Thu May 23 2002 Tim Powers +- automated rebuild -* Tue Jul 23 2002 Daniel Meyer 1.28-5dm -- rebuild for Trustix Secure Linux 2.0 +* Wed Mar 27 2002 Than Ngo 1.35-1 +- 1.35 fix incompatible with C++ compilers (bug #62121) -* Mon Feb 28 2000 Lars Gaarden -- moved info-files to /usr/share/info +* Sun Mar 17 2002 Florian La Roche +- update to 1.34 -* Thu Feb 03 2000 Preston Brown +* Sat Feb 09 2002 Florian La Roche +- update to 1.33 + +* Sat Jan 26 2002 Florian La Roche +- update to 1.32 + +* Tue Jan 15 2002 Florian La Roche +- update to 1.31 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Nov 27 2001 Than Ngo 1.30-4 +- add missing Url + +* Sun Nov 25 2001 Than Ngo 1.30-3 +- fixed coredumps on some input bug #56607i, thanks to Enrico for locating this bug + +* Tue Nov 06 2001 Than Ngo 1.30-2 +- FHS packaging +- use find_lang + +* Sun Nov 04 2001 Florian La Roche +- update to 1.30 + +* Mon Oct 15 2001 Than Ngo 1.29-1 +- update to 1.29 +- update Url (bug #54597) + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Than Ngo +- rebuilt in the new build environment +- FHS packaging + +* Sat May 27 2000 Ngo Than +- rebuild for 7.0 +- put man pages and info files to correct place + +* Thu Feb 03 2000 Preston Brown - rebuild to gzip man page. * Fri Jul 16 1999 Jeff Johnson - update to 1.28. -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 3) * Mon Mar 8 1999 Jeff Johnson From svn at tinysofa.org Wed Dec 22 13:23:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 22 Dec 2004 08:23:09 -0500 (EST) Subject: [tinysofa-svn] r5261 - in tinysofa/releases/1.1/byacc/current: sources specs Message-ID: <20041222132309.50E7E344298@minbar.tinysofa.org> Author: jh Date: 2004-12-22 08:22:51 -0500 (Wed, 22 Dec 2004) New Revision: 5261 Added: tinysofa/releases/1.1/byacc/current/sources/bsdyacc-linux.patch tinysofa/releases/1.1/byacc/current/sources/yacc-1.9-fbsd.tar.gz Removed: tinysofa/releases/1.1/byacc/current/sources/byacc-1.9-fixmanpage.patch tinysofa/releases/1.1/byacc/current/sources/byacc.1.9.tar.Z Modified: tinysofa/releases/1.1/byacc/current/sources/byacc-1.9-security.patch tinysofa/releases/1.1/byacc/current/specs/byacc.spec Log: - change to FreeBSD byacc Added: tinysofa/releases/1.1/byacc/current/sources/bsdyacc-linux.patch =================================================================== --- tinysofa/releases/1.1/byacc/current/sources/bsdyacc-linux.patch 2004-12-22 12:40:09 UTC (rev 5260) +++ tinysofa/releases/1.1/byacc/current/sources/bsdyacc-linux.patch 2004-12-22 13:22:51 UTC (rev 5261) @@ -0,0 +1,100 @@ +--- yacc/Makefile.linux Thu Sep 28 12:15:28 2000 ++++ yacc/Makefile Thu Sep 28 12:15:33 2000 +@@ -1,15 +1,84 @@ +-# @(#)Makefile 5.3 (Berkeley) 5/12/90 +-# $FreeBSD: src/usr.bin/yacc/Makefile,v 1.8 1999/08/28 01:07:58 peter Exp $ ++DEST = . + +-PROG= yacc +-SRCS= closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \ +- skeleton.c symtab.c verbose.c warshall.c +-MAN1= yacc.1 yyfix.1 +-LINKS+= ${BINDIR}/yacc ${BINDIR}/byacc +-MLINKS+=yacc.1 byacc.1 +- +-beforeinstall: +- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ +- ${.CURDIR}/yyfix.sh ${DESTDIR}${BINDIR}/yyfix ++HDRS = defs.h + +-.include ++CFLAGS = -O -DNDEBUG ++ ++LDFLAGS = ++ ++LIBS = ++ ++LINKER = cc ++ ++MAKEFILE = Makefile ++ ++OBJS = closure.o \ ++ error.o \ ++ lalr.o \ ++ lr0.o \ ++ main.o \ ++ mkpar.o \ ++ output.o \ ++ reader.o \ ++ skeleton.o \ ++ symtab.o \ ++ verbose.o \ ++ warshall.o ++ ++PRINT = pr -f -l88 ++ ++PROGRAM = yacc ++ ++SRCS = closure.c \ ++ error.c \ ++ lalr.c \ ++ lr0.c \ ++ main.c \ ++ mkpar.c \ ++ output.c \ ++ reader.c \ ++ skeleton.c \ ++ symtab.c \ ++ verbose.c \ ++ warshall.c ++ ++all: $(PROGRAM) ++ ++$(PROGRAM): $(OBJS) $(LIBS) ++ @echo -n "Loading $(PROGRAM) ... " ++ @$(LINKER) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) ++ @echo "done" ++ ++clean:; @rm -f $(OBJS) ++ ++clobber:; @rm -f $(OBJS) $(PROGRAM) ++ ++depend:; @mkmf -f $(MAKEFILE) PROGRAM=$(PROGRAM) DEST=$(DEST) ++ ++index:; @ctags -wx $(HDRS) $(SRCS) ++ ++install: $(PROGRAM) ++ @echo Installing $(PROGRAM) in $(DEST) ++ @install -s $(PROGRAM) $(DEST) ++ ++listing:; @$(PRINT) Makefile $(HDRS) $(SRCS) | lpr ++ ++lint:; @lint $(SRCS) ++ ++program: $(PROGRAM) ++ ++tags: $(HDRS) $(SRCS); @ctags $(HDRS) $(SRCS) ++ ++### ++closure.o: defs.h ++error.o: defs.h ++lalr.o: defs.h ++lr0.o: defs.h ++main.o: defs.h ++mkpar.o: defs.h ++output.o: defs.h ++reader.o: defs.h ++skeleton.o: defs.h ++symtab.o: defs.h ++verbose.o: defs.h ++warshall.o: defs.h Deleted: tinysofa/releases/1.1/byacc/current/sources/byacc-1.9-fixmanpage.patch =================================================================== --- tinysofa/releases/1.1/byacc/current/sources/byacc-1.9-fixmanpage.patch 2004-12-22 12:40:09 UTC (rev 5260) +++ tinysofa/releases/1.1/byacc/current/sources/byacc-1.9-fixmanpage.patch 2004-12-22 13:22:51 UTC (rev 5261) @@ -1,20 +0,0 @@ ---- byacc-1.9/yacc.1.fixmanpage Wed Apr 7 18:25:23 1999 -+++ byacc-1.9/yacc.1 Wed Apr 7 18:26:01 1999 -@@ -44,13 +44,13 @@ - .B -l - option is not specified, - .I yacc --will insert \#line directives in the generated code. --The \#line directives let the C compiler relate errors in the -+will insert #line directives in the generated code. -+The #line directives let the C compiler relate errors in the - generated code to the user's original code. - If the \fB-l\fR option is specified, - .I yacc --will not insert the \#line directives. --\&\#line directives specified by the user will be retained. -+will not insert the #line directives. -+\&#line directives specified by the user will be retained. - .TP - \fB-p \fIsymbol_prefix\fR - The Modified: tinysofa/releases/1.1/byacc/current/sources/byacc-1.9-security.patch =================================================================== --- tinysofa/releases/1.1/byacc/current/sources/byacc-1.9-security.patch 2004-12-22 12:40:09 UTC (rev 5260) +++ tinysofa/releases/1.1/byacc/current/sources/byacc-1.9-security.patch 2004-12-22 13:22:51 UTC (rev 5261) @@ -1,7 +1,18 @@ -diff -urN byacc-1.9/main.c byacc-1.9.security/main.c ---- byacc-1.9/main.c 1993-02-22 06:32:46.000000000 +0000 -+++ byacc-1.9.security/main.c 2004-05-17 05:55:25.000000000 +0000 -@@ -64,9 +64,18 @@ +--- yacc/main.c.security Mon Jan 10 15:26:24 2000 ++++ yacc/main.c Fri Jan 5 10:21:29 2001 +@@ -109,6 +109,11 @@ + short **derives; + char *nullable; + ++#ifdef linux ++# define mktemp safe_mktemp ++extern void safe_mktemp(char *tmpl); ++#endif ++ + static void create_file_names __P((void)); + static void getargs __P((int, char **)); + static void onintr __P((int)); +@@ -121,9 +126,18 @@ done(k) int k; { @@ -23,19 +34,7 @@ exit(k); } -@@ -94,6 +103,11 @@ - } - - -+#ifdef linux -+# define mktemp safe_mktemp -+extern void safe_mktemp(char *tmpl); -+#endif -+ - usage() - { - fprintf(stderr, "usage: %s [-dlrtv] [-b file_prefix] [-p symbol_prefix] filename\n", myname); -@@ -355,6 +369,19 @@ +@@ -482,6 +496,19 @@ code_file = output_file; } Deleted: tinysofa/releases/1.1/byacc/current/sources/byacc.1.9.tar.Z =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/byacc/current/sources/yacc-1.9-fbsd.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/byacc/current/sources/yacc-1.9-fbsd.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/byacc/current/specs/byacc.spec =================================================================== --- tinysofa/releases/1.1/byacc/current/specs/byacc.spec 2004-12-22 12:40:09 UTC (rev 5260) +++ tinysofa/releases/1.1/byacc/current/specs/byacc.spec 2004-12-22 13:22:51 UTC (rev 5261) @@ -1,13 +1,14 @@ Summary: A public domain Yacc parser generator. Name: byacc Version: 1.9 -Release: 24ts -License: public domain +Release: 25jh +Copyright: public domain Group: development -Source: ftp://ftp.cs.berkeley.edu/ucb/4bsd/byacc.1.9.tar.Z -Patch0: byacc-1.9-fixmanpage.patch +# The source is taken from FreeBSD's CVS as of Thu Sep 28 2000 +Source: yacc-1.9-fbsd.tar.gz +Patch: bsdyacc-linux.patch Patch1: byacc-1.9-security.patch -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Byacc (Berkeley Yacc) is a public domain LALR parser generator which @@ -16,64 +17,90 @@ If you are going to do development on your system, you will want to install this package. + %prep -%setup -q -c -%patch0 -p1 -%patch1 -p1 +%setup -q -n yacc +%patch -p1 -b .linux~ +%patch1 -p1 -b .security~ -%build chmod u+w `find .` -make CFLAGS="$RPM_OPT_FLAGS" + +%build +%make CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" LINKER=%{__cc} + + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/man1} +%{__mkdir_p} \ + %{buildroot}%{_mandir}/man1 \ + %{buildroot}%{_bindir} -install -c -m 755 -s yacc $RPM_BUILD_ROOT/usr/bin/yacc -install -c -m 644 yacc.1 $RPM_BUILD_ROOT/usr/share/man/man1/yacc.1 -ln -sf yacc $RPM_BUILD_ROOT/usr/bin/byacc -ln -sf yacc.1 $RPM_BUILD_ROOT/usr/share/man/man1/byacc.1 +install -c -m 755 yacc %{buildroot}%{_bindir}/yacc +install -c -m 644 yacc.1 %{buildroot}%{_mandir}/man1/yacc.1 +ln -sf yacc %{buildroot}%{_bindir}/byacc +ln -sf yacc.1.gz %{buildroot}%{_mandir}/man1/byacc.1.gz + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +%clean_buildroot + %files %defattr(-,root,root) -/usr/bin/yacc -/usr/bin/byacc -/usr/share/man/man1/yacc.1* -/usr/share/man/man1/byacc.1* +%{_bindir}/yacc +%{_bindir}/byacc +%{_mandir}/man1/yacc.1* +%{_mandir}/man1/byacc.1* + %changelog -* Thu Aug 05 2004 tsintegrate 1.9-24ts -- current (1.9-24jh) integrated as 1.9-24ts for release 1.1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 19 2004 tsintegrate 1.9-23ts -- current (1.9-23ok) integrated as 1.9-23ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon May 17 2004 Omar Kilani 1.9-23ok -- Fix non-root build. -- Add mktemp security patch. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Dec 8 2003 Erlend Midttun 1.9-19tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 1.9-18tr -- Big rebuild +* Thu Dec 05 2002 Elliot Lee 1.9-23 +- Rebuild -* Mon Mar 24 2003 Erlend Midttun 1.9-17em -- Rebuilt against glibc 2.3.2. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Wed Jul 24 2002 Daniel Meyer 1.9-16dm -- rebuild for Trustix Secure Linux 2.0 +* Thu May 23 2002 Tim Powers +- automated rebuild -* Wed Mar 22 2000 Lars Gaarden -- Fixed symlinks, manpages +* Wed Jan 09 2002 Tim Powers +- automated rebuild -* Tue Feb 15 2000 Erlend Midttun -- Added opts -- Moved man pages +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. +* Fri Jan 05 2001 Preston Brown +- security patch for tmpfile creation from Olaf Kirch + +* Fri Sep 29 2000 Bernhard Rosenkraenzer +- Update to the version in FreeBSD CVS - it's actively maintained, unlike + the 1993 4BSD version we used to have + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Jun 28 2000 Bill Nottingham +- fix perms in tarball + +* Mon Jun 19 2000 Bernhard Rosenkraenzer +- FHSify +- handle RPM_OPT_FLAGS + +* Sat May 6 2000 Bill Nottingham +- fix yacc for ia64 + * Fri Feb 4 2000 Bernhard Rosenkraenzer - rebuild to compress man pages - fix up manpage symlink From svn at tinysofa.org Wed Dec 22 17:11:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 22 Dec 2004 12:11:36 -0500 (EST) Subject: [tinysofa-svn] r5265 - in tinysofa/releases/1.1/patch/current: sources specs Message-ID: <20041222171136.2DB9C3442A2@minbar.tinysofa.org> Author: jh Date: 2004-12-22 12:11:19 -0500 (Wed, 22 Dec 2004) New Revision: 5265 Added: tinysofa/releases/1.1/patch/current/sources/patch-2.5-stderr.patch tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-ifdef.patch tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-program_name.patch tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-sigsegv.patch tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-suffix.patch Modified: tinysofa/releases/1.1/patch/current/specs/patch.spec Log: - new spec - get patches from Fedora Added: tinysofa/releases/1.1/patch/current/sources/patch-2.5-stderr.patch =================================================================== --- tinysofa/releases/1.1/patch/current/sources/patch-2.5-stderr.patch 2004-12-22 16:57:17 UTC (rev 5264) +++ tinysofa/releases/1.1/patch/current/sources/patch-2.5-stderr.patch 2004-12-22 17:11:19 UTC (rev 5265) @@ -0,0 +1,11 @@ +--- patch-2.5/util.c~ Thu Jul 10 09:16:12 1997 ++++ patch-2.5/util.c Sun Jun 6 18:16:30 1999 +@@ -568,6 +568,8 @@ + int r; + va_list args; + ++ fflush(stderr); /* Ensure pending errors are written before the question */ ++ + vararg_start (args, format); + vfprintf (stdout, format, args); + va_end (args); Added: tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-ifdef.patch =================================================================== --- tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-ifdef.patch 2004-12-22 16:57:17 UTC (rev 5264) +++ tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-ifdef.patch 2004-12-22 17:11:19 UTC (rev 5265) @@ -0,0 +1,70 @@ +--- patch-2.5.4/patch.c.ifdef Tue Mar 5 09:42:45 2002 ++++ patch-2.5.4/patch.c Tue Mar 5 09:42:47 2002 +@@ -88,8 +88,9 @@ + + static char const *do_defines; /* symbol to patch using ifdef, ifndef, etc. */ + static char const if_defined[] = "\n#ifdef %s\n"; +-static char const not_defined[] = "#ifndef %s\n"; +-static char const else_defined[] = "\n#else\n"; ++static char const not_defined[] = "\n#ifndef %s\n"; ++static char const elseis_defined[] = "\n#else /* %s */\n"; ++static char const elsenot_defined[] = "\n#else /* not %s */\n"; + static char const end_defined[] = "\n#endif /* %s */\n"; + + static int Argc; +@@ -1014,12 +1015,13 @@ + return FALSE; + if (R_do_defines) { + if (def_state == OUTSIDE) { +- fprintf (fp, outstate->after_newline + if_defined, ++ fprintf (fp, outstate->after_newline + not_defined, + R_do_defines); + def_state = IN_IFNDEF; + } + else if (def_state == IN_IFDEF) { +- fprintf (fp, outstate->after_newline + else_defined); ++ fprintf (fp, outstate->after_newline + elsenot_defined, ++ R_do_defines); + def_state = IN_ELSE; + } + if (ferror (fp)) +@@ -1038,7 +1040,8 @@ + return FALSE; + if (R_do_defines) { + if (def_state == IN_IFNDEF) { +- fprintf (fp, outstate->after_newline + else_defined); ++ fprintf (fp, outstate->after_newline + elseis_defined, ++ R_do_defines); + def_state = IN_ELSE; + } + else if (def_state == OUTSIDE) { +@@ -1069,7 +1072,8 @@ + return FALSE; + assert (outstate->after_newline); + if (R_do_defines) { +- fprintf (fp, not_defined, R_do_defines); ++ fprintf (fp, outstate->after_newline + not_defined, ++ R_do_defines); + if (ferror (fp)) + write_fatal (); + def_state = IN_IFNDEF; +@@ -1086,7 +1090,8 @@ + while (pch_char (old) == '!'); + + if (R_do_defines) { +- fprintf (fp, outstate->after_newline + else_defined); ++ fprintf (fp, outstate->after_newline + elseis_defined, ++ R_do_defines); + if (ferror (fp)) + write_fatal (); + def_state = IN_ELSE; +@@ -1124,7 +1129,8 @@ + def_state = IN_IFDEF; + } + else if (def_state == IN_IFNDEF) { +- fprintf (fp, outstate->after_newline + else_defined); ++ fprintf (fp, outstate->after_newline + elseis_defined, ++ R_do_defines); + def_state = IN_ELSE; + } + if (ferror (fp)) Added: tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-program_name.patch =================================================================== --- tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-program_name.patch 2004-12-22 16:57:17 UTC (rev 5264) +++ tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-program_name.patch 2004-12-22 17:11:19 UTC (rev 5265) @@ -0,0 +1,11 @@ +--- patch-2.5.4/error.c.program_name Tue Apr 9 14:38:27 2002 ++++ patch-2.5.4/error.c Tue Apr 9 14:38:43 2002 +@@ -80,7 +80,7 @@ + + /* The calling program should define program_name and set it to the + name of the executing program. */ +-extern char *program_name; ++extern char const program_name[]; + + # ifdef HAVE_STRERROR_R + # define __strerror_r strerror_r Added: tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-sigsegv.patch =================================================================== --- tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-sigsegv.patch 2004-12-22 16:57:17 UTC (rev 5264) +++ tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-sigsegv.patch 2004-12-22 17:11:19 UTC (rev 5265) @@ -0,0 +1,44 @@ +Bug report: #14693 +Reported by: Vincent Renardias +Patch: jdassen at wi.leidenuniv.nl (J.H.M.Dassen) +Since Version: 2.5-2 + +--- patch-2.5.orig/inp.c ++++ patch-2.5/inp.c +@@ -71,6 +71,14 @@ + } + } + ++void ++reset_scan_input_vars() ++{ ++ using_plan_a = 1; ++ i_buffer = NULL; ++ i_ptr = NULL; ++} ++ + /* Construct the line index, somehow or other. */ + + void +--- patch-2.5.orig/patch.c ++++ patch-2.5/patch.c +@@ -210,7 +210,10 @@ + + /* find out where all the lines are */ + if (!skip_rest_of_patch) +- scan_input (inname); ++ scan_input (inname); ++ else ++ reset_scan_input_vars (); ++ + + /* from here on, open no standard i/o files, because malloc */ + /* might misfire and we can't catch it easily */ +--- patch-2.5.orig/inp.h ++++ patch-2.5/inp.h +@@ -7,4 +7,5 @@ + char const *ifetch PARAMS ((LINENUM, int, size_t *)); + void get_input_file PARAMS ((char const *, char const *)); + void re_input PARAMS ((void)); ++void reset_scan_input_vars PARAMS (()); + void scan_input PARAMS ((char *)); Added: tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-suffix.patch =================================================================== --- tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-suffix.patch 2004-12-22 16:57:17 UTC (rev 5264) +++ tinysofa/releases/1.1/patch/current/sources/patch-2.5.4-suffix.patch 2004-12-22 17:11:19 UTC (rev 5265) @@ -0,0 +1,12 @@ +--- patch-2.5.4/patch.c.suffix Thu Nov 2 17:57:46 2000 ++++ patch-2.5.4/patch.c Thu Nov 2 17:58:25 2000 +@@ -145,8 +145,7 @@ + : posixly_correct - 1); + + val = getenv ("SIMPLE_BACKUP_SUFFIX"); +- if (val && *val) +- simple_backup_suffix = val; ++ simple_backup_suffix = val && *val ? val : ".orig"; + + if ((version_control = getenv ("PATCH_VERSION_CONTROL"))) + version_control_context = "$PATCH_VERSION_CONTROL"; Modified: tinysofa/releases/1.1/patch/current/specs/patch.spec =================================================================== --- tinysofa/releases/1.1/patch/current/specs/patch.spec 2004-12-22 16:57:17 UTC (rev 5264) +++ tinysofa/releases/1.1/patch/current/specs/patch.spec 2004-12-22 17:11:19 UTC (rev 5265) @@ -1,11 +1,17 @@ Summary: The GNU patch command, for modifying/upgrading files. Name: patch Version: 2.5.4 -Release: 12ts +Release: 13jh License: GPL -Group: main +URL: http://www.gnu.org/software/patch/patch.html +Group: development Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root +Patch1: patch-2.5-stderr.patch +Patch2: patch-2.5.4-suffix.patch +Patch3: patch-2.5.4-sigsegv.patch +Patch4: patch-2.5.4-ifdef.patch +Patch5: patch-2.5.4-program_name.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root %description The patch program applies diff files to originals. The diff command @@ -17,60 +23,106 @@ Patch should be installed because it is a common way of upgrading applications. + %prep %setup -q +%patch1 -p1 -b .stderr +%patch2 -p1 -b .suffix +%patch3 -p1 -b .sigsegv +%patch4 -p1 -b .ifdef +%patch5 -p1 -b .program_name -%configure -#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --mandir=/usr/share/man - %build -make "CFLAGS=$RPM_OPT_FLAGS" LDFLAGS=-s +CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +%configure # XXX unset CPPFLAGS on (ultra?)sparc to avoid large file system support %ifarch sparc sparc64 -make CPPFLAGS="" +%make CPPFLAGS="" %else -make +%make %endif + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -#make install prefix=$RPM_BUILD_ROOT/usr mandir="$RPM_BUILD_ROOT"/usr/share/man %makeinstall -strip $RPM_BUILD_ROOT/usr/bin/* + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files %defattr(-,root,root) %doc NEWS README -/usr/bin/* -/usr/share/man/*/* +%{_bindir}/patch +%{_mandir}/man1/patch.1* + %changelog -* Thu Aug 05 2004 tsintegrate 2.5.4-12ts -- current (2.5.4-12jh) integrated as 2.5.4-12ts for release 1.1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 19 2004 tsintegrate 2.5.4-11ts -- current (2.5.4-10ts) integrated as 2.5.4-11ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Sun Dec 7 2003 Erlend Midttun 2.5.4-7tr -- Big rebuild +* Sat Oct 25 2003 Tim Waugh 2.5.4-18 +- Rebuilt. -* Wed Jun 18 2003 Erlend Midttun 2.5.4-6tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 2.5.4-5em -- Rebuilt against glibc 2.3.2. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue Jul 23 2002 Daniel Meyer 2.5.4-4dm -- rebuild for Trustix Secure Linux 2.0 +* Wed Nov 20 2002 Tim Powers +- rebuilt in current collinst -* Fri Jan 29 2000 Erlend Midttun -- Moved man pages to comply with FHS +* Fri Jun 21 2002 Tim Powers +- automated rebuild +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 9 2002 Tim Waugh 2.5.4-12 +- Fix error reporting when given bad options (bug #62981). + +* Tue Mar 5 2002 Tim Waugh 2.5.4-11 +- s/Copyright:/License:/. +- Fix -D behaviour (bug #60688). + +* Tue May 29 2001 Tim Waugh 2.5.4-10 +- Merge Mandrake patch: + - fix possible segfault + +* Fri Dec 1 2000 Tim Waugh +- Rebuild because of fileutils bug. + +* Thu Nov 2 2000 Tim Waugh +- use .orig as default suffix, as per man page and previous behaviour + (bug #20202). +- use better patch for this, from maintainer. + +* Wed Oct 4 2000 Tim Waugh +- actually use the RPM_OPT_FLAGS + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 13 2000 Trond Eivind Glomsr?d +- Use %%makeinstall, %%{_tmppath} and %%{_mandir} + +* Fri May 12 2000 Trond Eivind Glomsr?d +- added URL + +* Wed Feb 16 2000 Bernhard Rosenkraenzer +- 2.5.4 +- Fix up LFS support on Alpha (Bug #5732) + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + * Sun Jun 06 1999 Alan Cox - Fix the case where stderr isnt flushed for ask(). Now the 'no such file' appears before the skip patch question, not at the very end, Doh! From svn at tinysofa.org Thu Dec 23 08:58:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 23 Dec 2004 03:58:09 -0500 (EST) Subject: [tinysofa-svn] r5267 - in tinysofa/releases/1.1/libtiff/current: sources specs Message-ID: <20041223085809.9952F344286@minbar.tinysofa.org> Author: jh Date: 2004-12-23 03:57:56 -0500 (Thu, 23 Dec 2004) New Revision: 5267 Added: tinysofa/releases/1.1/libtiff/current/sources/libtiff-3.5.5-nmemb.patch Removed: tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.4-codecs.patch tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-exit.patch tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-makeflags.patch tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-seek.patch Modified: tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec Log: - add fix for CAN-2004-1308 Added: tinysofa/releases/1.1/libtiff/current/sources/libtiff-3.5.5-nmemb.patch =================================================================== --- tinysofa/releases/1.1/libtiff/current/sources/libtiff-3.5.5-nmemb.patch 2004-12-22 19:21:29 UTC (rev 5266) +++ tinysofa/releases/1.1/libtiff/current/sources/libtiff-3.5.5-nmemb.patch 2004-12-23 08:57:56 UTC (rev 5267) @@ -0,0 +1,22 @@ +--- tiff-v3.5.5/libtiff/tif_fax3.c.nmemb 2004-12-22 09:49:04.583403000 -0500 ++++ tiff-v3.5.5/libtiff/tif_fax3.c 2004-12-22 09:49:17.107865000 -0500 +@@ -462,7 +462,7 @@ + char *cp = NULL; + tsize_t bytes = nmemb * elem_size; + +- if (elem_size && bytes / elem_size == nmemb) ++ if (nmemb && elem_size && bytes / elem_size == nmemb) + cp = (char*) _TIFFmalloc(bytes); + + if (cp == NULL) +--- tiff-v3.5.5/libtiff/tif_dirread.c.nmemb 2004-12-22 09:47:49.403658000 -0500 ++++ tiff-v3.5.5/libtiff/tif_dirread.c 2004-12-22 09:48:01.512537000 -0500 +@@ -67,7 +67,7 @@ + char *cp = NULL; + tsize_t bytes = nmemb * elem_size; + +- if (elem_size && bytes / elem_size == nmemb) ++ if (nmemb && elem_size && bytes / elem_size == nmemb) + cp = (char*)_TIFFmalloc(bytes); + + if (cp == NULL) Deleted: tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.4-codecs.patch =================================================================== --- tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.4-codecs.patch 2004-12-22 19:21:29 UTC (rev 5266) +++ tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.4-codecs.patch 2004-12-23 08:57:56 UTC (rev 5267) @@ -1,40 +0,0 @@ ---- tiff-v3.5.4/config.site Sun Sep 26 18:03:46 1999 -+++ tiff-v3.5.4/config.site Tue Jan 18 10:33:09 2000 -@@ -41,8 +41,8 @@ - # Package controls. - # - #DSO="auto" # auto|IRIX|IRIX52 enable DSO support for system --#JPEG="no" # yes|no configure JPEG support (see below) --#ZIP="no" # yes|no configure Deflate support (see below) -+JPEG="yes" # yes|no configure JPEG support (see below) -+ZIP="yes" # yes|no configure Deflate support (see below) - #LIBGL="auto" # yes|no|auto configure IRIS GL-based tools - #LIBIMAGE="auto" # yes|no|auto configure SGI RGB image tools - #HTML="no" # yes|no install HTML documentation -@@ -96,6 +96,7 @@ - # - #DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files - #DIR_JPEGLIB=../src/jpeg-6b # directory for libjpeg -+DIR_JPEGLIB="/usr/lib" - - # - # Deflate-specific parameters; used when Deflate support is enabled (see above). -@@ -111,6 +112,7 @@ - # - #DIRS_LIBINC="$DIRS_LIBINC ../zlib" # directory for zlib include files - #DIR_GZLIB="../zlib" # directory for libz -+DIR_GZLIB="/usr/lib" - - # - # Miscellaneous parameters. ---- tiff-v3.5.4/libtiff/Makefile.in Sat Jan 29 00:46:31 2000 -+++ tiff-v3.5.4/libtiff/Makefile.in Sat Jan 29 00:46:11 2000 -@@ -152,7 +152,7 @@ - ${RANLIB} libtiff.a - - $(SHLIB): $(SHOBJS) -- gcc -o $(SHLIB) -Wl,-soname,$(SONAME) -shared $(SHOBJS) -+ gcc -o $(SHLIB) -Wl,-soname,$(SONAME) -shared $(SHOBJS) -ljpeg -lz - - # - # NB: The configure script verifies that the configured Deleted: tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-exit.patch =================================================================== --- tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-exit.patch 2004-12-22 19:21:29 UTC (rev 5266) +++ tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-exit.patch 2004-12-23 08:57:56 UTC (rev 5267) @@ -1,10 +0,0 @@ ---- tiff-v3.5.7/tools/tiffcp.c~ Thu Jun 7 10:38:40 2001 -+++ tiff-v3.5.7/tools/tiffcp.c Fri Jun 21 10:29:31 2002 -@@ -281,6 +281,7 @@ - } - TIFFClose(in); - } -+ return 0; - } - - Deleted: tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-makeflags.patch =================================================================== --- tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-makeflags.patch 2004-12-22 19:21:29 UTC (rev 5266) +++ tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-makeflags.patch 2004-12-23 08:57:56 UTC (rev 5267) @@ -1,76 +0,0 @@ ---- tiff-v3.5.7/Makefile.in.makeflags 2001-11-28 18:00:35.000000000 +0100 -+++ tiff-v3.5.7/Makefile.in 2003-02-11 17:57:57.000000000 +0100 -@@ -46,36 +46,36 @@ - - all default: - @if [ "@PORT@" = yes ]; then \ -- ${ECHO} "= "port; cd port; ${MAKE} -${MAKEFLAGS}; \ -+ ${ECHO} "= "port; cd port; ${MAKE} ${MAKEFLAGS}; \ - else \ - true; \ - fi -- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} -- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} -- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} -+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} -+ @${ECHO} "= "tools; cd tools; ${MAKE} ${MAKEFLAGS} -+ @${ECHO} "= "man; cd man; ${MAKE} ${MAKEFLAGS} - - install: -- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} install -- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} install -- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} install -+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} install -+ @${ECHO} "= "tools; cd tools; ${MAKE} ${MAKEFLAGS} install -+ @${ECHO} "= "man; cd man; ${MAKE} ${MAKEFLAGS} install - @if [ "@HTML@" = yes ]; then \ -- ${ECHO} "= "html; cd html; ${MAKE} -${MAKEFLAGS} install; \ -+ ${ECHO} "= "html; cd html; ${MAKE} ${MAKEFLAGS} install; \ - else \ - true; \ - fi - - install-private: install -- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} installPrivateHdrs -+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} installPrivateHdrs - - clean: - @if [ "@PORT@" = yes ]; then \ -- ${ECHO} "= "port; cd port; ${MAKE} -${MAKEFLAGS} clean; \ -+ ${ECHO} "= "port; cd port; ${MAKE} ${MAKEFLAGS} clean; \ - else \ - true; \ - fi -- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} clean -- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} clean -- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} clean -+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} clean -+ @${ECHO} "= "tools; cd tools; ${MAKE} ${MAKEFLAGS} clean -+ @${ECHO} "= "man; cd man; ${MAKE} ${MAKEFLAGS} clean - # -cd contrib/dbs; ${MAKE} -${MAKEFLAGS} clean - # -cd contrib/dbs/xtiff; ${MAKE} -${MAKEFLAGS} clean - -@@ -100,7 +100,7 @@ - product:: - test -d dist || mkdir dist - rm -f dist/rawidb -- SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} -${MAKEFLAGS} install installLink -+ SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} ${MAKEFLAGS} install installLink - rm -f dist/idb - sort -u +4 dist/rawidb > dist/idb - ${GENDIST} -v -dist dist -idb dist/idb \ -@@ -498,11 +498,11 @@ - - release: - (cd ${SRCDIR}/dist; sh newversion) -- ${MAKE} -${MAKEFLAGS} release.stamp -- (cd ${SRCDIR}/libtiff; ${MAKE} -${MAKEFLAGS} tiffvers.h) -+ ${MAKE} ${MAKEFLAGS} release.stamp -+ (cd ${SRCDIR}/libtiff; ${MAKE} ${MAKEFLAGS} tiffvers.h) - # ${SRCDIR}/configure ${CONFIG} - # ${MAKE} -${MAKEFLAGS} product -- ${MAKE} -${MAKEFLAGS} release.tar.zip -+ ${MAKE} ${MAKEFLAGS} release.tar.zip - - - # stamp relevant files according to current alpha Deleted: tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-seek.patch =================================================================== --- tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-seek.patch 2004-12-22 19:21:29 UTC (rev 5266) +++ tinysofa/releases/1.1/libtiff/current/sources/libtiff-v3.5.7-seek.patch 2004-12-23 08:57:56 UTC (rev 5267) @@ -1,11 +0,0 @@ ---- tiff-v3.5.7/libtiff/tiffiop.h.seek Fri Jan 28 21:56:59 2000 -+++ tiff-v3.5.7/libtiff/tiffiop.h Wed May 15 11:43:12 2002 -@@ -165,7 +165,7 @@ - #define TIFFWriteFile(tif, buf, size) \ - ((*(tif)->tif_writeproc)((tif)->tif_clientdata,buf,size)) - #define TIFFSeekFile(tif, off, whence) \ -- ((*(tif)->tif_seekproc)((tif)->tif_clientdata,(toff_t)(off),whence)) -+ ((tif)->tif_seekproc?((*(tif)->tif_seekproc)((tif)->tif_clientdata,(toff_t)(off),whence)):0) - #define TIFFCloseFile(tif) \ - ((*(tif)->tif_closeproc)((tif)->tif_clientdata)) - #define TIFFGetFileSize(tif) \ Modified: tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec =================================================================== --- tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2004-12-22 19:21:29 UTC (rev 5266) +++ tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2004-12-23 08:57:56 UTC (rev 5267) @@ -1,7 +1,7 @@ Summary: A library of functions for manipulating TIFF format image files. Name: libtiff Version: 3.6.1 -Release: 1jh +Release: 2jh License: distributable Group: extra Source0: http://www.libtiff.org/tiff-v%{version}.tar.gz @@ -16,6 +16,7 @@ Patch10: libtiff-3.6.1-chris-bound.patch Patch11: libtiff-3.6.1-alt-bound.patch Patch12: libtiff-3.6.1-alt-bound-fix2.patch +Patch13: libtiff-3.5.5-nmemb.patch URL: http://www.libtiff.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -61,6 +62,7 @@ %patch10 -p1 %patch11 -p1 %patch12 -p0 +%patch13 -p1 %build @@ -119,8 +121,11 @@ %changelog +* Thu Dec 23 2004 Jaakko Heinonen 3.6.1-2jh +- add fix for CAN-2004-1308 + * Thu Oct 14 2004 Jaakko Heinonen 3.6.1-1jh -- get patches from Gentee, fixes CAN-2004-0803 +- get patches from Gentoo, fixes CAN-2004-0803 * Tue Oct 12 2004 Matthias Clasen 3.6.1-6 - fix http://bugzilla.remotesensing.org/show_bug.cgi?id=483 From svn at tinysofa.org Thu Dec 23 09:10:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 23 Dec 2004 04:10:18 -0500 (EST) Subject: [tinysofa-svn] r5268 - in contrib/1.1/xpdf/current: sources specs Message-ID: <20041223091018.E1548344286@minbar.tinysofa.org> Author: jh Date: 2004-12-23 04:10:04 -0500 (Thu, 23 Dec 2004) New Revision: 5268 Added: contrib/1.1/xpdf/current/sources/xpdf-3.00pl1.patch contrib/1.1/xpdf/current/sources/xpdf-3.00pl2.patch Modified: contrib/1.1/xpdf/current/sources/xpdf-3.00-overflow.patch contrib/1.1/xpdf/current/specs/xpdf.spec Log: - update to 3.00pl2 with vendor patches, fixes CAN-2004-1125 Modified: contrib/1.1/xpdf/current/sources/xpdf-3.00-overflow.patch =================================================================== --- contrib/1.1/xpdf/current/sources/xpdf-3.00-overflow.patch 2004-12-23 08:57:56 UTC (rev 5267) +++ contrib/1.1/xpdf/current/sources/xpdf-3.00-overflow.patch 2004-12-23 09:10:04 UTC (rev 5268) @@ -28,269 +28,3 @@ pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); for (j = pagesSize - 32; j < pagesSize; ++j) { ---- xpdf-3.00/xpdf/XRef.cc.orig 2004-10-11 15:51:14.000000000 +0200 -+++ xpdf-3.00/xpdf/XRef.cc 2004-10-11 15:56:48.000000000 +0200 -@@ -96,7 +96,7 @@ - } - nObjects = obj1.getInt(); - obj1.free(); -- if (nObjects == 0) { -+ if (nObjects <= 0) { - goto err1; - } - -@@ -106,7 +106,15 @@ - } - first = obj1.getInt(); - obj1.free(); -+ if (first < 0) { -+ goto err1; -+ } - -+ if (nObjects*sizeof(int)/sizeof(int) != nObjects) { -+ error(-1, "Invalid 'nObjects'"); -+ goto err1; -+ } -+ - objs = new Object[nObjects]; - objNums = (int *)gmalloc(nObjects * sizeof(int)); - offsets = (int *)gmalloc(nObjects * sizeof(int)); -@@ -130,6 +138,12 @@ - offsets[i] = obj2.getInt(); - obj1.free(); - obj2.free(); -+ if (objNums[i] < 0 || offsets[i] < 0 || -+ (i > 0 && offsets[i] < offsets[i-1])) { -+ delete parser; -+ gfree(offsets); -+ goto err1; -+ } - } - while (str->getChar() != EOF) ; - delete parser; -@@ -369,10 +383,21 @@ - } - n = obj.getInt(); - obj.free(); -+ if (first < 0 || n < 0 || first + n < 0) { -+ goto err1; -+ } - if (first + n > size) { - for (newSize = size ? 2 * size : 1024; -- first + n > newSize; -+ first + n > newSize && newSize > 0; - newSize <<= 1) ; -+ if (newSize < 0) { -+ goto err1; -+ } -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'obj' parameters'"); -+ goto err1; -+ } -+ - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -@@ -443,7 +468,7 @@ - - // check for an 'XRefStm' key - if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) { -- pos2 = obj2.getInt(); -+ pos2 = (Guint)obj2.getInt(); - readXRef(&pos2); - if (!ok) { - goto err1; -@@ -474,7 +499,14 @@ - } - newSize = obj.getInt(); - obj.free(); -+ if (newSize < 0) { -+ goto err1; -+ } - if (newSize > size) { -+ if (newSize * sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'size' parameter."); -+ return gFalse; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -@@ -494,6 +526,9 @@ - } - w[i] = obj2.getInt(); - obj2.free(); -+ if (w[i] < 0 || w[i] > 4) { -+ goto err1; -+ } - } - obj.free(); - -@@ -513,13 +548,14 @@ - } - n = obj.getInt(); - obj.free(); -- if (!readXRefStreamSection(xrefStr, w, first, n)) { -+ if (first < 0 || n < 0 || -+ !readXRefStreamSection(xrefStr, w, first, n)) { - idx.free(); - goto err0; - } - } - } else { -- if (!readXRefStreamSection(xrefStr, w, 0, size)) { -+ if (!readXRefStreamSection(xrefStr, w, 0, newSize)) { - idx.free(); - goto err0; - } -@@ -551,10 +587,20 @@ - Guint offset; - int type, gen, c, newSize, i, j; - -+ if (first + n < 0) { -+ return gFalse; -+ } - if (first + n > size) { - for (newSize = size ? 2 * size : 1024; -- first + n > newSize; -+ first + n > newSize && newSize > 0; - newSize <<= 1) ; -+ if (newSize < 0) { -+ return gFalse; -+ } -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'size' inside xref table."); -+ return gFalse; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -@@ -585,24 +631,26 @@ - } - gen = (gen << 8) + c; - } -- switch (type) { -- case 0: -- entries[i].offset = offset; -- entries[i].gen = gen; -- entries[i].type = xrefEntryFree; -- break; -- case 1: -- entries[i].offset = offset; -- entries[i].gen = gen; -- entries[i].type = xrefEntryUncompressed; -- break; -- case 2: -- entries[i].offset = offset; -- entries[i].gen = gen; -- entries[i].type = xrefEntryCompressed; -- break; -- default: -- return gFalse; -+ if (entries[i].offset == 0xffffffff) { -+ switch (type) { -+ case 0: -+ entries[i].offset = offset; -+ entries[i].gen = gen; -+ entries[i].type = xrefEntryFree; -+ break; -+ case 1: -+ entries[i].offset = offset; -+ entries[i].gen = gen; -+ entries[i].type = xrefEntryUncompressed; -+ break; -+ case 2: -+ entries[i].offset = offset; -+ entries[i].gen = gen; -+ entries[i].type = xrefEntryCompressed; -+ break; -+ default: -+ return gFalse; -+ } - } - } - -@@ -664,38 +712,48 @@ - // look for object - } else if (isdigit(*p)) { - num = atoi(p); -- do { -- ++p; -- } while (*p && isdigit(*p)); -- if (isspace(*p)) { -+ if (num > 0) { - do { - ++p; -- } while (*p && isspace(*p)); -- if (isdigit(*p)) { -- gen = atoi(p); -+ } while (*p && isdigit(*p)); -+ if (isspace(*p)) { - do { - ++p; -- } while (*p && isdigit(*p)); -- if (isspace(*p)) { -+ } while (*p && isspace(*p)); -+ if (isdigit(*p)) { -+ gen = atoi(p); - do { - ++p; -- } while (*p && isspace(*p)); -- if (!strncmp(p, "obj", 3)) { -- if (num >= size) { -- newSize = (num + 1 + 255) & ~255; -- entries = (XRefEntry *) -- grealloc(entries, newSize * sizeof(XRefEntry)); -- for (i = size; i < newSize; ++i) { -- entries[i].offset = 0xffffffff; -- entries[i].type = xrefEntryFree; -+ } while (*p && isdigit(*p)); -+ if (isspace(*p)) { -+ do { -+ ++p; -+ } while (*p && isspace(*p)); -+ if (!strncmp(p, "obj", 3)) { -+ if (num >= size) { -+ newSize = (num + 1 + 255) & ~255; -+ if (newSize < 0) { -+ error(-1, "Bad object number"); -+ return gFalse; -+ } -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'obj' parameters."); -+ return gFalse; -+ } -+ entries = (XRefEntry *) -+ grealloc(entries, newSize * sizeof(XRefEntry)); -+ for (i = size; i < newSize; ++i) { -+ entries[i].offset = 0xffffffff; -+ entries[i].type = xrefEntryFree; -+ } -+ size = newSize; -+ } -+ if (entries[num].type == xrefEntryFree || -+ gen >= entries[num].gen) { -+ entries[num].offset = pos - start; -+ entries[num].gen = gen; -+ entries[num].type = xrefEntryUncompressed; - } -- size = newSize; -- } -- if (entries[num].type == xrefEntryFree || -- gen >= entries[num].gen) { -- entries[num].offset = pos - start; -- entries[num].gen = gen; -- entries[num].type = xrefEntryUncompressed; - } - } - } -@@ -705,6 +763,10 @@ - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -+ if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { -+ error(-1, "Invalid 'endstream' parameter."); -+ return gFalse; -+ } - streamEnds = (Guint *)grealloc(streamEnds, - streamEndsSize * sizeof(int)); - } Added: contrib/1.1/xpdf/current/sources/xpdf-3.00pl1.patch =================================================================== --- contrib/1.1/xpdf/current/sources/xpdf-3.00pl1.patch 2004-12-23 08:57:56 UTC (rev 5267) +++ contrib/1.1/xpdf/current/sources/xpdf-3.00pl1.patch 2004-12-23 09:10:04 UTC (rev 5268) @@ -0,0 +1,315 @@ +*** XRef.cc.orig Thu Jul 22 11:04:22 2004 +--- XRef.cc Thu Jul 22 11:04:31 2004 +*************** +*** 96,102 **** + } + nObjects = obj1.getInt(); + obj1.free(); +! if (nObjects == 0) { + goto err1; + } + +--- 96,102 ---- + } + nObjects = obj1.getInt(); + obj1.free(); +! if (nObjects <= 0) { + goto err1; + } + +*************** +*** 106,111 **** +--- 106,114 ---- + } + first = obj1.getInt(); + obj1.free(); ++ if (first < 0) { ++ goto err1; ++ } + + objs = new Object[nObjects]; + objNums = (int *)gmalloc(nObjects * sizeof(int)); +*************** +*** 130,135 **** +--- 133,144 ---- + offsets[i] = obj2.getInt(); + obj1.free(); + obj2.free(); ++ if (objNums[i] < 0 || offsets[i] < 0 || ++ (i > 0 && offsets[i] < offsets[i-1])) { ++ delete parser; ++ gfree(offsets); ++ goto err1; ++ } + } + while (str->getChar() != EOF) ; + delete parser; +*************** +*** 369,378 **** + } + n = obj.getInt(); + obj.free(); + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +! first + n > newSize; + newSize <<= 1) ; + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +--- 378,393 ---- + } + n = obj.getInt(); + obj.free(); ++ if (first < 0 || n < 0 || first + n < 0) { ++ goto err1; ++ } + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +! first + n > newSize && newSize > 0; + newSize <<= 1) ; ++ if (newSize < 0) { ++ goto err1; ++ } + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +*************** +*** 443,449 **** + + // check for an 'XRefStm' key + if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) { +! pos2 = obj2.getInt(); + readXRef(&pos2); + if (!ok) { + goto err1; +--- 458,464 ---- + + // check for an 'XRefStm' key + if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) { +! pos2 = (Guint)obj2.getInt(); + readXRef(&pos2); + if (!ok) { + goto err1; +*************** +*** 474,479 **** +--- 489,497 ---- + } + newSize = obj.getInt(); + obj.free(); ++ if (newSize < 0) { ++ goto err1; ++ } + if (newSize > size) { + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { +*************** +*** 494,499 **** +--- 512,520 ---- + } + w[i] = obj2.getInt(); + obj2.free(); ++ if (w[i] < 0 || w[i] > 4) { ++ goto err1; ++ } + } + obj.free(); + +*************** +*** 513,525 **** + } + n = obj.getInt(); + obj.free(); +! if (!readXRefStreamSection(xrefStr, w, first, n)) { + idx.free(); + goto err0; + } + } + } else { +! if (!readXRefStreamSection(xrefStr, w, 0, size)) { + idx.free(); + goto err0; + } +--- 534,547 ---- + } + n = obj.getInt(); + obj.free(); +! if (first < 0 || n < 0 || +! !readXRefStreamSection(xrefStr, w, first, n)) { + idx.free(); + goto err0; + } + } + } else { +! if (!readXRefStreamSection(xrefStr, w, 0, newSize)) { + idx.free(); + goto err0; + } +*************** +*** 551,560 **** + Guint offset; + int type, gen, c, newSize, i, j; + + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +! first + n > newSize; + newSize <<= 1) ; + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +--- 573,588 ---- + Guint offset; + int type, gen, c, newSize, i, j; + ++ if (first + n < 0) { ++ return gFalse; ++ } + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +! first + n > newSize && newSize > 0; + newSize <<= 1) ; ++ if (newSize < 0) { ++ return gFalse; ++ } + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +*************** +*** 585,608 **** + } + gen = (gen << 8) + c; + } +! switch (type) { +! case 0: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryFree; +! break; +! case 1: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryUncompressed; +! break; +! case 2: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryCompressed; +! break; +! default: +! return gFalse; + } + } + +--- 613,638 ---- + } + gen = (gen << 8) + c; + } +! if (entries[i].offset == 0xffffffff) { +! switch (type) { +! case 0: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryFree; +! break; +! case 1: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryUncompressed; +! break; +! case 2: +! entries[i].offset = offset; +! entries[i].gen = gen; +! entries[i].type = xrefEntryCompressed; +! break; +! default: +! return gFalse; +! } + } + } + +*************** +*** 664,701 **** + // look for object + } else if (isdigit(*p)) { + num = atoi(p); +! do { +! ++p; +! } while (*p && isdigit(*p)); +! if (isspace(*p)) { + do { + ++p; +! } while (*p && isspace(*p)); +! if (isdigit(*p)) { +! gen = atoi(p); + do { + ++p; +! } while (*p && isdigit(*p)); +! if (isspace(*p)) { + do { + ++p; +! } while (*p && isspace(*p)); +! if (!strncmp(p, "obj", 3)) { +! if (num >= size) { +! newSize = (num + 1 + 255) & ~255; +! entries = (XRefEntry *) +! grealloc(entries, newSize * sizeof(XRefEntry)); +! for (i = size; i < newSize; ++i) { +! entries[i].offset = 0xffffffff; +! entries[i].type = xrefEntryFree; + } +- size = newSize; +- } +- if (entries[num].type == xrefEntryFree || +- gen >= entries[num].gen) { +- entries[num].offset = pos - start; +- entries[num].gen = gen; +- entries[num].type = xrefEntryUncompressed; + } + } + } +--- 694,737 ---- + // look for object + } else if (isdigit(*p)) { + num = atoi(p); +! if (num > 0) { + do { + ++p; +! } while (*p && isdigit(*p)); +! if (isspace(*p)) { + do { + ++p; +! } while (*p && isspace(*p)); +! if (isdigit(*p)) { +! gen = atoi(p); + do { + ++p; +! } while (*p && isdigit(*p)); +! if (isspace(*p)) { +! do { +! ++p; +! } while (*p && isspace(*p)); +! if (!strncmp(p, "obj", 3)) { +! if (num >= size) { +! newSize = (num + 1 + 255) & ~255; +! if (newSize < 0) { +! error(-1, "Bad object number"); +! return gFalse; +! } +! entries = (XRefEntry *) +! grealloc(entries, newSize * sizeof(XRefEntry)); +! for (i = size; i < newSize; ++i) { +! entries[i].offset = 0xffffffff; +! entries[i].type = xrefEntryFree; +! } +! size = newSize; +! } +! if (entries[num].type == xrefEntryFree || +! gen >= entries[num].gen) { +! entries[num].offset = pos - start; +! entries[num].gen = gen; +! entries[num].type = xrefEntryUncompressed; + } + } + } + } + + Added: contrib/1.1/xpdf/current/sources/xpdf-3.00pl2.patch =================================================================== --- contrib/1.1/xpdf/current/sources/xpdf-3.00pl2.patch 2004-12-23 08:57:56 UTC (rev 5267) +++ contrib/1.1/xpdf/current/sources/xpdf-3.00pl2.patch 2004-12-23 09:10:04 UTC (rev 5268) @@ -0,0 +1,54 @@ +*** Gfx.cc.orig Sun Dec 12 16:04:43 2004 +--- Gfx.cc Sun Dec 12 16:05:16 2004 +*************** +*** 2654,2660 **** + haveMask = gFalse; + dict->lookup("Mask", &maskObj); + if (maskObj.isArray()) { +! for (i = 0; i < maskObj.arrayGetLength(); ++i) { + maskObj.arrayGet(i, &obj1); + maskColors[i] = obj1.getInt(); + obj1.free(); +--- 2654,2662 ---- + haveMask = gFalse; + dict->lookup("Mask", &maskObj); + if (maskObj.isArray()) { +! for (i = 0; +! i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; +! ++i) { + maskObj.arrayGet(i, &obj1); + maskColors[i] = obj1.getInt(); + obj1.free(); +*** GfxState.cc.orig Sun Dec 12 16:04:48 2004 +--- GfxState.cc Sun Dec 12 16:06:38 2004 +*************** +*** 708,713 **** +--- 708,718 ---- + } + nCompsA = obj2.getInt(); + obj2.free(); ++ if (nCompsA > gfxColorMaxComps) { ++ error(-1, "ICCBased color space with too many (%d > %d) components", ++ nCompsA, gfxColorMaxComps); ++ nCompsA = gfxColorMaxComps; ++ } + if (dict->lookup("Alternate", &obj2)->isNull() || + !(altA = GfxColorSpace::parse(&obj2))) { + switch (nCompsA) { +*************** +*** 1054,1060 **** + } + nCompsA = obj1.arrayGetLength(); + if (nCompsA > gfxColorMaxComps) { +! error(-1, "DeviceN color space with more than %d > %d components", + nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } +--- 1059,1065 ---- + } + nCompsA = obj1.arrayGetLength(); + if (nCompsA > gfxColorMaxComps) { +! error(-1, "DeviceN color space with too many (%d > %d) components", + nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } Modified: contrib/1.1/xpdf/current/specs/xpdf.spec =================================================================== --- contrib/1.1/xpdf/current/specs/xpdf.spec 2004-12-23 08:57:56 UTC (rev 5267) +++ contrib/1.1/xpdf/current/specs/xpdf.spec 2004-12-23 09:10:04 UTC (rev 5268) @@ -34,8 +34,9 @@ Patch7: xpdf-3.00-xfont.patch Patch8: xpdf-3.00-PathScanner.patch -# security fix Patch100: xpdf-3.00-overflow.patch +Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.00pl1.patch +Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.00pl2.patch Requires: xorg-x11-deprecated-libs @@ -122,8 +123,11 @@ %patch7 -p1 -b .fonts %patch8 -p1 -b .path -# securiy fix -%patch100 -p1 -b .sec +%patch100 -p1 +cd xpdf +%patch101 +%patch102 +cd - %build @@ -239,6 +243,9 @@ %lang(ko) %{_datadir}/xpdf/korean %changelog +* Thu Dec 23 2004 Jaakko Heinonen 3.00-5jh +- update to 3.00pl2 with vendor patches, fixes CAN-2004-1125 + * Mon Dec 20 2004 Gerald Dachs 3.00-4gd - fixed requirements for xorg-x11 6.8.1 From svn at tinysofa.org Thu Dec 23 11:01:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 23 Dec 2004 06:01:27 -0500 (EST) Subject: [tinysofa-svn] r5269 - in tinysofa/releases/1.1/telnet/current: sources specs Message-ID: <20041223110127.8680D344286@minbar.tinysofa.org> Author: jh Date: 2004-12-23 06:01:08 -0500 (Thu, 23 Dec 2004) New Revision: 5269 Added: tinysofa/releases/1.1/telnet/current/sources/telnet-bsd-1.1.diff tinysofa/releases/1.1/telnet/current/sources/telnet-bsd-1.1.tar.bz2 Removed: tinysofa/releases/1.1/telnet/current/sources/netkit-telnet-0.17.tar.gz tinysofa/releases/1.1/telnet/current/sources/telnet-0.10-escapechar.patch tinysofa/releases/1.1/telnet/current/sources/telnet-client.tar.gz Modified: tinysofa/releases/1.1/telnet/current/specs/telnet.spec Log: - switch to SuSE's telnet-bsd Deleted: tinysofa/releases/1.1/telnet/current/sources/netkit-telnet-0.17.tar.gz =================================================================== (Binary files differ) Deleted: tinysofa/releases/1.1/telnet/current/sources/telnet-0.10-escapechar.patch =================================================================== --- tinysofa/releases/1.1/telnet/current/sources/telnet-0.10-escapechar.patch 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/telnet/current/sources/telnet-0.10-escapechar.patch 2004-12-23 11:01:08 UTC (rev 5269) @@ -1,23 +0,0 @@ ---- netkit-telnet-0.10/telnet/telnet.c.orig Wed Apr 7 23:22:14 1999 -+++ netkit-telnet-0.10/telnet/telnet.c Thu May 27 18:20:56 1999 -@@ -1945,7 +1945,7 @@ - command(0, "z\n", 2); - continue; - } -- if (sc == escape) { -+ if (sc == escape && escape != _POSIX_VDISABLE) { - command(0, (char *)tbp, tcc); - bol = 1; - count += tcc; -@@ -1962,7 +1962,7 @@ - } - if ((sc == '\n') || (sc == '\r')) - bol = 1; -- } else if (sc == escape) { -+ } else if (sc == escape && escape != _POSIX_VDISABLE) { - /* - * Double escape is a pass through of a single escape character. - */ - ---huq684BweRXVnRxX-- - Added: tinysofa/releases/1.1/telnet/current/sources/telnet-bsd-1.1.diff =================================================================== --- tinysofa/releases/1.1/telnet/current/sources/telnet-bsd-1.1.diff 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/telnet/current/sources/telnet-bsd-1.1.diff 2004-12-23 11:01:08 UTC (rev 5269) @@ -0,0 +1,11 @@ +--- telnet/externs.h ++++ telnet/externs.h +@@ -33,6 +33,8 @@ + # define BSD 43 + #endif + ++#include ++ + #ifndef _POSIX_VDISABLE + # ifdef sun + # include /* pick up VDISABLE definition, mayby */ Added: tinysofa/releases/1.1/telnet/current/sources/telnet-bsd-1.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/telnet/current/sources/telnet-bsd-1.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.1/telnet/current/sources/telnet-client.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/telnet/current/specs/telnet.spec =================================================================== --- tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-12-23 09:10:04 UTC (rev 5268) +++ tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-12-23 11:01:08 UTC (rev 5269) @@ -1,135 +1,55 @@ -Summary: The client for the telnet remote login protocol. +Summary: A client for the telnet remote login protocol. Name: telnet -Version: 0.17 -Release: 12ts +Version: 1.1 +Release: 1jh License: BSD Group: main -Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz -# This comes from OpenBSD CVS -Source1: telnet-client.tar.gz -Patch1: telnet-0.10-escapechar.patch -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libstdc++-devel gcc-c++ ncurses-devel libtermcap-devel +Source: telnet-bsd-%{version}.tar.bz2 +Patch0: telnet-bsd-1.1.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: ncurses-devel %description -Telnet is a popular protocol for logging into remote systems over the -Internet. The telnet package provides a command line telnet client. +Telnet is an old protocol for logging into remote systems. Nowadays +it is rarely used, since the transfer is not encrypted (ssh is mostly +used instead). The telnet client is often used for debugging other +network services. -Install the telnet package if you want to telnet to remote machines. +This package provides a command line telnet client. + %prep -%setup -q -n netkit-telnet-0.17 -mv telnet telnet-from-netkit -%setup -T -D -q -a 1 -n netkit-telnet-0.17 -%patch1 -p1 +%setup -q -n telnet-bsd-%{version} +%patch -p0 %build -CFLAGS="$RPM_OPT_FLAGS" ./configure -make +CFLAGS="$RPM_OPT_FLAGS -fpic" \ +LDFLAGS="-pie" \ +./configure +%make -C telnet + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/bin -mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/usr/man/man1 -mkdir -p $RPM_BUILD_ROOT/usr/man/man5 -mkdir -p $RPM_BUILD_ROOT/usr/man/man8 -make INSTALLROOT=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/usr/share/man -cp -a $RPM_BUILD_ROOT/usr/man/* $RPM_BUILD_ROOT/usr/share/man +%{__mkdir_p} \ + %{buildroot}%{_bindir} \ + %{buildroot}%{_mandir}/man1 -rm -rf $RPM_BUILD_ROOT/usr/man +install -m 0755 telnet/telnet %{buildroot}%{_bindir}/telnet +install -m 0644 telnet/telnet.1 %{buildroot}%{_mandir}/man1/telnet.1 + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files %defattr(-,root,root) -/usr/bin/telnet -/usr/share/man/man1/telnet.1* +%doc README ChangeLog THANKS +%{_bindir}/telnet +%{_mandir}/man1/telnet.1* -%exclude %{_sbindir}/in.telnetd -%exclude %{_mandir}/man5/issue.net.5* -%exclude %{_mandir}/man8/in.telnetd.8* %changelog -* Thu Aug 05 2004 tsintegrate 0.17-12ts -- current (0.17-12jh) integrated as 0.17-12ts for release 1.1 - -* Wed May 19 2004 tsintegrate 0.17-11ts -- current (0.17-10ts) integrated as 0.17-11ts for release 1.0-U1 - -* Wed May 12 2004 Omar Kilani 0.17-10ts -- Add BuildRequires gcc-c++-devel, ncurses-devel, libtermcap-devel. - -* Mon Dec 8 2003 Erlend Midttun 0.17-7tr -- Big rebuild - -* Wed Jun 18 2003 Erlend Midttun 0.17-6tr -- Big rebuild - -* Mon Mar 24 2003 Erlend Midttun 0.17-5em -- Rebuilt against glibc 2.3.2. - -* Thu Feb 27 2003 Erlend Midttun 0.17-4em -- Make setup quiet. - -* Wed Jul 24 2002 Daniel Meyer 0.17-3dm -- rebuild for Trustix Secure Linux 2.0 - -* Tue Feb 29 2000 Lars Gaarden -- telnet client only -- moved man page to /usr/share/man, FHS - -* Sat Sep 24 1999 Preston Brown -- red hat .desktop entry - -* Sat Aug 21 1999 Jeff Johnson -- rebuild for 6.1. - -* Wed Aug 18 1999 Bill Nottingham -- don't trust random TERM variables in telnetd (#4560) - -* Wed Jun 2 1999 Jeff Johnson -- fix (#3098). - -* Thu May 27 1999 Antti Andreimann -- fixed the problem with escape character (it could not be disabled) -- changed the spec file to use %setup macro for unpacking telnet-client - -* Thu Apr 15 1999 Jeff Johnson -- use glibc utmp routines. - -* Thu Apr 8 1999 Jeff Johnson -- fix the fix (wrong way memcpy). - -* Wed Apr 7 1999 Jeff Johnson -- fix "telnet localhost" bus error on sparc64 (alpha?). - -* Tue Apr 6 1999 Jeff Johnson -- use OpenBSD telnet client (and fix minor core dump with .telnetrc #247) - -* Thu Mar 25 1999 Erik Troan -- use openpty in telnetd - -* Sun Mar 21 1999 Cristian Gafton -- auto rebuild in the new build environment (release 22) - -* Mon Mar 15 1999 Jeff Johnson -- compile for 6.0. - -* Fri Apr 24 1998 Prospector System -- translations modified for de, fr, tr - -* Fri Apr 24 1998 Cristian Gafton -- compile C++ code using egcs - -* Tue Apr 14 1998 Erik Troan -- built against new ncurses - -* Wed Oct 29 1997 Donnie Barnes -- added wmconfig entry - -* Tue Jul 15 1997 Erik Troan -- initial build +* Thu Dec 23 2004 Jaakko Heinonen 1.1-1jh +- initial telnet-bsd spec From svn at tinysofa.org Fri Dec 24 09:44:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 24 Dec 2004 04:44:44 -0500 (EST) Subject: [tinysofa-svn] r5272 - tinysofa/releases/1.1/telnet/current/specs Message-ID: <20041224094444.1C12D344289@minbar.tinysofa.org> Author: jh Date: 2004-12-24 04:44:38 -0500 (Fri, 24 Dec 2004) New Revision: 5272 Modified: tinysofa/releases/1.1/telnet/current/specs/telnet.spec Log: - change pic to pie Modified: tinysofa/releases/1.1/telnet/current/specs/telnet.spec =================================================================== --- tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-12-24 09:04:19 UTC (rev 5271) +++ tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-12-24 09:44:38 UTC (rev 5272) @@ -24,7 +24,7 @@ %build -CFLAGS="$RPM_OPT_FLAGS -fpic" \ +CFLAGS="$RPM_OPT_FLAGS -fpie" \ LDFLAGS="-pie" \ ./configure %make -C telnet From svn at tinysofa.org Fri Dec 24 16:44:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 24 Dec 2004 11:44:06 -0500 (EST) Subject: [tinysofa-svn] r5273 - in tinysofa/releases/1.1/kernel/current: sources specs Message-ID: <20041224164406.80D03344289@minbar.tinysofa.org> Author: jh Date: 2004-12-24 11:43:50 -0500 (Fri, 24 Dec 2004) New Revision: 5273 Added: tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-iscsi.patch Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config tinysofa/releases/1.1/kernel/current/specs/kernel.spec Log: - compile fixes Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config 2004-12-24 09:44:38 UTC (rev 5272) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config 2004-12-24 16:43:50 UTC (rev 5273) @@ -556,6 +556,7 @@ CONFIG_TIGON3=m # CONFIG_FDDI is not set # CONFIG_NETCONSOLE is not set +# CONFIG_FORCEDETH is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set # CONFIG_PPP is not set @@ -711,6 +712,7 @@ # CONFIG_QUOTA is not set # CONFIG_QFMT_V1 is not set # CONFIG_QFMT_V2 is not set +# CONFIG_EPOLL is not set # CONFIG_QIFACE_COMPAT is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config 2004-12-24 09:44:38 UTC (rev 5272) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config 2004-12-24 16:43:50 UTC (rev 5273) @@ -734,6 +734,7 @@ CONFIG_TIGON3=m # CONFIG_FDDI is not set CONFIG_NETCONSOLE=m +# CONFIG_FORCEDETH is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set CONFIG_PPP=m @@ -994,6 +995,7 @@ CONFIG_QUOTA=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y +# CONFIG_EPOLL is not set # CONFIG_QIFACE_COMPAT is not set CONFIG_AUTOFS_FS=m CONFIG_AUTOFS4_FS=m Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config 2004-12-24 09:44:38 UTC (rev 5272) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config 2004-12-24 16:43:50 UTC (rev 5273) @@ -722,6 +722,7 @@ CONFIG_TIGON3=m # CONFIG_FDDI is not set CONFIG_NETCONSOLE=m +# CONFIG_FORCEDETH is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set CONFIG_PPP=m @@ -1087,6 +1088,7 @@ CONFIG_QUOTA=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y +# CONFIG_EPOLL is not set # CONFIG_QIFACE_COMPAT is not set CONFIG_AUTOFS_FS=m CONFIG_AUTOFS4_FS=m Added: tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-iscsi.patch =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-iscsi.patch 2004-12-24 09:44:38 UTC (rev 5272) +++ tinysofa/releases/1.1/kernel/current/sources/linux-2.4.21-iscsi.patch 2004-12-24 16:43:50 UTC (rev 5273) @@ -0,0 +1,11 @@ +--- linux-2.4.21/drivers/addon/iscsi_sfnet/iscsi.c.orig 2004-12-24 16:32:50.283396673 +0200 ++++ linux-2.4.21/drivers/addon/iscsi_sfnet/iscsi.c 2004-12-24 16:33:15.932525328 +0200 +@@ -72,6 +72,8 @@ + #include "scsi.h" + #include "hosts.h" + ++#define HAS_SET_USER_NICE 1 ++ + /* if non-zero, do a TCP Abort when a session drops, instead + * of (attempting) a graceful TCP Close + */ Modified: tinysofa/releases/1.1/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.1/kernel/current/specs/kernel.spec 2004-12-24 09:44:38 UTC (rev 5272) +++ tinysofa/releases/1.1/kernel/current/specs/kernel.spec 2004-12-24 16:43:50 UTC (rev 5273) @@ -602,10 +602,12 @@ # snip out some luxury code when CONFIG_SMALL is on, for -BOOT kernel Patch10040: linux-2.4.21-config-small.patch +# patches to make it compile on tinysofa Patch20000: linux-2.4.21-ali1535.patch Patch20001: linux-2.4.21-lm87.patch Patch20002: linux-2.4.21-sbni.patch Patch20003: linux-2.4.21-wvlan_cs.patch +Patch20004: linux-2.4.21-iscsi.patch # END OF PATCH DEFINITIONS @@ -1753,6 +1755,7 @@ %patch20001 -p1 %patch20002 -p1 %patch20003 -p1 +%patch20004 -p1 # END OF PATCH APPLICATIONS From svn at tinysofa.org Fri Dec 24 23:44:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 24 Dec 2004 18:44:49 -0500 (EST) Subject: [tinysofa-svn] r5274 - tinysofa/releases/1.1/m4/current/sources Message-ID: <20041224234449.8D781344289@minbar.tinysofa.org> Author: jh Date: 2004-12-24 18:44:34 -0500 (Fri, 24 Dec 2004) New Revision: 5274 Added: tinysofa/releases/1.1/m4/current/sources/m4-1.4.2.tar.gz Log: - add missing source Added: tinysofa/releases/1.1/m4/current/sources/m4-1.4.2.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/m4/current/sources/m4-1.4.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svn at tinysofa.org Sat Dec 25 10:14:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 25 Dec 2004 05:14:48 -0500 (EST) Subject: [tinysofa-svn] r5275 - tinysofa/releases/1.1/apt/current/sources Message-ID: <20041225101448.B03BF344286@minbar.tinysofa.org> Author: jh Date: 2004-12-25 05:14:41 -0500 (Sat, 25 Dec 2004) New Revision: 5275 Modified: tinysofa/releases/1.1/apt/current/sources/upgradevirt.conf Log: - correct a typo Modified: tinysofa/releases/1.1/apt/current/sources/upgradevirt.conf =================================================================== --- tinysofa/releases/1.1/apt/current/sources/upgradevirt.conf 2004-12-24 23:44:34 UTC (rev 5274) +++ tinysofa/releases/1.1/apt/current/sources/upgradevirt.conf 2004-12-25 10:14:41 UTC (rev 5275) @@ -16,4 +16,4 @@ DistUpgrade { "upgradevirt.lua"; }; } } -Kernel::Set-Defaul "false"; // for tinysofa classic server +Kernel::Set-Default "false"; // for tinysofa classic server From svn at tinysofa.org Tue Dec 28 16:04:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 28 Dec 2004 11:04:46 -0500 (EST) Subject: [tinysofa-svn] r5276 - in contrib/1.1/sylpheed/current: sources specs Message-ID: <20041228160446.3EAEB34418E@minbar.tinysofa.org> Author: gda Date: 2004-12-28 11:02:06 -0500 (Tue, 28 Dec 2004) New Revision: 5276 Added: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0.tar.bz2 Removed: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0beta4.tar.bz2 Modified: contrib/1.1/sylpheed/current/specs/sylpheed.spec Log: new upstream Added: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0beta4.tar.bz2 =================================================================== (Binary files differ) Modified: contrib/1.1/sylpheed/current/specs/sylpheed.spec =================================================================== --- contrib/1.1/sylpheed/current/specs/sylpheed.spec 2004-12-25 10:14:41 UTC (rev 5275) +++ contrib/1.1/sylpheed/current/specs/sylpheed.spec 2004-12-28 16:02:06 UTC (rev 5276) @@ -1,6 +1,6 @@ Summary: a GTK+ based, lightweight, and fast e-mail client Name: sylpheed -Version: 1.0.0beta4 +Version: 1.0.0 Release: 1gd Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 Copyright: GPL @@ -56,6 +56,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Tue Dec 28 2004 Gerald Dachs 1.0.0-1gd +- 1.0.0 + * Tue Dec 14 2004 Gerald Dachs 1.0.0beta4-1gd - 1.0.0beta4 From svn at tinysofa.org Wed Dec 29 11:53:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 29 Dec 2004 06:53:26 -0500 (EST) Subject: [tinysofa-svn] r5277 - in tinysofa/releases/1.1/cups/current: sources specs Message-ID: <20041229115326.9C7C234418E@minbar.tinysofa.org> Author: jh Date: 2004-12-29 06:52:38 -0500 (Wed, 29 Dec 2004) New Revision: 5277 Added: tinysofa/releases/1.1/cups/current/sources/cups-idefense.patch Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec Log: - iDefense security fix for CAN-2004-1125 Added: tinysofa/releases/1.1/cups/current/sources/cups-idefense.patch =================================================================== --- tinysofa/releases/1.1/cups/current/sources/cups-idefense.patch 2004-12-28 16:02:06 UTC (rev 5276) +++ tinysofa/releases/1.1/cups/current/sources/cups-idefense.patch 2004-12-29 11:52:38 UTC (rev 5277) @@ -0,0 +1,39 @@ +--- cups-1.1.22rc1/pdftops/Gfx.cxx 2004-04-09 21:18:31.000000000 +0100 ++++ ../devel/cups-1.1.23rc1/pdftops/Gfx.cxx 2004-12-16 18:46:14.000000000 +0000 +@@ -2655,7 +2655,9 @@ + haveMask = gFalse; + dict->lookup("Mask", &maskObj); + if (maskObj.isArray()) { +- for (i = 0; i < maskObj.arrayGetLength(); ++i) { ++ for (i = 0; ++ i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; ++ ++i) { + maskObj.arrayGet(i, &obj1); + maskColors[i] = obj1.getInt(); + obj1.free(); +--- cups-1.1.22rc1/pdftops/GfxState.cxx 2004-12-21 17:08:22.758022237 +0000 ++++ ../devel/cups-1.1.23rc1/pdftops/GfxState.cxx 2004-12-21 17:00:15.000000000 +0000 +@@ -709,6 +709,11 @@ + } + nCompsA = obj2.getInt(); + obj2.free(); ++ if (nCompsA > gfxColorMaxComps) { ++ error(-1, "ICCBased color space with too many (%d > %d) components", ++ nCompsA, gfxColorMaxComps); ++ nCompsA = gfxColorMaxComps; ++ } + if (dict->lookup("Alternate", &obj2)->isNull() || + !(altA = GfxColorSpace::parse(&obj2))) { + switch (nCompsA) { +@@ -1049,6 +1054,11 @@ + goto err2; + } + nCompsA = obj1.arrayGetLength(); ++ if (nCompsA > gfxColorMaxComps) { ++ error(-1, "DeviceN color space with too many (%d > %d) components", ++ nCompsA, gfxColorMaxComps); ++ nCompsA = gfxColorMaxComps; ++ } + for (i = 0; i < nCompsA; ++i) { + if (!obj1.arrayGet(i, &obj2)->isName()) { + error(-1, "Bad DeviceN color space (names)"); Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-12-28 16:02:06 UTC (rev 5276) +++ tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-12-29 11:52:38 UTC (rev 5277) @@ -1,7 +1,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.22 -Release: 1jh +Release: 2jh License: GPL Group: main Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2 @@ -19,6 +19,7 @@ Patch10: cups-pie.patch Patch11: cups-str1023.patch Patch12: cups-str1024.patch +Patch13: cups-idefense.patch Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root %service_requires @@ -74,6 +75,7 @@ %patch11 -p1 %patch12 -p1 +%patch13 -p1 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in autoconf @@ -217,6 +219,9 @@ %changelog +* Wed Dec 29 2004 Jaakko Heinonen 1.1.22-2jh +- iDefense security fix for CAN-2004-1125 + * Sun Dec 19 2004 Jaakko Heinonen 1.1.22-1jh - 1.1.22 with lppasswd and hpgltops vulnerability fix From svn at tinysofa.org Thu Dec 30 12:17:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 30 Dec 2004 07:17:21 -0500 (EST) Subject: [tinysofa-svn] r5278 - in contrib/1.1/fox/current: sources specs Message-ID: <20041230121721.65A75344200@minbar.tinysofa.org> Author: gda Date: 2004-12-30 07:13:08 -0500 (Thu, 30 Dec 2004) New Revision: 5278 Added: contrib/1.1/fox/current/sources/fox-1.2.13.tar.gz Removed: contrib/1.1/fox/current/sources/fox-1.2.11.tar.gz Modified: contrib/1.1/fox/current/specs/fox.spec Log: new upstream Deleted: contrib/1.1/fox/current/sources/fox-1.2.11.tar.gz =================================================================== (Binary files differ) Added: contrib/1.1/fox/current/sources/fox-1.2.13.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.1/fox/current/sources/fox-1.2.13.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/fox/current/specs/fox.spec =================================================================== --- contrib/1.1/fox/current/specs/fox.spec 2004-12-29 11:52:38 UTC (rev 5277) +++ contrib/1.1/fox/current/specs/fox.spec 2004-12-30 12:13:08 UTC (rev 5278) @@ -1,7 +1,7 @@ Summary: Shared libraries for the FOX 1.2.x toolkit. Name: fox -Version: 1.2.11 -Release: 2gd +Version: 1.2.13 +Release: 1gd Copyright: LGPL Group: contrib Source: ftp://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz @@ -120,6 +120,7 @@ %files devel %defattr(-,root,root) %{_bindir}/reswrap +%{_bindir}/fox-config /usr/include/fox-1.2 %{_libdir}/libFOX-1.2.la %{_libdir}/libCHART-1.2.la @@ -151,6 +152,9 @@ %{_mandir}/man1/shutterbug.1* %changelog +* Wed Dec 29 2004 Gerald Dachs 1.2.13-1gd +- new upstream + * Thu Dec 2 2004 Gerald Dachs 1.2.11-2gd - spec file fixes From svn at tinysofa.org Fri Dec 31 10:59:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 31 Dec 2004 05:59:20 -0500 (EST) Subject: [tinysofa-svn] r5279 - in tinysofa/releases/1.1/dovecot/current: sources specs Message-ID: <20041231105920.420D3344200@minbar.tinysofa.org> Author: jh Date: 2004-12-31 05:58:51 -0500 (Fri, 31 Dec 2004) New Revision: 5279 Added: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.12.1.tar.gz Removed: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.11.tar.gz Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec Log: - 0.99.12.1 Deleted: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.11.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.12.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.12.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec =================================================================== --- tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-12-30 12:13:08 UTC (rev 5278) +++ tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-12-31 10:58:51 UTC (rev 5279) @@ -1,6 +1,6 @@ Summary: Dovecot Secure imap server Name: dovecot -Version: 0.99.11 +Version: 0.99.12.1 Release: 1jh License: GPL Group: extra @@ -11,7 +11,7 @@ # Patches 500+ from upstream fixes URL: http://dovecot.procontrol.fi/ -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root +Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: openssl-devel BuildRequires: openldap-devel BuildRequires: pam-devel @@ -30,7 +30,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-0.99.12 %patch100 -p1 -b .config @@ -127,6 +127,9 @@ %changelog +* Fri Dec 31 2004 Jaakko Heinonen 0.99.12.1-1jh +- 0.99.12.1 + * Thu Aug 05 2004 tsintegrate 0.99.10.7-1ts - current (0.99.10.7-1jh) integrated as 0.99.10.7-1ts for release 1.1