DELTA SVN‚‚€‚‚--- ./libpkg/backup.c.orig 2012-12-21 05:57:15.000000000 -0600 +++ ./libpkg/backup.c 2013-01-13 12:16:18.119457225 -0600 @@ -88,6 +88,7 @@ b = sqlite3_backup_init(dst, "main", src, "main"); elapsed = -1; + done = total = 0; start = time(NULL); do { ENDREP DELTA SVN‚/‚1€‚/‚/--- ./libpkg/pkg_elf.c.orig 2012-12-21 05:57:15.000000000 -0600 +++ ./libpkg/pkg_elf.c 2013-01-13 12:16:18.123459813 -0600 @@ -195,8 +195,8 @@ struct stat sb; int ret = EPKG_OK; - size_t numdyn; - size_t sh_link; + size_t numdyn = 0; + size_t sh_link = 0; size_t dynidx; const char *osname; ENDREP DELTA SVN‚l‚n€‚l‚l--- ./libpkg/pkg_repo.c.orig 2012-12-21 05:57:15.000000000 -0600 +++ ./libpkg/pkg_repo.c 2013-01-13 12:16:18.126457634 -0600 @@ -520,7 +520,7 @@ maybe_delete_conflicting(const char *origin, const char *version, const char *pkg_path) { - int ret; + int ret = EPKG_FATAL; const char *oversion; if (run_prepared_statement(VERSION, origin) != SQLITE_ROW) ENDREP DELTA SVNƒ5ƒ7€ƒ5ƒ5--- ./pkg/create.c.orig 2012-12-21 05:57:15.000000000 -0600 +++ ./pkg/create.c 2013-01-13 12:16:18.129456852 -0600 @@ -73,7 +73,7 @@ PKG_LOAD_CATEGORIES | PKG_LOAD_DIRS | PKG_LOAD_SCRIPTS | PKG_LOAD_OPTIONS | PKG_LOAD_MTREE | PKG_LOAD_LICENSES | PKG_LOAD_USERS | PKG_LOAD_GROUPS | PKG_LOAD_SHLIBS; - const char *format; + const char *format = NULL; bool foundone; if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) { ENDREP DELTA SVN‚J‚L€‚J‚J--- ./pkg/update.c.orig 2012-12-21 05:57:15.000000000 -0600 +++ ./pkg/update.c 2013-01-13 12:16:18.132456977 -0600 @@ -49,7 +49,7 @@ const char *repo_name; bool multi_repos = false; struct pkg_config_kv *repokv = NULL; - int retcode; + int retcode = EPKG_FATAL; if (!quiet) printf("Updating repository catalogue\n"); ENDREP PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: 4-310327.0.r310327/1956 type: file count: 0 text: 310327 0 278 261 2928d7d6ba140172a99cc1d10e0c06de 6b4eaacd6f937bc5237d3182e81702ec5c15d3b1 310326-6ngf/_6 props: 310327 1845 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-libpkg__backup.c copyroot: 0 / PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: 7-310327.0.r310327/2356 type: file count: 0 text: 310327 291 320 303 856409039d81c5f6bc9f249f43b64f33 291e412d209dc641ffa97e8bbd830c4c06f0e3aa 310326-6ngf/_8 props: 310327 2245 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-libpkg__pkg_elf.c copyroot: 0 / PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: 9-310327.0.r310327/2759 type: file count: 0 text: 310327 624 381 364 676fffde2e03cb66f821034b1ad622c7 9930a90564a582e728101871af73935fe1985ef8 310326-6ngf/_a props: 310327 2648 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-libpkg__pkg_repo.c copyroot: 0 / PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: b-310327.0.r310327/3163 type: file count: 0 text: 310327 1018 454 437 efd6686265a3e653931fb1dc9b2cc12f 243cea53d42814c84b73f962223628fe700d88d8 310326-6ngf/_c props: 310327 3052 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-pkg__create.c copyroot: 0 / PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: d-310327.0.r310327/3563 type: file count: 0 text: 310327 1485 347 330 4c3403e3e29879ac3f249a712d5ce12b fb73b1f109e2f8f9004f89d918fca365f39dc9fb 310326-6ngf/_e props: 310327 3452 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-pkg__update.c copyroot: 0 / PLAIN K 22 patch-libpkg__Makefile V 27 file 4-310293.0.r310293/760 K 22 patch-libpkg__backup.c V 28 file 4-310327.0.r310327/1956 K 23 patch-libpkg__pkg_elf.c V 28 file 7-310327.0.r310327/2356 K 24 patch-libpkg__pkg_repo.c V 28 file 9-310327.0.r310327/2759 K 16 patch-newvers.sh V 28 file 6-309365.0.r309365/1635 K 19 patch-pkg__Makefile V 28 file 7-310293.0.r310293/1158 K 19 patch-pkg__create.c V 28 file b-310327.0.r310327/3163 K 19 patch-pkg__update.c V 28 file d-310327.0.r310327/3563 END ENDREP id: 5-309365.0.r310327/4352 type: dir pred: 5-309365.0.r310293/1639 count: 2 text: 310327 3852 487 487 89f984a5a961fe437f7c236d34f7e7d0 cpath: /head/ports-mgmt/pkg/files copyroot: 0 / PLAIN K 8 Makefile V 27 file 9-290111.0.r310120/265 K 8 distinfo V 27 file c-290111.0.r309353/991 K 5 files V 27 dir 5-309365.0.r310327/4352 K 9 pkg-descr V 32 file e-290111.0.r300897/22672682 K 11 pkg-message V 26 file 6-290863.0.r302930/51 K 9 pkg-plist V 28 file 6-293981.0.r307080/1477 END ENDREP id: 8-290111.0.r310327/4838 type: dir pred: 8-290111.0.r310293/2125 count: 56 text: 310327 4537 288 288 39113dfd4ebd1d54802f25b4f7337ed7 cpath: /head/ports-mgmt/pkg copyroot: 0 / PLAIN K 8 Makefile V 29 file 3-183782.0.r309992/18994 K 4 bpkg V 31 dir 2-194791.0.r300897/22721360 K 3 bpm V 31 dir 2-117177.0.r300897/22715174 K 5 bxpkg V 26 dir 4-268962.0.r301277/544 K 10 distilator V 29 dir 4-263291.0.r308985/721566 K 13 fastest_sites V 29 dir 4-209737.0.r308777/480325 K 7 fbsdmon V 29 dir 4-290366.0.r306964/613347 K 8 genplist V 31 dir 2-190440.0.r300897/22680663 K 16 gnome-packagekit V 32 dir gw-254099.0.r300897/22701293 K 8 hs-porte V 30 dir 4-222410.0.r309275/1054695 K 9 jailaudit V 31 dir 2-149353.0.r300897/22754721 K 11 kpackagekit V 31 dir 4-255504.0.r300897/22807173 K 6 kports V 26 dir 2-166850.0.r306829/776 K 10 kports-qt4 V 31 dir f-166850.0.r300897/22633875 K 7 lsknobs V 31 dir 4-206131.0.r300897/22656444 K 9 managepkg V 31 dir 2-141993.0.r300897/22778062 K 9 mkreadmes V 31 dir 4-292578.0.r300897/22759599 K 14 p5-App-Pm2Port V 29 dir 4-246423.0.r308985/722307 K 15 p5-FreeBSD-Pkgs V 31 dir 4-216841.0.r300897/22643327 K 27 p5-FreeBSD-Pkgs-FindUpdates V 31 dir 4-233011.0.r300897/22741344 K 20 p5-FreeBSD-Portindex V 27 dir 2-122069.0.r308174/1190 K 16 p5-FreeBSD-Ports V 30 dir 2-47770.0.r300897/22739401 K 26 p5-FreeBSD-Ports-INDEXhash V 31 dir 4-212731.0.r300897/22709415 K 10 packagekit V 27 dir ha-254099.0.r309630/767 K 14 packagekit-qt4 V 32 dir hs-254099.0.r300897/22706022 K 11 pbi-manager V 27 dir 4-273580.0.r304780/1629 K 8 pchecker V 27 dir 4-292125.0.r305346/1146 K 3 pib V 29 dir 3-5132.0.r300897/22762922 K 3 pkg V 27 dir 8-290111.0.r310327/4838 K 10 pkg-orphan V 31 dir 2-149953.0.r300897/22750917 K 9 pkg-plist V 27 dir 4-286386.0.r307149/1928 K 10 pkg_add_it V 31 dir 4-221281.0.r300897/22773215 K 11 pkg_cleanup V 31 dir 4-204988.0.r300897/22730322 K 13 pkg_cutleaves V 30 dir 2-89898.0.r300897/22639988 K 11 pkg_install V 26 dir 2-86245.0.r302929/1547 K 8 pkg_jail V 27 dir 4-251482.0.r309818/1905 K 10 pkg_remove V 27 dir 2-24740.0.r304813/60936 K 11 pkg_replace V 31 dir 2-175972.0.r300897/22711316 K 12 pkg_rmleaves V 29 dir 2-125307.0.r305369/576975 K 10 pkg_search V 31 dir 2-203382.0.r300897/22650660 K 13 pkg_trackinst V 31 dir 2-134560.0.r300897/22749455 K 8 pkg_tree V 30 dir 2-48688.0.r300897/22645883 K 5 pkgfe V 31 dir 2-155130.0.r300897/22685156 K 10 pkgs_which V 31 dir 4-270739.0.r300897/22631546 K 9 pkgsearch V 31 dir 2-200152.0.r300897/22702758 K 20 port-authoring-tools V 31 dir 2-110096.0.r300897/22771332 K 22 port-maintenance-tools V 31 dir 9-110096.0.r300897/22786941 K 9 portaudit V 30 dir 2-99292.0.r300897/22803849 K 12 portaudit-db V 31 dir 4-111367.0.r300897/22691143 K 11 portbuilder V 27 dir 2-273368.0.r306482/1690 K 9 portcheck V 31 dir 2-181444.0.r300897/22624797 K 12 portcheckout V 30 dir f-14283.0.r300897/22765879 K 8 portconf V 31 dir 2-164795.0.r300897/22636882 K 13 portdowngrade V 30 dir 2-94875.0.r300897/22719229 K 8 porteasy V 28 dir k-32876.0.r303710/395581 K 7 portell V 30 dir g-72810.0.r300897/22672088 K 8 portless V 31 dir g-165086.0.r300897/22654284 K 8 portlint V 25 dir d-6943.0.r309644/1513 K 10 portmaster V 27 dir 2-156552.0.r308394/2206 K 7 portrac V 31 dir 4-241334.0.r300897/22796127 K 9 portscout V 31 dir 2-182924.0.r300897/22647756 K 10 portsearch V 31 dir 2-155006.0.r300897/22652119 K 10 portshaker V 27 dir 4-256205.0.r310322/1072 K 17 portshaker-config V 31 dir 4-256206.0.r300897/22774697 K 8 portsopt V 27 dir 2-181373.0.r300904/1012 K 14 portsreinstall V 27 dir 4-288022.0.r309889/1126 K 9 porttools V 25 dir e-83314.0.r308718/841 K 8 porttree V 31 dir 4-285177.0.r300897/22649204 K 15 portupdate-scan V 31 dir 2-203636.0.r300897/22704955 K 11 portupgrade V 25 dir 2-39990.0.r308703/713 K 17 portupgrade-devel V 26 dir f-39990.0.r308392/1149 K 9 poudriere V 27 dir 4-290206.0.r309791/1074 K 15 poudriere-devel V 34 dir 4-290206.0-302633.r310326/1500 K 7 psearch V 31 dir 2-156281.0.r300897/22627682 K 4 pver V 26 dir 4-236161.0.r305411/888 K 5 qtpkg V 28 dir 2-37499.0.r309662/950433 K 8 symports V 29 dir 4-236535.0.r305369/577658 K 9 tinderbox V 28 dir i-152082.0.r309577/93916 K 15 tinderbox-devel V 27 dir x-152082.0.r310314/3141 K 23 vulnerability-test-port V 30 dir 2-99322.0.r300897/22724315 K 12 wanted-ports V 29 dir 4-256557.0.r308940/123935 K 3 xps V 27 dir 4-223946.0.r308957/2076 END ENDREP id: 1-5132.0.r310327/9256 type: dir pred: 1-5132.0.r310326/5980 count: 2214 text: 310327 5018 4225 4225 5795c3da708a1c5ef94a31e3076c54ee cpath: /head/ports-mgmt copyroot: 0 / PLAIN K 10 .cvsignore V 23 file 1-7295.0.r7322/129 K 7 CHANGES V 27 file 1-99373.0.r308910/9871 K 9 COPYRIGHT V 26 file 1-146787.0.r309727/49 K 4 GIDs V 27 file 1-168311.0.r309401/418 K 5 KNOBS V 31 file 1-147337.0.r300895/4669965 K 5 LEGAL V 24 file 1-748.0.r309993/837 K 5 MOVED V 26 file 1-69878.0.r310249/226 K 8 Makefile V 21 file 1-6.0.r302115/94 K 2 Mk V 22 dir 1-5.0.r310250/6110 K 6 README V 29 file 1-2408.0.r300895/4775053 K 9 Templates V 28 dir 1-2932.0.r300895/4753190 K 5 Tools V 26 dir 3-15302.0.r309059/3573 K 4 UIDs V 26 file 4-168311.0.r310202/54 K 8 UPDATING V 28 file 1-102685.0.r310253/1129 K 13 accessibility V 26 dir 1-42583.0.r309947/4219 K 6 arabic V 27 dir 1-38973.0.r309662/49132 K 9 archivers V 25 dir 1-242.0.r310184/11414 K 5 astro V 24 dir 1-301.0.r310100/7186 K 5 audio V 25 dir 1-148.0.r310315/44453 K 10 benchmarks V 24 dir 1-62.0.r310250/10385 K 7 biology V 26 dir 1-9066.0.r310020/65228 K 3 cad V 24 dir 1-276.0.r310193/6572 K 7 chinese V 26 dir 1-3770.0.r310125/11287 K 5 comms V 24 dir 1-76.0.r310191/15245 K 10 converters V 25 dir 1-1561.0.r310309/9714 K 9 databases V 25 dir 1-771.0.r310308/50146 K 9 deskutils V 26 dir 1-2098.0.r310257/17367 K 5 devel V 25 dir 1-73.0.r310321/236606 K 3 dns V 26 dir 1-6145.0.r310280/12696 K 7 editors V 23 dir 4-6.0.r310247/16513 K 9 emulators V 25 dir 1-181.0.r310255/14132 K 7 finance V 27 dir 1-4110.0.r309935/353928 K 6 french V 28 dir 1-25673.0.r310162/354227 K 3 ftp V 24 dir 1-199.0.r310282/6696 K 5 games V 25 dir 1-104.0.r310300/56744 K 6 german V 27 dir 1-7451.0.r310162/418780 K 8 graphics V 24 dir 1-94.0.r310325/55499 K 6 hebrew V 28 dir 3-31142.0.r309662/651625 K 9 hungarian V 29 dir 1p-38973.0.r310162/479572 K 3 irc V 24 dir 1-42.0.r310213/10516 K 8 japanese V 25 dir 1-410.0.r310278/19188 K 4 java V 25 dir 1-2798.0.r310289/9261 K 6 korean V 27 dir 1-5873.0.r309662/685367 K 4 lang V 24 dir 1-15.0.r310285/25255 K 4 mail V 24 dir 1-57.0.r310324/41504 K 4 math V 25 dir 1-162.0.r310307/36320 K 4 misc V 24 dir 7-35.0.r310204/33072 K 10 multimedia V 25 dir d-333.0.r310311/24852 K 3 net V 24 dir 1-22.0.r310319/66926 K 6 net-im V 29 dir 15-11144.0.r310055/187653 K 8 net-mgmt V 26 dir r-1011.0.r310286/18821 K 7 net-p2p V 26 dir g-29106.0.r310194/7380 K 4 news V 24 dir 1-145.0.r310122/6346 K 4 palm V 27 dir 1-6646.0.r308605/239862 K 6 polish V 27 dir tv-38973.0.r309960/2448 K 10 ports-mgmt V 25 dir 1-5132.0.r310327/9256 K 10 portuguese V 28 dir 1-17842.0.r309662/957701 K 5 print V 24 dir 1-79.0.r310323/16894 K 7 russian V 27 dir 1-1559.0.r309662/979896 K 7 science V 26 dir n-5356.0.r310087/10966 K 8 security V 25 dir 1-269.0.r310252/64729 K 6 shells V 22 dir w-6.0.r310054/3373 K 8 sysutils V 25 dir b-339.0.r310318/54029 K 8 textproc V 25 dir 1-322.0.r310312/82964 K 9 ukrainian V 29 dir g-39704.0.r309662/1192501 K 10 vietnamese V 28 dir 1-4812.0.r309662/1194712 K 3 www V 26 dir 1-114.0.r310313/130573 K 3 x11 V 24 dir 1-16.0.r310161/25690 K 10 x11-clocks V 26 dir 1-931.0.r309766/109437 K 11 x11-drivers V 27 dir 1-157567.0.r310251/4254 K 6 x11-fm V 24 dir 1-691.0.r310105/5410 K 9 x11-fonts V 25 dir 1-543.0.r309318/10041 K 11 x11-servers V 25 dir 1n-710.0.r308898/3850 K 10 x11-themes V 28 dir 1-14410.0.r309993/147331 K 12 x11-toolkits V 25 dir 1-120.0.r310229/16901 K 6 x11-wm V 25 dir 1-40.0.r310055/201158 END ENDREP id: 2-1.0.r310327/12758 type: dir pred: 2-1.0.r310326/9482 count: 310076 text: 310327 9432 3313 3313 2df0916f0c17f0ed1334e94ed208f8e5 props: 308235 235189 45 0 7a04b33bf8e35fd5c3d111baaf403dc5 cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r307934/26820 K 4 head V 23 dir 2-1.0.r310327/12758 K 8 svnadmin V 22 dir 3-1.0.r309913/1254 K 4 tags V 22 dir 8-1.0.r308518/4563 END ENDREP id: 0.0.r310327/13154 type: dir pred: 0.0.r310326/9877 count: 310327 text: 310327 12979 162 162 fd38cdea4a2f1bec5ad604a2bed6085d cpath: / copyroot: 0 / minfo-cnt: 2 _4.0.t310326-6ngf add-file true true /head/ports-mgmt/pkg/files/patch-libpkg__backup.c _7.0.t310326-6ngf add-file true true /head/ports-mgmt/pkg/files/patch-libpkg__pkg_elf.c _9.0.t310326-6ngf add-file true true /head/ports-mgmt/pkg/files/patch-libpkg__pkg_repo.c _b.0.t310326-6ngf add-file true true /head/ports-mgmt/pkg/files/patch-pkg__create.c _d.0.t310326-6ngf add-file true true /head/ports-mgmt/pkg/files/patch-pkg__update.c 13154 13320