OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 25-Feb-2006 19:32:44 Branch: OPENPKG_2_5_SOLID Handle: 2006022518324400 Modified files: (Branch: OPENPKG_2_5_SOLID) openpkg-src/cvs cvs.patch.rse cvs.spec Log: MFC: fixes for 'importinfo' processing Summary: Revision Changes Path 1.25.2.1 +24 -13 openpkg-src/cvs/cvs.patch.rse 1.106.2.2 +5 -3 openpkg-src/cvs/cvs.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/cvs/cvs.patch.rse ============================================================================ $ cvs diff -u -r1.25 -r1.25.2.1 cvs.patch.rse --- openpkg-src/cvs/cvs.patch.rse 7 Oct 2005 11:41:35 -0000 1.25 +++ openpkg-src/cvs/cvs.patch.rse 25 Feb 2006 18:32:44 -0000 1.25.2.1 @@ -658,7 +658,7 @@ retrieving revision 1.1.1.20 diff -u -d -r1.1.1.20 cvs.h --- src/cvs.h 2 Oct 2005 15:17:20 -0000 1.1.1.20 -+++ src/cvs.h 5 Oct 2005 10:48:43 -0000 ++++ src/cvs.h 12 Oct 2005 18:12:24 -0000 @@ -12,6 +12,36 @@ */ @@ -1201,8 +1201,8 @@ retrieving revision 1.1.1.13 diff -u -d -r1.1.1.13 import.c --- src/import.c 4 Sep 2005 00:27:44 -0000 1.1.1.13 -+++ src/import.c 5 Oct 2005 10:42:45 -0000 -@@ -70,6 +70,141 @@ ++++ src/import.c 11 Jan 2006 19:57:27 -0000 +@@ -70,6 +70,152 @@ NULL }; @@ -1218,6 +1218,7 @@ + struct dirent *dp; + int err = 0; + List *dirlist = NULL; ++ char *fullname = NULL; + + if ((dirp = CVS_OPENDIR(thisdir)) == NULL) { + error(0, errno, "cannot open directory"); @@ -1225,18 +1226,24 @@ + } + else { + errno = 0; -+ while ((dp = readdir(dirp)) != NULL) { ++ while ((dp = CVS_READDIR(dirp)) != NULL) { + if (strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0) + goto one_more_time_boys; + if (strcmp(dp->d_name, CVSADM) == 0) + goto one_more_time_boys; + if (ign_name(dp->d_name)) + goto one_more_time_boys; ++ if (fullname != NULL) { ++ free(fullname); ++ fullname = NULL; ++ } ++ fullname = xmalloc(strlen(thisdir) + 1 + strlen(dp->d_name)+1); ++ (void)sprintf(fullname, "%s/%s", thisdir, dp->d_name); + if ( +#ifdef DT_DIR -+ (dp->d_type == DT_DIR || (dp->d_type == DT_UNKNOWN && isdir (dp->d_name))) ++ (dp->d_type == DT_DIR || (dp->d_type == DT_UNKNOWN && isdir (fullname))) +#else -+ isdir (dp->d_name) ++ isdir (fullname) +#endif + && !wrap_name_has(dp->d_name, WRAP_TOCVS) + ) { @@ -1249,9 +1256,9 @@ + } + else if ( +#ifdef DT_DIR -+ dp->d_type == DT_LNK || (dp->d_type == DT_UNKNOWN && islink (dp->d_name)) ++ dp->d_type == DT_LNK || (dp->d_type == DT_UNKNOWN && islink (fullname)) +#else -+ islink (dp->d_name) ++ islink (fullname) +#endif + ) { + err++; @@ -1271,11 +1278,15 @@ + one_more_time_boys: + errno = 0; + } ++ if (fullname != NULL) { ++ free(fullname); ++ fullname = NULL; ++ } + if (errno != 0) { + error(0, errno, "cannot read directory"); + err++; + } -+ (void)closedir(dirp); ++ (void)CVS_CLOSEDIR(dirp); + } + if (dirlist != NULL) { + Node *head, *p; @@ -1344,7 +1355,7 @@ int import (int argc, char **argv) { -@@ -320,6 +455,12 @@ +@@ -320,6 +466,12 @@ error (1, 0, "attempt to import the repository"); } @@ -1357,7 +1368,7 @@ ulist = getlist (); p = getnode (); p->type = UPDATE; -@@ -329,6 +470,9 @@ +@@ -329,6 +481,9 @@ li->type = T_TITLE; li->tag = xstrdup (vbranch); li->rev_old = li->rev_new = NULL; @@ -1367,7 +1378,7 @@ p->data = li; (void) addnode (ulist, p); do_verify (&message, repository, ulist); -@@ -719,7 +863,11 @@ +@@ -719,7 +874,11 @@ */ if (add_tags (vers->srcfile, vfile, vtag, targc, targv)) retval = 1; @@ -3486,7 +3497,7 @@ retrieving revision 1.1.1.18 diff -u -d -r1.1.1.18 subr.c --- src/subr.c 2 Oct 2005 15:17:21 -0000 1.1.1.18 -+++ src/subr.c 4 Oct 2005 19:23:41 -0000 ++++ src/subr.c 27 Oct 2005 07:49:14 -0000 @@ -293,6 +293,22 @@ uid_t uid; #endif @@ . patch -p0 <<'@@ .' Index: openpkg-src/cvs/cvs.spec ============================================================================ $ cvs diff -u -r1.106.2.1 -r1.106.2.2 cvs.spec --- openpkg-src/cvs/cvs.spec 11 Oct 2005 12:49:39 -0000 1.106.2.1 +++ openpkg-src/cvs/cvs.spec 25 Feb 2006 18:32:44 -0000 1.106.2.2 @@ -37,7 +37,7 @@ Group: SCM License: GPL Version: %{V_cvs} -Release: 2.5.0 +Release: 2.5.1 # package options %option with_fsl yes @@ -45,7 +45,7 @@ %option with_rse_cvsuser cvs # list of sources -Source0: ftp://ftp.gnu.org/non-gnu/cvs/cvs-%{V_cvs}.tar.bz2 +Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/feature/cvs-%{V_cvs}.tar.bz2 Source1: ftp://riemann.iam.uni-bonn.de/pub/users/roessler/cvslock/cvslock-%{V_cvslock}.tar.gz Source2: rc.cvs Source3: fsl.cvs @@ -86,7 +86,9 @@ prog cvs = { comment = "rse: new versions require porting of the large RSE patch set by RSE itself" version = %{version} - url = ftp://ftp.gnu.org/non-gnu/cvs/ + url = ftp://ftp.gnu.org/non-gnu/cvs/source/feature/ + regex = (\d+\.\d+\.\d+) + url = ftp://ftp.gnu.org/non-gnu/cvs/source/feature/__NEWVER__/ regex = cvs-(__VER__)\.tar\.bz2 } prog cvs:cvslock = { @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org