CVS: cvs.openbsd.org: src

2014-08-27 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/27 08:44:42

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
One less option.



CVS: cvs.openbsd.org: src

2014-08-26 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/26 15:29:56

Modified files:
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh 

Log message:
Fist shot at fixing sysmerge(8) with etc-in-base; note that it's still in
transition state and the utility will get a lot of revamping in the near
future.



CVS: cvs.openbsd.org: src

2014-08-25 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/25 01:34:12

Modified files:
etc/rc.d   : rc.subr 

Log message:
Put _rc_err argument under quotes to respect the syntax we are passing.



CVS: cvs.openbsd.org: src

2014-08-25 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/25 01:35:37

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Display usage on 2 lines.

reworked from an original diff by schwarze@



CVS: cvs.openbsd.org: src

2014-08-25 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/25 12:50:22

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Cope with some weird rc.conf.local file like foobar in pkg_scripts
while foobar_flags is set to NO...
Reparse deamon_flags at the end of add_flags() since they may have been
modified by the function.



CVS: cvs.openbsd.org: src

2014-08-25 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/25 13:01:26

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
For functions that take args, return immediately if no args is passed.
Add/drop missing/unused local variables.

no functionnal change



CVS: cvs.openbsd.org: src

2014-08-25 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/25 15:06:46

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
rc.d scripts are shell scripts and need to be sourced in svc_get_flags().
It's the only way to get daemon_flags in case it contains line
continuation... We only need to do that for enable package scripts.

original idea from Sebastien Marie
discussed with, input from and ok schwarze@



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 01:33:26

Modified files:
usr.sbin/rcctl : rcctl.8 rcctl.sh 

Log message:
Make it possible to pass `-d' and `-f' to the rc.d(8) script.

man page bits from schwarze@
ok jasper@ schwarze@



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 01:46:54

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Since rcctl(8) can changes the position of such and such variable, sort
the file so that we always have a consistent output.

ok schwarze@ jasper@



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 01:55:20

Modified files:
etc/rc.d   : rc.subr 

Log message:
In debug mode (`-d'), only print the flags relevant to the rc.d(8) we are
calling instead of all flags which makes it very difficult to see the
information we actually need.

ok schwarze@ robert@



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 02:13:15

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Fix args to needs_root() when using disable (broken in the v1.9
positional args cleanup commit).

from Sebastien Marie



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 07:29:16

Modified files:
etc/rc.d   : rc.subr 

Log message:
In debug mode, make it clear when we are using the default flags when
none are set.

initial patch from me but reworked by schwarze@
ok schwarze@



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 07:30:27

Modified files:
etc/rc.d   : rc.subr 

Log message:
Drop unused variables.



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 07:32:53

Modified files:
etc/rc.d   : rc.subr 

Log message:
Drop uneeded parenthesis in usage().

ok schwarze@



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 11:01:44

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Drop obvious comments.



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 11:15:24

Modified files:
etc/rc.d   : rc.subr 

Log message:
Fix reversed logic.

ok schwarze@



CVS: cvs.openbsd.org: src

2014-08-24 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/24 11:52:38

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Add a comment to unconfuse Ingo :-)



CVS: cvs.openbsd.org: src

2014-08-21 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/21 02:54:58

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
If a service is disabled its flags are unconditionally set to NO, so
there's not need to display enabled or disabled when calling status,
we have the information already.



CVS: cvs.openbsd.org: src

2014-08-21 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/21 04:06:14

Modified files:
etc/rc.d   : rc.subr 

Log message:
Drop sanitation, _rc_parse_conf does this for us already.

ok schwarze@



CVS: cvs.openbsd.org: src

2014-08-21 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/21 06:47:22

Modified files:
usr.sbin/rcctl : rcctl.8 rcctl.sh 

Log message:
Make rcctl status output match rc.conf(8) format.

ok jasper@



CVS: cvs.openbsd.org: src

2014-08-21 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/21 10:50:11

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
Unbreak when SRCDIR=.

reported by phessler@



CVS: cvs.openbsd.org: src

2014-08-21 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/21 23:47:08

Modified files:
usr.sbin   : Makefile 

Log message:
Enable rcctl(8).

prodded by deraadt@



CVS: cvs.openbsd.org: src

2014-08-20 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/20 07:23:57

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Drop default values from rc.conf.local when we run enable.



CVS: cvs.openbsd.org: src

2014-08-20 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/20 09:04:14

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Greatly simplify get/set flags and status.

Provide a unified output for the status of disabled services/daemons:
foobar_flags will always be NO regardless of the type (pkg script,
base system daemon, special variable).



CVS: cvs.openbsd.org: src

2014-08-19 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/19 08:06:38

src/usr.sbin/rcctl

Update of /cvs/src/usr.sbin/rcctl
In directory cvs.openbsd.org:/tmp/cvs-serv19263/rcctl

Log Message:
Directory /cvs/src/usr.sbin/rcctl added to the repository



CVS: cvs.openbsd.org: src

2014-08-19 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/19 08:08:20

Added files:
usr.sbin/rcctl : Makefile rcctl.8 rcctl.sh 

Log message:
Introduce rcctl(8), a simple utility for maintaining rc.conf.local(8).

# rcctl
usage: rcctl enable|disable|status|action [service [flags [...]]]

Lots of man page improvement from the usual suspects (jmc@ and schwarze@)
not hooked up yet but committing now so work can continue in-tree
agreed by several



CVS: cvs.openbsd.org: src

2014-08-19 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/19 09:26:18

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Drop commented code.



CVS: cvs.openbsd.org: src

2014-08-19 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/19 10:47:18

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Simplify some checks
Return immediatly from add_flags() if we are already enabled and no flags
are (re)set; unbreak enable under some circumstances.



CVS: cvs.openbsd.org: src

2014-08-19 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/19 11:51:05

Modified files:
usr.sbin/rcctl : rcctl.sh 

Log message:
Sync usage.



CVS: cvs.openbsd.org: src

2014-08-17 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/17 08:41:03

Modified files:
etc/rc.d   : rc.subr 

Log message:
When running interactively, display the output of the check action
(ok or failed) like we do with all other actions.

ok jung@ rpe@



CVS: cvs.openbsd.org: src

2014-08-17 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/17 08:43:34

Modified files:
etc: rc 

Log message:
Execute /etc/netstart using sh(1) instead of sourcing it.
Committing early to make sure we have time to fix any side-effect.

ok deraadt@



Re: CVS: cvs.openbsd.org: src

2014-08-17 Thread Antoine Jacoutot
On Sun, Aug 17, 2014 at 08:21:26PM +0200, Alexander Hall wrote:
 On 08/17/14 16:43, Antoine Jacoutot wrote:
 CVSROOT: /cvs
 Module name: src
 Changes by:  ajacou...@cvs.openbsd.org   2014/08/17 08:43:34
 
 Modified files:
  etc: rc
 
 Log message:
 Execute /etc/netstart using sh(1) instead of sourcing it.
 Committing early to make sure we have time to fix any side-effect.
 
 ok deraadt@
 
 One change this brings is that the 'trap : 2' from /etc/rc is no longer
 propagated into the rc script, so pressing ^C while in will abort the entire
 netstart script instead of the currently running part of it.
 
 That said, I don't know if it was ever intentional, and I'm not sure we want
 it back.

Not sure either. But it's exactly to get that kind of feedback that it got 
committed :-)

-- 
Antoine



CVS: cvs.openbsd.org: src

2014-08-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/11 00:30:39

Modified files:
usr.sbin/sysmerge: sysmerge.8 

Log message:
Move a sentence to the corresponding option description.

from jmc@



CVS: cvs.openbsd.org: src

2014-08-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/11 03:03:27

Modified files:
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh 

Log message:
Steal stripcom() from /etc/rc to parse sysmerge.ignore.



CVS: cvs.openbsd.org: src

2014-08-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/11 07:25:23

Modified files:
etc/rc.d   : rc.subr 

Log message:
Make it possible to pass arguments to _rc_parse_conf().

ok robert@



Re: rc.subr (Re: CVS: cvs.openbsd.org: src)

2014-08-11 Thread Antoine Jacoutot
On Mon, Aug 11, 2014 at 09:30:31PM +0200, Matthias Kilian wrote:
 On Mon, Aug 11, 2014 at 07:25:23AM -0600, Antoine Jacoutot wrote:
  CVSROOT:/cvs
  Module name:src
  Changes by: ajacou...@cvs.openbsd.org   2014/08/11 07:25:23
  
  Modified files:
  etc/rc.d   : rc.subr 
  
  Log message:
  Make it possible to pass arguments to _rc_parse_conf().
  
  ok robert@
 
 This badly breaks /etc/rc and /etc/netstart, which both use
 _rc_parse_conf without parameters. Instead of wiring the default
 parameters (/etc/rc.conf and /etc/rc.conf.local) there, too, I think
 it's better to let _rc_parse_conf use them as defaults when it has
 been invoked without parameters. Also, there's no reason to use
 ' ... in $@' in a for loop.

Ok shit I totally forgot to commit those... but I did modify them and have them 
on my system actually :-(

 ok?

Yes.

 Index: rc.subr
 ===
 RCS file: /cvs/src/etc/rc.d/rc.subr,v
 retrieving revision 1.78
 diff -u -p -r1.78 rc.subr
 --- rc.subr   11 Aug 2014 13:25:23 -  1.78
 +++ rc.subr   11 Aug 2014 19:22:36 -
 @@ -121,7 +121,8 @@ _rc_parse_conf() {
   pf_rules ipsec_rules shlib_dirs pkg_scripts \
   nfs_server
  
 - for _rcfile in $@; do
 + [ $# -gt 0 ] || set -- /etc/rc.conf /etc.rc.conf.local
 + for _rcfile; do
   [[ -f $_rcfile ]] || continue
   while IFS=' ' read -r _l; do
   [[ $_l == [!#=]*=* ]] || continue
 @@ -263,7 +264,7 @@ _RC_RUNDIR=/var/run/rc.d
  _RC_RUNFILE=${_RC_RUNDIR}/${_name}
  
  # parse /etc/rc.conf{.local} for the daemon_flags
 -_rc_do _rc_parse_conf /etc/rc.conf /etc/rc.conf.local
 +_rc_do _rc_parse_conf
  
  eval _rcflags=\${${_name}_flags}
  eval _rcuser=\${${_name}_user}

-- 
Antoine



CVS: cvs.openbsd.org: src

2014-08-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/11 14:24:57

Modified files:
etc/rc.d   : rc.subr 

Log message:
Typo.

ok kili@



CVS: cvs.openbsd.org: src

2014-08-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/09 06:34:05

Modified files:
usr.sbin/sysmerge: sysmerge.sh sysmerge.8 

Log message:
sysctl.conf is an example.
Tweak error output.
Mention that `-S' has no effect when sets aren't used.



CVS: cvs.openbsd.org: src

2014-08-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/09 06:45:03

Modified files:
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh 

Log message:
Initial support for handling configuration files from packages
(aka @sample) -- `sysmerge -p`
Worked done at g2k14.
Committing early so we have plenty of time for testing.

with help from espie@
thanks to landry@ for feedback on initial testing



CVS: cvs.openbsd.org: src

2014-08-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/09 06:46:51

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
Extend comment.



CVS: cvs.openbsd.org: src

2014-08-08 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/08 10:38:25

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
Tweak verbiage.



CVS: cvs.openbsd.org: src

2014-08-08 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/08 11:04:55

Modified files:
usr.sbin/sysmerge: sysmerge.8 

Log message:
Drop some useless verbiage.
sysctl.conf is an example now.



CVS: cvs.openbsd.org: src

2014-08-06 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/08/06 10:13:48

Modified files:
distrib/zaurus/ramdisk: install.md 

Log message:
sysctl machdep.ztsscale has been unused for 7 years, so stop handling it.
s/TAB/SPACE for the wsconsctl.conf comment like we do with sysctl.conf
in MI.

get this in fast deraadt@
ok ratchov@ who will test it in the next few hours



CVS: cvs.openbsd.org: src

2014-07-31 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/31 08:57:41

Modified files:
etc/rc.d   : rc.subr 

Log message:
In debug mode, properly sort and drop duplicates so that we don't end
up with a confusing output like:
multicast_host  NO
...
multicast_host  YES

Also properly evaluate values _after_ running _rc_quirks() because these
can modify flags.

ok robert@ halex@



CVS: cvs.openbsd.org: src

2014-07-30 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/30 07:18:59

Modified files:
etc/rc.d   : rc.subr 

Log message:
Fix evil typo (multicast_hosts - multicast_host).



CVS: cvs.openbsd.org: src

2014-07-30 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/30 10:54:09

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
Properly warn when an example changes and the corresponding file is found
under /etc.

issue reported by Nathanael Rensen
fine deraadt@



Re: CVS: cvs.openbsd.org: src

2014-07-30 Thread Antoine Jacoutot
On Wed, Jul 30, 2014 at 10:54:09AM -0600, Antoine Jacoutot wrote:
 CVSROOT:  /cvs
 Module name:  src
 Changes by:   ajacou...@cvs.openbsd.org   2014/07/30 10:54:09
 
 Modified files:
   usr.sbin/sysmerge: sysmerge.sh 
 
 Log message:
 Properly warn when an example changes and the corresponding file is found
 under /etc.
 
 issue reported by Nathanael Rensen
 fine deraadt@

and ok rpe@

-- 
Antoine



CVS: cvs.openbsd.org: src

2014-07-23 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/23 02:01:15

Modified files:
etc: Makefile 

Log message:
Trailing whitespace.



CVS: cvs.openbsd.org: www

2014-07-23 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:www
Changes by: ajacou...@cvs.openbsd.org   2014/07/23 04:33:45

Modified files:
faq: current.html 

Log message:
Fix the sysmerge part; there is no need to keep the CVS IDs around for the
examples.

ok sthen@



CVS: cvs.openbsd.org: src

2014-07-23 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/23 05:44:35

Modified files:
etc/mtree  : special 

Log message:
Add httpd.conf.



CVS: cvs.openbsd.org: src

2014-07-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/22 00:45:32

Modified files:
distrib/miniroot: install.sh install.sub 

Log message:
Drop the ... during install comments; they were missing in several
places and it makes things simpler: no need to check for file existence.

discussed with and ok deraadt@ rpe@



CVS: cvs.openbsd.org: src

2014-07-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/22 01:38:52

Modified files:
share/man/man8 : rc.8 

Log message:
Tweak after recebt rc.securelevel change.



CVS: cvs.openbsd.org: src

2014-07-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/22 02:48:07

Modified files:
share/man/man8 : rc.d.8 

Log message:
Drop quotes and mention that 3 and not 2 variables can be overridden.

ok robert@



CVS: cvs.openbsd.org: src

2014-07-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/22 04:03:56

Modified files:
distrib/miniroot: install.sh 

Log message:
tab-space; consistent with the other sysctl values.



CVS: cvs.openbsd.org: src

2014-07-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/22 12:31:16

Modified files:
usr.sbin/httpd : httpd.conf.5 

Log message:
Typo.

no ok needed miod@ guenther@



CVS: cvs.openbsd.org: src

2014-07-22 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/22 15:01:58

Modified files:
etc: changelist 

Log message:
Revert revisions 1.88-1.94 but keep recent relevant changes.
The `+' sign was added by mistake thinking it was doing something else.

ok schwarze@



CVS: cvs.openbsd.org: src

2014-07-20 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/20 02:19:59

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
Fix auto-upgradable files detection.

from Nathanael Rensen, thanks!



CVS: cvs.openbsd.org: src

2014-07-18 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/18 04:43:29

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
Cleanups:
- links are already ignored when creating the sums
- better CVSID match



CVS: cvs.openbsd.org: src

2014-07-18 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/18 05:35:32

Modified files:
etc/mtree  : 4.4BSD.dist 

Log message:
Follow the recent addition of /usr/local/lib/pkgconfig and add
/usr/local/share/pkgconfig

ok sthen@



CVS: cvs.openbsd.org: src

2014-07-17 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/17 05:28:29

Modified files:
etc/mtree  : 4.4BSD.dist 

Log message:
No more /var/db/sysmerge



CVS: cvs.openbsd.org: src

2014-07-17 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/17 09:00:06

Modified files:
etc/rc.d   : spamd 

Log message:
Unbreak after the rc_do-_rc_do and rc_wait-_rc_wait renaming.
If someone wants to take a shot a modifying this rc script so that it does
not use internal rc.subr functions, be my guest...

spotted by jsg@



CVS: cvs.openbsd.org: src

2014-07-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/16 02:27:14

Modified files:
distrib/miniroot: install.sh install.sub 

Log message:
Add a comment at the top of sysctl.conf when it is created by the
installer.

ok deraadt@ rpe@



CVS: cvs.openbsd.org: src

2014-07-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/16 10:11:51

Modified files:
etc/mtree  : BSD.x11.dist 

Log message:
Handle the sysmerge move.



CVS: cvs.openbsd.org: xenocara

2014-07-16 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:xenocara
Changes by: ajacou...@cvs.openbsd.org   2014/07/16 15:44:07

Modified files:
distrib/sets/lists/xetc: mi 

Log message:
/usr/share is needed, spotted by nigel@



CVS: cvs.openbsd.org: src

2014-07-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/15 03:27:04

Modified files:
share/man/man7 : hier.7 
etc: Makefile 
etc/mtree  : BSD.x11.dist 
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh 

Log message:
/var/db/sysmerge - /usr/share/sysmerge

ok deraadt@



CVS: cvs.openbsd.org: src

2014-07-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/15 09:30:56

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
typo



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 03:11:27

Modified files:
etc: Makefile 

Log message:
/etc/rc already takes care of creating /var/run/utmp.

ok deraadt@ giovanni@



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 03:12:43

Modified files:
share/man/man7 : hier.7 

Log message:
Add /etc/examples/

prodded by jmc@



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 03:14:11

Modified files:
share/man/man8 : rc.shutdown.8 

Log message:
powerdown is gone.



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 03:21:04

Modified files:
share/man/man7 : securelevel.7 
share/man/man8 : rc.8 

Log message:
No more securelevel variable.



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 03:42:50

Modified files:
etc/examples   : rc.local rc.shutdown 

Log message:
Consistency.



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 03:42:27

Modified files:
etc/examples   : rc.securelevel 

Log message:
Do not output anything by default, to be consistent with the other
site-specific rc.* files, the comment is enough.

ok deraadt@



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 03:44:07

Modified files:
etc: rc 

Log message:
Only set kern.securelevel=1 if it was not lowered nor bumped by
rc.securelevel,

with deraadt@



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 03:44:45

Modified files:
etc: rc 

Log message:
This isn't C.



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 04:10:44

Modified files:
etc: rc 

Log message:
quiet /etc/rc.shutdown, it may not exist.

ok deraadt@



CVS: cvs.openbsd.org: src

2014-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/14 04:15:33

Modified files:
etc/examples   : rc.local rc.securelevel rc.shutdown 

Log message:
Add shebang to make it clear these files are shell scripts (they are
explicitely executed by sh(1)).

discussed with deraadt@



CVS: cvs.openbsd.org: src

2014-07-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/13 01:12:41

Modified files:
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh 

Log message:
Also ignore examplessum.



CVS: cvs.openbsd.org: src

2014-07-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/13 06:14:37

Modified files:
etc: Makefile 

Log message:
Install some config files with mode 0600 as they were before the move to
/etc/examples.

ok deraadt@



CVS: cvs.openbsd.org: src

2014-07-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/13 07:01:48

Modified files:
etc: Makefile 

Log message:
Mismatch between the sets list and what's in DESTDIR should not be fatal
to sysmerge sum files generation.

discussed by deraadt@



CVS: cvs.openbsd.org: src

2014-07-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/13 08:01:36

Modified files:
distrib/sets/lists/base: mi 
distrib/sets/lists/etc: mi 

Log message:
All /etc/examples files belong to base; for now.

ok deraadt@



CVS: cvs.openbsd.org: src

2014-07-13 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/13 08:14:41

Modified files:
share/man/man5 : port-modules.5 

Log message:
Document the security/heimdal MODULE.



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 02:01:47

Modified files:
etc: services 

Log message:
Move things around (no change):
- some unofficial services became official
- move kerberos next to afs



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 08:38:38

Modified files:
etc: protocols 

Log message:
Sync with IANA.

fine claudio@ deraadt@



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 08:51:07

Modified files:
etc: services 

Log message:
Shuffle more stuffs around, remove most commented blocks, just sort by
number and make the file easier on the eyes.

discussed with deraadt@



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 09:31:54

Modified files:
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh 

Log message:
Initial support for /etc/examples.



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 09:38:42

Modified files:
etc: Makefile 

Log message:
Create the examples checksum for sysmerge at release time.

move ahead deraadt@



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 09:58:14

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
Use sha256(1) for compared files, just like we do for examples.



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 10:00:27

Modified files:
etc: Makefile 

Log message:
cksum - sha256
That means sysmerge(8) may be a little more interactive the next time you
run it.



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 10:26:35

Modified files:
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh 

Log message:
Extend output a bit.



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 16:03:44

Modified files:
etc: Makefile 

Log message:
Simplify checksum generation for sysmerge.

no objection from deraadt@



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 16:05:16

Modified files:
etc: Makefile 

Log message:
egsum - examplessum to make it more obvious.

req. by deraadt@



CVS: cvs.openbsd.org: src

2014-07-12 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/12 16:06:11

Modified files:
usr.sbin/sysmerge: sysmerge.sh 

Log message:
egsum - examplessum



CVS: cvs.openbsd.org: src

2014-07-11 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/11 10:54:29

Modified files:
etc: services 

Log message:
Add some more unofficial services to please ports without the need to
hand-edit services(5) which moved to base; some more to come probably.

ok deraadt@



CVS: cvs.openbsd.org: src

2014-07-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/10 05:00:03

Modified files:
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh 

Log message:
/var/games/tetris.scores will move away from the etc set.



CVS: cvs.openbsd.org: src

2014-07-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/10 05:08:18

Modified files:
distrib/sets/lists/base: mi 
distrib/sets/lists/etc: mi 
distrib/sets/lists/game: mi 

Log message:
Move games files and subdirs to the game set.

ok deraadt@



CVS: cvs.openbsd.org: src

2014-07-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/09 04:59:35

Modified files:
etc/rc.d   : rc.subr 

Log message:
White spaces.



CVS: cvs.openbsd.org: src

2014-07-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/09 08:02:35

Modified files:
share/man/man5 : port-modules.5 

Log message:
Document recent x11/gnome MODULE changes.



CVS: cvs.openbsd.org: src

2014-07-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/09 08:19:23

Modified files:
etc/rc.d   : rc.subr 
share/man/man8 : rc.d.8 rc.subr.8 

Log message:
Add a daemon_timeout variable for rc_wait().
It represents the maximum time in seconds to wait for the start, stop
and reload actions to return. Defaults to 30.
No default behavior is changed.

ok beck@ sthen@ jasper@ giovanni@



CVS: cvs.openbsd.org: src

2014-07-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:src
Changes by: ajacou...@cvs.openbsd.org   2014/07/09 11:53:11

Modified files:
share/man/man5 : port-modules.5 

Log message:
Sync x11/gnome with reality.



Re: CVS: cvs.openbsd.org: mail

2014-06-23 Thread Antoine Jacoutot
On Mon, Jun 23, 2014 at 09:21:08PM +0200, Henning Brauer wrote:
 if anyone needed proof that I'm not smart enough for ports...

You mean s/ports/cvs/ ;-)

-- 
Antoine



<    2   3   4   5   6   7   8   9   10   11   >