Commit graph

42 commits

Author SHA1 Message Date
Edwin Groothuis
69ec329aa4 sysutils/portupgrade: Fix yet another infinite loop.
Check and avoid infinite loop when MOVED has an entry such as:

	    games/scummvm|emulators/scummvm|2004-04-06|new category
	    emulators/scummvm|games/scummvm|2004-04-13|new category

	    (games/scummvm -> emulators/scummvm -> games/scummvm -> ...)

	Reported by: Bohdan Horst <nexus at hoth dot amu dot edu dot pl>

PR:		ports/91402
Submitted by:	KOMATSU Shinichiro <koma2@lovepeers.org>
2006-01-07 01:04:28 +00:00
Norikatsu Shigemura
879e335dc3 Update to 2.0.1.
* portversion(1) also reads MOVED and trace origin change,
  and, when invoked with "-v", displays the new origin.

  Example:

      % portversion -v screen
      screen-4.0.2_2   <  needs updating (port has 4.0.2_3) (=> 'sysutils/screen')

* Add "--ignore-moved" to portupgrade(1) and portversion(1).
  When invoked with this option, both programs totally ignore MOVED.
  If you encounter strange behaviour of these programs, try this out.

* Add IGNORE_MOVED option to pkgtools.conf.
  This can be used to selectively ignore MOVED by pkgs.
  See pkgtools.conf.sample for details.

* Keep the order of MOVED entries, and do not trace back to old entries.
  Previously, when encounters the following entries,

	editors/emacs|editors/emacs19|2004-03-20|emacs 19.x moved to a non-default port location
	editors/emacs21|editors/emacs|2004-03-20|emacs 21.x moved to default port location

  portupgrade traces as "editors/emacs21" -> "editors/emacs" -> "editors/emacs19".
  I thought this behavior should not be what we want to, so added this change.

PR:		ports/91272
Submitted by:	KOMATSU Shinichiro <koma2@lovepeers.org> (maintainer)
2006-01-03 16:57:46 +00:00
Edwin Groothuis
1d2994d56b Problem with portupgrade 2.0
Thank you for reporting. I also discovered this problem a few hours ago.

    The source of this trouble is that the following line exists in MOVED,

    lang/php4|lang/php4|2003-05-22|re-separated from www/mod_php4

    where "moved from" and "moved to" is the same, but portupgrade
    does not check this case and infinite loop occurs.

    Fix to this problem will be in the next portupgrade release,
    but in the meanwhile, whould you commit the following patch,
    please?

PR:		ports/91209
Submitted by:	KOMATSU Shinichiro <koma2@lovepeers.org>
2006-01-02 11:03:25 +00:00
Edwin Groothuis
99dbdd022e sysutils/portupgrade: fix the problem that portupgrade sometimes runs slow, and bump PORTVERSION to 20051204.
(1) For years, I have experienced that portupgrade sometimes
	runs very slow.  After some investigation, I found that
	"pkgdb -aF" is invoked from portupgrade or other programs
	(such as portversion) without having sufficient privilege
	to modify /var/db/pkg/, and that error is not caught by the
	caller program, and "pkgdb -aF" is invoked repeatedlly.

	So, I fixed the following things:

	- When pkgdb internally invoked from other program exits
	  with error, make the caller program also exit with error.

	- Display the error messages of pkgdb that run internally
	  from other program.

	When portupgrade or other programs die with the following error,

	    ** You do not own /var/db/pkg. (use -f to force or run as root)
	    Command failed [exit code 1]: /usr/local/sbin/pkgdb -aFQ

	please run "pkgdb -aF" as the user that owns /var/db/pkg (usually root).

	(2) Make new tarball that contains the above fix and all
	patches in files/.  Bump PORTVERSION to 20051204 and change
	MASTER_SITES.

PR:		ports/89917
Submitted by:	KOMATSU Shinichiro <koma2@lovepeers.org>
2005-12-04 06:39:12 +00:00
Volker Stolz
095db66735 - Change the name of the ports database file (INDEX.db) to
$(basename ${INDEXFILE}).db, e.g. INDEX-6.db. (requested by kris)
- Add SHA256.

PR:		ports/89520
Submitted by:	maintainer
2005-11-25 15:28:37 +00:00
Daichi GOTO
286429f602 fix: ports/54424 problem
- fix PKG_ALTDEP does not work problem

PR:		ports/54424
Submitted by:	koma2@lovepeers.org (maintainer)
Approved by:	bharat@menalto.com
2005-10-19 07:47:48 +00:00
Florent Thoumie
8c919ec678 - Fix portsdb issue.
Reported by:	Igor Pokrovsky <ip@doom.homeunix.org>
Patched by:	KOMATSU Shinichiro <koma2@lovepeers.org> (maintainer)
Tested by:	Igor Pokrovsky <ip@doom.homeunix.org>
Approved by:	portmgr (krion)
2005-08-02 09:06:38 +00:00
Renato Botelho
12b59934e5 Pass full path to pkg_{add,info} invoked from portupgrade.
PR:		ports/84278
Submitted by:	KOMATSU Shinichiro <koma2@lovepeers.org> (maintainer)
2005-07-29 16:34:48 +00:00
Daichi GOTO
b760ebecca sysutils/portupgrade: fix minor documentation issues
fix minor documentation issues with the portsclean(1) manpage.
1.  In the SYNOPSIS, the -L option is excluded.
2.  In the description for the -Q option, an example of the -QQ option
    is not given and since the other descriptions do this,
    it looks nicer and is easier to read.

PR:		ports/82666
Submitted by:	KOMATSU Shinichiro <koma2@lovepeers.org> (maintainer)
Pointed out by:	Jason E. Hale <jhale@bluebottle.com>
2005-06-26 17:22:58 +00:00
Simon L. B. Nielsen
13dbf6a820 - Unbreak handling of updated pkgdb.db so it is not regenerated for
every run, which also makes portversion(1) works for non-root users
  again.  This is done by simply having the flag file in /var/db/
  (thanks to pav for the suggestion).
- While here anyway, fix some make warnings during install on FreeBSD 6.

PR:		ports/81088
Reported by:	many
Tested by:	Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp>
Approved by:	erwin (mentor)
2005-05-23 11:30:17 +00:00
Simon L. B. Nielsen
2a6230f941 Fix and document insecure temporary file handling in portupgrade.
Security:	CAN-2005-0610
Security:	http://vuxml.FreeBSD.org/22f00553-a09d-11d9-a788-0001020eed82.html
Approved by:	erwin (mentor), maintainer timeout
OK'ed by:	portmgr
Reviewed by:	nectar
2005-04-12 08:24:48 +00:00
Akinori MUSHA
61a77c177d Fix the startup script for 4.x.
Submitted by:	<Nicole Thurner <thurners -at- t-online.de>
2004-12-28 15:18:02 +00:00
Akinori MUSHA
cbda76514e Update to 20041225.
- Fix the startup script. (s/echo //)

- When INDEX is not found, try "make fetchindex" first, then try
  "make index".
2004-12-25 16:01:39 +00:00
Akinori MUSHA
5d77d5fc37 Fix the startup script.
I think I've been too long away from my ports work...

PR:		ports/75468
Submitted by:	Michael <mkuhn.nw 'at' web.de>
2004-12-25 15:45:26 +00:00
Akinori MUSHA
05bc902eec Update to 20041224.
portsdb(1):
- Add a -F flag, which calls make fetchindex internally to
  update the ports index file.

portupgrade(1):
- Make -fP properly reinstall an installed package using a binary
  package.

- Do not use a binary package when custom MAKE_ARGS or -m option is
  defined, unless -PP is specified.

portsclean(1):
- -L: Make sure that a library does not shadow itself.

misc.:
- RcNG'ify the startup script.

- Do not use Object#class which is obsolete in Ruby >=1.8.
2004-12-23 20:18:12 +00:00
Akinori MUSHA
463ee95f1c Add a patch to read the index file via sort(1) instead of reading
directly to avoid core dump.
2004-07-12 16:12:47 +00:00
Akinori MUSHA
be40c29b61 Fix a bug with -P when there are more than one binary package file for
a package to install or upgrade.

PR:		ports/68598
Submitted by:	Victor Prylipko <vic@liniya.ru>
Bug traced by:	Andrew Bliznak <andrew@ort.lviv.net>
2004-07-06 19:32:53 +00:00
Akinori MUSHA
46edc73a84 Apply a patch to avoid "undefined method `each' for nil:NilClass"
error when such configuration variable as MAKE_ARGS, typically
BEFORE_DEINSTALL is not defined.

Reported by:	krion, Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
2004-07-02 04:23:19 +00:00
Akinori MUSHA
8f484b7d54 Update to 20040701. New distfile.
portupgrade:
  - Make -PP/--use-packages-only work better, just as I originally
    intended.  Now packages are correctly identified using
    pkg_info(1), "LATEST_LINK" files are also properly detected.
    Related informational messages have also been improved.

    It turned out that the LATEST_LINK/NO_LATEST_LINK detection was
    broken long ago and hasn't been working for long.

pkg_fetch(1):
  - Properly rename a "latest link" file with a full package name with
    version part.

pkgtools.conf(5):
  - Improve and unify the method for pattern matching in MAKE_ARGS,
    BEFOREBUILD, BEFOREDEINSTALL and AFTERINSTALL variables.

    This should fix some cases where it looks like MAKE_ARGS entries
    are ignored.
2004-07-01 04:05:16 +00:00
Akinori MUSHA
957f9e448a Oops, the previous patch was bogus. Sorry. 2004-06-22 04:09:43 +00:00
Akinori MUSHA
67b44cc4ca Support the new, extended INDEX format. 2004-06-21 17:38:48 +00:00
Akinori MUSHA
4d9be12a2c Update to 20040529.
overall:
  - Update Copyright years.
  - Apply massive message improvement. (I hope..)

pkgtools.conf(5):
  - pkg_site_mirror(): Use pointyhat.FreeBSD.org instead of bento and
    beta.

portupgrade(1):
  - Indicate some pieces of information on what is going on in the
    process title.

portversion(1):
  - Make a generated script (with -c) accept additional arguments for
    portupgrade(1).
2004-05-29 04:12:20 +00:00
Akinori MUSHA
1b5b1d26d5 Fix a stupid bug introduced by the last update, which destroyed
pkgnames and caused portupgrade to fail.

Reported by:	Palle Girgensohn <girgen@pingpong.net>
2004-03-28 22:40:25 +00:00
Akinori MUSHA
523f98163a Update to 20040208. (Just repacked to roll up recent patches) 2004-02-08 08:38:31 +00:00
Akinori MUSHA
ca2acc4c1c Fix a long-standing silly bug in uninstall_pkg(). 2004-02-08 08:18:30 +00:00
Akinori MUSHA
4bb4e26f2b Make portsdb -U use the canonical way to make a ports index file now
that make index has got fast enough.

Suggested by:	kris
2004-02-07 08:56:58 +00:00
Akinori MUSHA
2e991b1aa5 Add a patch to make portupgrade just use stdout/stderr redirection to
keep build logs rather than calling script(1) when stdin is not a tty.

I wonder if this works against the portupgrade-from-cron problem...
2004-01-31 17:15:13 +00:00
Akinori MUSHA
477059d80e Update to 20030427. New tarball.
portsdb(1):
- COMMENTFILE is deprecated.  Weird.  I thought I committed these
  changes long long ago.

  Submitted by:	Jean-Yves Lefort <jylefort@brutele.be>.
2003-04-26 21:31:11 +00:00
Akinori MUSHA
2a999dfad0 Satisfy the latest ruby 1.8 more.
Submitted by:	Fritz Heinrichmeyer <Fritz.Heinrichmeyer@FernUni-Hagen.de>
2003-04-22 11:38:19 +00:00
Akinori MUSHA
a211d19959 Add a patch to fix "undefined local variable" error.
Reported by:	many ;(
2003-04-22 08:59:21 +00:00
Akinori MUSHA
80db4951b8 Update to 20030422. This is a maintenance release.
portsdb(1):
- Fix portsdb -U's COMMENT support.

  Submitted by:	Frerich Raabe <frerich.raabe@gmx.de>

portsclean(1):
- Fix a silly typo and unbreak portsclean -P.

  Submitted by:	Olivier Tharan <olive@oban.frmug.org>

pkgtools.conf(5):
- Set OS_PKGBRANCH to "<n>-stable" for PRERELEASE, RC, ALPHA, BETA,
  etc.

- Apply grammar fixes and rephrase a paragraph.

  PR:	ports/49042, ports/49041
  Submitted by:	Chris Pepper <pepper@rockefeller.edu>

overall:
- Appease ruby 1.8 which now complains about closed streams.
2003-04-22 06:42:27 +00:00
Akinori MUSHA
d74c4dc3c0 Fix an error handler typo so it fails gracefully. 2003-03-28 09:52:25 +00:00
Akinori MUSHA
a343834f46 Fix a typo. Sorry. 2003-03-23 08:15:48 +00:00
Akinori MUSHA
ba8034a787 Update to 20030228. Hot fixes integrated.
pkgdb(1):
- Add a missing comma and unbreak the cyclic dependency
  fixer.

  Submitted by:   ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>

portupgrade(1):
- Update man page.  Running pkgdb -F is no longer mandatory unless so
  directed by the pkgtools.
2003-03-02 12:02:11 +00:00
Akinori MUSHA
52e9260b59 Add a patch to suppress NameError during fixing a bsdpan-* origin.
Reported by:	"Daniel M. Zimmerman" <dmz@tffenterprises.com>
2003-02-18 02:39:11 +00:00
Akinori MUSHA
de2b9b562c Add a patch to fix LocalJumpError.
Reported by:	Larry Rosenman <ler@lerctr.org>
2003-02-17 20:03:11 +00:00
Akinori MUSHA
3f8b472522 Update to 20021209 and roll a new tarball for 5.0-RELEASE.
For the record, the previous tarball (pkgtools-20021101.tar.bz2) was
downloaded approximately 10,000 times in one month, 32% from the
United States, 17% from Japan, 6% from Germany, and 4% from
Canada. (followed by AU, NL, FR, GB, RU, SE, PL, ...)

pkgtools.conf(5):

- Add new variables: USE_PKGS and USE_PKGS_ONLY.

  Requested by:	Jeff Penn <jeff@jrpenn.demon.co.uk>

overall:

- Recognize INDEXFILE defaulting to 'INDEX'.

- Introduce a "fixme" cookie file not to invoke pkgdb -aF unnecessarily.

- Recognize the Hungarian and Portuguese language prefixes.

Approved by:	kris (implicitly)
2002-12-08 18:35:46 +00:00
Akinori MUSHA
5d7fea9006 Add a patch to make portupgrade(1) work on somewhat older systems
which sed(1) does not have a -E option.

Pointed out by:	nork
2002-11-20 07:15:34 +00:00
Akinori MUSHA
5ce67365d6 Update portupgrade to 1.36.
* No need to recurse @pkgdep search, really.
* Support the latest pkg_tarup.
* Backup +REQUIRED_BY a bit earlier, just in case.
* If it fails to copy the new +REQUIRED_BY to the package's dbdir,
  emit a message and save the file in TMPDIR.
2001-06-01 03:22:46 +00:00
Akinori MUSHA
002a0185d3 Apply a hotfix against a critical bug that +CONTENTS are lost when you
do upgrade as root and TMPDIR and /var/db/pkg are on different
filesystems.
2001-05-31 15:18:00 +00:00
Akinori MUSHA
a3b1fbaca7 Update to portupgrade 1.27.
Everything should now be fine while bug reports and thoughtful
suggestions are always welcome.
2001-05-29 22:21:34 +00:00
Akinori MUSHA
cbe50db5a9 Apply a hotfix to fix a couple of bugs/misfeatures. 2001-05-29 21:42:06 +00:00