summaryrefslogtreecommitdiff
path: root/mk
AgeCommit message (Collapse)AuthorFilesLines
2005-11-24Corrected the quoting of variables in clear cases.rillig1-12/+13
2005-11-24Properly quote _PKG_DBDIR.rillig1-3/+3
2005-11-241. Added section headers in the part of the user-settable variables.rillig1-3/+13
2. Reindented two "if" statements that looked like this: if long_long_command; then :; else else_commands fi By just scanning the beginnings of the lines, which is a common way of reading source code, one may easily miss the "hidden" "then" branch at the end of the line. I have changed it to: if long_long_command; then :; else else_commands fi
2005-11-23Changed the file extension of BROKENWRKLOG from ".html" to ".txt". This isrillig1-7/+3
mostly a cosmetic change. The motives for this change are that the HTML files only consisted of "<pre>", the properly quoted text/plain contents and "</pre>". There has been no documentation of reasons for encoding plain text in HTML unnecessarily, so this change will produce text/plain files instead. Another change is that instead of appending to the BROKENWRKSRC, the file is overwritten each time. In a single bulk build this will not change anything. Only when the package is built multiple times in a single bulk build, the behavior will differ. Ok'ed by agc.
2005-11-23Per request, back out all the SKIP_AUDIT_PACKAGES changes.erh4-51/+27
bsd.pkg.mk:1.1758-1.1752 bsd.prefs.mk:1.210 bulk/build:1.79 defaults/mk.conf:1.93-1.92
2005-11-22Describe db4 and sqlite.wiz1-2/+2
2005-11-22Missing a line from the previous commit that would cause PKG_DB_TMPDIRjlam1-2/+2
to also be forcibly created (if missing) as part of "make install".
2005-11-22Create PKG_DB_TMPDIR (${WRKDIR}/.pkgdb) in a separate step from creatingjlam1-3/+4
${WRKDIR}, and just always create it as part of a "make extract". This should fix problems where if an old work directory is lying around that doesn't already have .pkgdb, then a "make reinstall" won't break.
2005-11-20Use tex instead of latex in messages and comments.minskim1-10/+10
2005-11-20Put literal strings into .Ql quotes.rillig1-3/+5
2005-11-20Removed a line in the _SU_TARGET variable that had been left fromrillig1-2/+1
debugging.
2005-11-20Added "" quotes to all arguments to echo(1).rillig1-17/+17
2005-11-20Moved the "export BROKENF" command from the top of the program to therillig1-2/+2
point where it is actually used, which is when mk/bulk/pre-build.local is executed for allowing user-specific modifications before the build begins. That way it's easier to see why this command is necessary at all.
2005-11-20- If the BULKFILESDIR differs from PKGSRCDIR, create it before trying torillig1-1/+16
create log files in it. - Fail early if the ORDERFILE does not exist. (As this program is not in "set -e" mode, it had continued without error checking, which resulted in _many_ error messages.)
2005-11-20Despite having ALLOW_VULNERABLE_PACKAGES in my /etc/mk.conf, I foundagc1-2/+2
that the bulk builds would only work properly with the audit-packages package installed at all times. I am obviously hideously mistaken in this. By popular request, revert the change to add audit-packages, since I am told this is the incorrect way of doing this.
2005-11-20Added subshell parentheses around the command for updating pkg_install.rillig1-2/+2
This allows for copy&paste.
2005-11-20Macro usage fixes, use more macros, grammar improvement.wiz1-10/+12
2005-11-20Reverted the SU_CMD change from between 1.1748 and 1.1749 almostrillig1-2/+3
completely. The only difference to revision 1.1748 is that the PATH=$$PATH:${SU_CMD_PATH_APPEND} argument is included in single quotes. This will lead to problems when the PATH should contain single quotes but works in all other cases. (Single quotes in the PATH hadn't worked before either.) The tricky part regarding this code is that the PATH and .CURDIR bypass the SU_CMD. They are evaluated before and inserted as literals into the command that is executed by the SU_CMD. Preserving these variables this way circumvents interpretation and modification through the SU_CMD, but leads to ugly rules for quoting which are currently not handled completely correctly.
2005-11-19Allow the bulk builds to work by adding security/audit-packages as aagc1-2/+2
BULK_PREREQ package.
2005-11-19Indentation fix.rillig1-3/+2
2005-11-19If the directory of a dependency does not exist, fail instead of (almost)rillig1-2/+3
silently skipping the dependency.
2005-11-19Fixed the documentation in the DIAGNOSTICS section.rillig1-4/+6
2005-11-19Made the diagnostics for invalid characters in BULK_PREREQ and therillig1-6/+8
package list more useful by only showing the invalid characters, not the complete variable value.
2005-11-19- Moved the "man page" comment into a real man page.rillig2-18/+119
- Added more sanity checks.
2005-11-19The toplevel database files are referenced in the report, so they must notrillig1-3/+1
be unlinked. Not even in a comment.
2005-11-19Replaced ${ECHO_MSG} with ${ECHO} where appropriate. While there, quotedrillig1-19/+19
the filename of the toplevel BROKENFILE correctly.
2005-11-19To check if the pkg_install tools are up to date, the bulk build scriptagc1-2/+2
cd's into pkgtools/pkglint and does a "make fetch". Since the audit-packages check was introduced to bsd.pkg.mk, this "make fetch" will fail with an error message which looks like: ===> do-fetch [pkglint-4.42.1] ===> Checking for vulnerabilities in pkglint-4.42.1 ===> check-vulnerable [pkglint-4.42.1] ===> *** The audit-packages package must be at least version 1.40 ===> check-vulnerable [pkglint-4.42.1] ===> *** Please install the security/audit-packages package and run ===> check-vulnerable [pkglint-4.42.1] ===> *** '/usr/pkg/sbin/download-vulnerability-list'. *** Error code 1 since there is no audit-packages package installed at this point (we are still doing the pre-installation checks). So call "make fetch" with an additional SKIP_AUDIT_PACKAGES=yes argument at this point.
2005-11-18Collapse two .for blocks to improve readability:tv1-14/+3
_ULIMIT_CMD to use a ${...:@var@loop ...@} construct _ACCEPTABLE to use a !empty(var:Mfoo) conditional
2005-11-18Use :D and :U constructs in a few more places to collapse some .if definedtv1-36/+8
blocks to a more parallelism-readable state.
2005-11-18Simplify the _MASTER_SITE_{BACKUP,OVERRIDE} settings a bit by using a :Dtv1-12/+3
construct rather than .if defined(), and changing := to =.
2005-11-18The "Building packages" section has been split up into "Building therillig1-7/+11
packages" and "Generating the report".
2005-11-18Added a new section called "Generating the report". Moved the FTP*rillig1-9/+11
variables into that section, since they have nothing to do with uploading the binary packages.
2005-11-18Revert the change in 1.77, which does not work correctly.agc1-15/+11
However, this does not help people who are doing bulk builds in sandboxes via read-only nullfs mounts. A correct, long-term solution to this needs to be found.
2005-11-18- The text/plain report is generated using printf() instead ofrillig1-34/+33
formline(). This prevents long package names from being trimmed. - Removed the "-p e" command line option from the pax(1) command line. This makes it possible to run mk/bulk/post-build as different user from the one who did the actual build.
2005-11-18Added a few FIXMEs at places where this program might fail unexpectedly.rillig1-1/+5
2005-11-18Renamed append to append_flag. Removed superfluous quotes around thatrillig1-5/+4
variable. As it is controlled completely by this program, they are not needed.
2005-11-18Don't accept anything besides the known options on the command line. Asrillig1-7/+2
no additional parameters are used it's better to reject them.
2005-11-18- Added section headings.rillig1-29/+34
- Renamed DEBUG to debug_flag, as it is not modifiable via the environment. - Removed trailing white-space from the --help output. - Removed the clean_and_exit function, as it had been practically unused. - Replaced some "if"s with "case"s to avoid line noise.
2005-11-18Code cleanup, bugfixes and separation of PKGSRCDIR and BULKFILESDIR.rillig1-24/+88
- Added section headings to make reading the code more efficient. - Added bp_die() for uniform error messages. - Added sanity checks: - $BULK_BUILD_CONF must be a regular file. - Protect against spurious output from the bulk.conf file. - Check that configuration variables are defined, non-empty and do not contain newlines. - Properly extract MAKECONF from the bulk.conf file when getting the mk.conf variables. - Protect against spurious output from BMAKE show-vars. - Fixed the use of undefined values ($startdate). - Changed some calls to my_system() to a more secure form. - Check if the calls to chdir() actually work. - Look for the BROKENFILEs in BULKFILESDIR instead of USR_PKGSRC. - Changed postfix conditions to prefix conditions. Example: do_foo() if $bar; ==> if ($bar) { do_foo(); }
2005-11-18If the bulk build is taking place in a sandbox, then typically read-onlyagc1-11/+15
nullfs mounts are used (on NetBSD). Only attempt to install new pkg_install tools if the bulk build is not taking place in a sandbox. This is a quick and dirty hack to allow sandboxed bulk builds (the majority of cases, I suspect) to operate properly once again.
2005-11-18Corrected the comment above BULKFILESDIR. It is not only used for therillig1-2/+3
global log files but also for the package-specific ones.
2005-11-18Properly indented preprocessing directives.rillig1-3/+3
2005-11-18Allow FORCEBROKENFILE files to be created in either PKGSRCDIR orrillig1-3/+6
BULKFILESDIR.
2005-11-17A warning is printed for every non-text file. This helps in detectingrillig1-1/+3
broken file(1) databases. It also gives an indication of whether this test is necessary at all.
2005-11-17Properly quoted variables.rillig1-21/+17
2005-11-17To support variants of make that run the shell so 'set -e' is true (shellerh1-3/+3
exits on any command failing), add a '|| ${TRUE}' when running the check-vulnerable target in do-fetch.
2005-11-17Back out the previous change. The output _will_ be visible to the user.erh1-4/+4
See the "*)" case in the do-fetch target.
2005-11-17The message that audit-packages is out-of-date is printed on stderr insteadrillig1-4/+4
of stdout because the latter would not show up to the user.
2005-11-17Only show the message about fiddling with mk.conf if the output oferh1-3/+5
check-vulnerable actually contains some vulnerability ids.
2005-11-17Minimum audit-packages version is _1_.40, not 0.40erh1-3/+3