From owner-p4-projects@FreeBSD.ORG Tue Jul 6 21:16:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9ADC1065670; Tue, 6 Jul 2010 21:16:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65D021065672 for ; Tue, 6 Jul 2010 21:16:04 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 54F968FC1B for ; Tue, 6 Jul 2010 21:16:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o66LG4vM074512 for ; Tue, 6 Jul 2010 21:16:04 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o66LG4xv074510 for perforce@freebsd.org; Tue, 6 Jul 2010 21:16:04 GMT (envelope-from ivoras@FreeBSD.org) Date: Tue, 6 Jul 2010 21:16:04 GMT Message-Id: <201007062116.o66LG4xv074510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180564 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2010 21:16:05 -0000 http://p4web.freebsd.org/@@180564?ac=10 Change 180564 by ivoras@betelgeuse on 2010/07/06 21:15:04 Start working on package update checks Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#23 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#13 edit .. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#13 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#22 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#22 edit .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#23 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#21 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#21 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.c#6 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.h#5 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#21 edit .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#20 edit .. //depot/projects/soc2010/pkg_patch/src/patch/updateweb.c#1 add .. //depot/projects/soc2010/pkg_patch/src/patch/updateweb.h#1 add Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#23 (text+ko) ==== @@ -3,7 +3,7 @@ .include PROG= pkg_patch -SRCS= main.c applypatch.c mkpatch.c mkpatchdir.c support.c hashjob.c +SRCS= main.c applypatch.c mkpatch.c mkpatchdir.c updateweb.c support.c hashjob.c WARNS?= 4 WFORMAT?= 1 ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#13 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#13 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#22 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#22 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#23 (text+ko) ==== @@ -34,6 +34,7 @@ #include "mkpatch.h" #include "mkpatchdir.h" #include "applypatch.h" +#include "updateweb.h" int argc; @@ -55,6 +56,7 @@ printf("\t%s -c [-b] package_file_1 package_file_2 patch_file\n", argv[0]); printf("\t%s -a patch_file\n", argv[0]); printf("\t%s -m [-b] package_dir_1 package_dir_2 patch_dir\n", argv[0]); + printf("\t%s -u [url]\n", argv[0]); } @@ -62,7 +64,7 @@ proc_args() { int ch; - while ((ch = getopt(argc, argv, "abcfhmv")) != -1) { + while ((ch = getopt(argc, argv, "abcfhmuv")) != -1) { switch (ch) { case 'a': patch_op = PP_APPLY; @@ -86,6 +88,9 @@ case 'v': Verbose++; break; + case 'u': + patch_op = PP_UPDATEWEB; + break; default: usage_short(); exit(1); @@ -160,6 +165,12 @@ "patch_pkg_dir"); perform_mkpatchdir(argv[0], argv[1], argv[2]); break; + case PP_UPDATEWEB: + if (argc > 0) + perform_updateweb(argv[0]); + else + perform_updateweb(NULL); + break; default: errx(1, "This should not happen - unknown patch_op"); } ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#21 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#21 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.c#6 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.h#5 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#21 (text+ko) ==== @@ -49,6 +49,8 @@ #define PKGPATCHINDEX_FNAME "PKGPATCHINDEX" +#define PKGPATCH_SITE_URL "http://people.freebsd.org/~ivoras/pkgpatch" + #define PKGPATCH_BACKUP_DIR_ENV "PKG_BACKUPDIR" #define PKGPATCH_BACKUP_DIR_DEFAULT "/var/backups/pkg" #define PKGPATCH_BACKUP_DIR (getenv(PKGPATCH_BACKUP_DIR_ENV) ? \ @@ -58,7 +60,7 @@ #define PREFIX_DEFAULT "/usr/local" #define PREFIX (getenv(PREFIX_ENV) ? getenv(PREFIX_ENV) : PREFIX_DEFAULT) -enum PP_OP { PP_NONE, PP_MKPATCH, PP_APPLY, PP_MKPATCHDIR }; +enum PP_OP { PP_NONE, PP_MKPATCH, PP_APPLY, PP_MKPATCHDIR, PP_UPDATEWEB }; struct pkgxjob { char *filename; ==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#20 (text+ko) ==== @@ -570,7 +570,7 @@ /* * Converts "zulu time" time_t value to iso8601 datetime. Not thread-safe. - * Accepts -1 for time, to mean "current" time. + * Accepts -1 for time to mean "current" time. */ char * time_to_iso8601(time_t t)