API tools faq
paste
Guest User

Untitled

a guest
Aug 25th, 2018
273
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 37.62 KB | None | 0 0
raw download clone embed print report
  1. diff -ur etc47/etc/changelist etc48/etc/changelist
  2. --- etc47/etc/changelist Thu Mar 18 03:31:37 2010
  3. +++ etc48/etc/changelist Mon Aug 16 16:46:48 2010
  4. @@ -1,4 +1,4 @@
  5. -# $OpenBSD: changelist,v 1.65 2010/02/22 15:20:22 claudio Exp $
  6. +# $OpenBSD: changelist,v 1.68 2010/06/29 17:17:53 nicm Exp $
  7. #
  8. # List of files which the security script backs up and checks
  9. # for modifications.
  10. @@ -45,6 +45,7 @@
  11. /etc/hosts.equiv
  12. /etc/hosts.lpd
  13. /etc/ifstated.conf
  14. ++/etc/iked.conf
  15. /etc/inetd.conf
  16. +/etc/ipsec.conf
  17. +/etc/isakmpd/private/local.key
  18. @@ -96,11 +97,11 @@
  19. /etc/passwd
  20. /etc/pf.conf
  21. /etc/pf.os
  22. -/etc/phones
  23. /etc/portal.conf
  24. /etc/printcap
  25. /etc/profile
  26. /etc/protocols
  27. ++/etc/pwd.db
  28. /etc/rbootd.conf
  29. /etc/rc
  30. /etc/rc.conf
  31. @@ -124,6 +125,7 @@
  32. /etc/slip.hosts
  33. /etc/slip.login
  34. /etc/snmpd.conf
  35. ++/etc/spwd.db
  36. /etc/ssh/ssh_config
  37. +/etc/ssh/ssh_host_dsa_key
  38. /etc/ssh/ssh_host_dsa_key.pub
  39. diff -ur etc47/etc/daily etc48/etc/daily
  40. --- etc47/etc/daily Thu Mar 18 03:31:37 2010
  41. +++ etc48/etc/daily Mon Aug 16 16:46:48 2010
  42. @@ -1,5 +1,5 @@
  43. #
  44. -# $OpenBSD: daily,v 1.66 2009/05/26 22:59:15 schwarze Exp $
  45. +# $OpenBSD: daily,v 1.67 2010/07/25 08:49:03 espie Exp $
  46. # From: @(#)daily 8.2 (Berkeley) 1/25/94
  47. #
  48. # For local additions, create the file /etc/daily.local.
  49. @@ -48,19 +48,23 @@
  50. if [ -d /tmp -a ! -L /tmp ]; then
  51. cd /tmp && {
  52. find -x . \
  53. - \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \) \
  54. + \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \
  55. + -o -path ./portslocks \) \
  56. -prune -o -type f -atime +3 -execdir rm -f -- {} \;
  57. find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
  58. - ! -path ./.ICE-unix ! -name . -execdir rmdir -- {} \; >/dev/null 2>&1; }
  59. + ! -path ./.ICE-unix ! -path ./portslocks ! -name . \
  60. + -execdir rmdir -- {} \; >/dev/null 2>&1; }
  61. fi
  62.  
  63. if [ -d /var/tmp -a ! -L /var/tmp ]; then
  64. cd /var/tmp && {
  65. find -x . \
  66. - \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \) \
  67. + \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \
  68. + -o -path ./portslocks \) \
  69. -prune -o ! -type d -atime +7 -execdir rm -f -- {} \;
  70. find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
  71. - ! -path ./.ICE-unix ! -name . -execdir rmdir -- {} \; >/dev/null 2>&1; }
  72. + ! -path ./.ICE-unix ! -path ./portslocks ! -name . \
  73. + -execdir rmdir -- {} \; >/dev/null 2>&1; }
  74. fi
  75.  
  76. # Additional junk directory cleanup would go like this:
  77. diff -ur etc47/etc/disktab etc48/etc/disktab
  78. --- etc47/etc/disktab Thu Mar 18 03:31:37 2010
  79. +++ etc48/etc/disktab Mon Aug 16 16:46:49 2010
  80. @@ -1,79 +1,5 @@
  81. -# $OpenBSD: disktab,v 1.19 2006/10/04 01:04:22 krw Exp $
  82. +# $OpenBSD: disktab,v 1.20 2010/07/02 20:33:54 tedu Exp $
  83.  
  84. -# Disk geometry and partition layout tables.
  85. -# Key:
  86. -# dt controller type
  87. -# ty type of disk (fixed, removable, simulated)
  88. -# d[0-4] drive-type-dependent parameters
  89. -# ns #sectors/track
  90. -# nt #tracks/cylinder
  91. -# nc #cylinders/disk
  92. -# sc #sectors/cylinder, ns*nt default
  93. -# su #sectors/unit, sc*nc default
  94. -# se sector size, DEV_BSIZE default
  95. -# rm rpm, 3600 default
  96. -# sf supports bad144-style bad sector forwarding
  97. -# sk sector skew per track, default 0
  98. -# cs sector skew per cylinder, default 0
  99. -# hs headswitch time, default 0
  100. -# ts one-cylinder seek time, default 0
  101. -# il sector interleave (n:1), 1 default
  102. -# bs boot block size, default BBSIZE
  103. -# sb superblock size, default SBSIZE
  104. -# o[a-p] partition offsets in sectors
  105. -# p[a-p] partition sizes in sectors
  106. -# b[a-p] partition block sizes in bytes
  107. -# f[a-p] partition fragment sizes in bytes
  108. -# t[a-p] partition types (filesystem, swap, etc)
  109. -#
  110. -# All partition sizes reserve space for bad sector tables.
  111. -# (5 cylinders needed for maintenance + replacement sectors)
  112. -#
  113. -
  114. -qp120at|Quantum Peripherals 120MB IDE:\
  115. - :dt=ESDI:ty=winchester:se#512:nt#9:ns#32:nc#813: \
  116. - :pa#13824:oa#0:ta=4.2BSD:ba#4096:fa#512: \
  117. - :pb#13824:ob#13824:tb=swap: \
  118. - :pc#234144:oc#0: \
  119. - :ph#206496:oh#27648:th=4.2BSD:bh#4096:fh#512:
  120. -
  121. -pan60|Panasonic Laptop's 60MB IDE:\
  122. - :dt=ST506:ty=winchester:se#512:nt#13:ns#17:nc#565:\
  123. - :pa#13260:oa#0:ta=4.2BSD:ba#4096:fa#512:\
  124. - :pb#13260:ob#13260:tb=swap: \
  125. - :pc#124865:oc#0: \
  126. - :ph#97682:oh#26520:th=4.2BSD:bh#4096:fh#512:
  127. -
  128. -mk156|toshiba156|Toshiba MK156 156Mb:\
  129. - :dt=SCSI:ty=winchester:se#512:nt#10:ns#35:nc#825:\
  130. - :pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\
  131. - :pb#15748:ob#15748:tb=swap:\
  132. - :pc#288750:oc#0:\
  133. - :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD:
  134. -
  135. -cp3100|Conner Peripherals 100MB IDE:\
  136. - :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
  137. - :pa#12144:oa#0:ta=4.2BSD:ba#4096:fa#512: \
  138. - :pb#12144:ob#12144:tb=swap: \
  139. - :pc#202224:oc#0: \
  140. - :ph#177936:oh#24288:th=4.2BSD:bh#4096:fh#512:
  141. -
  142. -# a == root
  143. -# b == swap
  144. -# c == whole disk
  145. -# e == /var
  146. -# f == scratch
  147. -# h == /usr
  148. -
  149. -cp3100new|Conner Peripherals 100MB IDE, with a different configuration:\
  150. - :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
  151. - :pa#15840:oa#0:ta=4.2BSD:ba#4096:fa#512: \
  152. - :pb#24288:ob#15840:tb=swap: \
  153. - :pc#202224:oc#0: \
  154. - :pe#15840:oe#40128:te=4.2BSD:be#4096:fe#512: \
  155. - :pg#15840:og#55968:tg=4.2BSD:bg#4096:fg#512: \
  156. - :ph#130416:oh#71808:th=4.2BSD:bh#4096:fh#512:
  157. -
  158. floppy288|3in|3.5in High Density Floppy, 2.88MB:\
  159. :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
  160. :pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD: \
  161. @@ -91,39 +17,6 @@
  162. :pa#2400:oa#0:ba#4096:fa#512:ta=4.2BSD: \
  163. :pb#2400:ob#0:bb#4096:fb#512:\
  164. :pc#2400:oc#0:bc#4096:fc#512:
  165. -
  166. -maxtor4380|Maxtor XT4380E ESDI :\
  167. - :dt=ESDI:ty=winchester:se#512:nt#15:ns#36:nc#1222: \
  168. - :pa#21600:oa#0:ta=4.2BSD:ba#4096:\
  169. - :pb#21600:ob#21600:tb=swap: \
  170. - :pc#659880:oc#0: \
  171. - :pe#216000:oe#53200:te=4.2BSD:be#4096:fe#512: \
  172. - :ph#398520:oh#269200:th=4.2BSD:bh#4096:fh#512:
  173. -
  174. -miniscribe9380|compaq38|Miniscribe 9380 ESDI :\
  175. - :ty=winchester:dt=ESDI:se#512:nt#15:ns#35:nc#1223:rm#3600: \
  176. - :pa#21000:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
  177. - :pb#42000:ob#21000:tb=swap: \
  178. - :pc#642075:oc#0: \
  179. - :pe#21000:oe#63000:be#8192:fe#1024:te=4.2BSD: \
  180. - :ph#556500:oh#84000:bh#8192:fh#1024:th=4.2BSD:
  181. -
  182. -ida4|compaq88|Compaq IDA (4 drives) :\
  183. - :ty=winchester:dt=IDA:se#512:nt#16:ns#63:nc#1644:rm#3600:\
  184. - :pa#20160:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
  185. - :pb#80640:ob#20160:tb=swap: \
  186. - :pc#1659168:oc#0: \
  187. - :pe#201600:oe#100800:be#8192:fe#1024:te=4.2BSD: \
  188. - :pf#20160:of#1310400:bf#8192:ff#1024:tf=4.2BSD: \
  189. - :ph#1008000:oh#302400:bh#8192:fh#1024:th=4.2BSD: \
  190. - :pg#302400:og#1330560:bg#4096:fg#512:tg=4.2BSD:
  191. -
  192. -fuji513|Fujitsu M22XXXX: \
  193. - :ty=winchester:dt=ESDI:se#512:nt#16:ns#63:nc#954:rm#3600:\
  194. - :pa#20160:oa#82656:ba#4096:fa#512:ta=4.2BSD: \
  195. - :pb#40320:ob#102816:tb=swap: \
  196. - :pc#961632:oc#0: \
  197. - :ph#656208:oh#143136:bh#4096:fh#512:th=4.2BSD:
  198.  
  199. rdroot|ramdiskroot|RAM-disk root FS image:\
  200. :ty=ramdisk:se#512:nt#2:ns#128:nc#16:\
  201. diff -ur etc47/etc/ftpusers etc48/etc/ftpusers
  202. --- etc47/etc/ftpusers Thu Mar 18 03:31:37 2010
  203. +++ etc48/etc/ftpusers Mon Aug 16 16:46:48 2010
  204. @@ -1,4 +1,4 @@
  205. -# $OpenBSD: ftpusers,v 1.40 2010/02/22 15:16:45 claudio Exp $
  206. +# $OpenBSD: ftpusers,v 1.43 2010/06/03 20:32:36 reyk Exp $
  207. #
  208. # list of users disallowed any ftp access.
  209. # read by ftpd(8).
  210. @@ -50,3 +50,6 @@
  211. _rwalld
  212. _nsd
  213. _ldpd
  214. +_sndio
  215. +_ldapd
  216. +_iked
  217. diff -ur etc47/etc/group etc48/etc/group
  218. --- etc47/etc/group Thu Mar 18 03:31:37 2010
  219. +++ etc48/etc/group Mon Aug 16 16:46:48 2010
  220. @@ -63,6 +63,9 @@
  221. _rwalld:*:96:
  222. _nsd:*:97:
  223. _ldpd:*:98:
  224. +_sndio:*:99:
  225. +_ldapd:*:100:
  226. +_iked:*:101:
  227. dialer:*:117:
  228. nogroup:*:32766:
  229. nobody:*:32767:
  230. Only in etc48/etc: iked
  231. Only in etc48/etc: iked.conf
  232. diff -ur etc47/etc/ksh.kshrc etc48/etc/ksh.kshrc
  233. --- etc47/etc/ksh.kshrc Thu Mar 18 03:31:37 2010
  234. +++ etc48/etc/ksh.kshrc Mon Aug 16 16:46:48 2010
  235. @@ -1,5 +1,5 @@
  236. :
  237. -# $OpenBSD: ksh.kshrc,v 1.14 2009/08/07 09:05:24 martynas Exp $
  238. +# $OpenBSD: ksh.kshrc,v 1.15 2010/04/26 09:04:15 otto Exp $
  239. #
  240. # NAME:
  241. # ksh.kshrc - global initialization for ksh
  242. @@ -102,27 +102,39 @@
  243. wcd () { \cd "$@" && eval stripe; }
  244. wssh ()
  245. {
  246. + local rc
  247. "ssh" "$@"
  248. + rc=$?
  249. eval istripe
  250. eval stripe
  251. + return $rc
  252. }
  253. wtelnet ()
  254. {
  255. + local rc
  256. "telnet" "$@"
  257. + rc=$?
  258. eval istripe
  259. eval stripe
  260. + return $rc
  261. }
  262. wrlogin ()
  263. {
  264. + local rc
  265. "rlogin" "$@"
  266. + rc=$?
  267. eval istripe
  268. eval stripe
  269. + return $rc
  270. }
  271. wsu ()
  272. {
  273. + local rc
  274. "su" "$@"
  275. + rc=$?
  276. eval istripe
  277. eval stripe
  278. + return $rc
  279. }
  280. alias su=wsu
  281. alias cd=wcd
  282. Only in etc48/etc: ldap
  283. Only in etc48/etc: ldapd.conf
  284. diff -ur etc47/etc/ldpd.conf etc48/etc/ldpd.conf
  285. --- etc47/etc/ldpd.conf Thu Mar 18 03:31:38 2010
  286. +++ etc48/etc/ldpd.conf Mon Aug 16 16:46:51 2010
  287. @@ -1,7 +1,7 @@
  288. -# $OpenBSD: ldpd.conf,v 1.1 2010/02/22 15:15:54 claudio Exp $
  289. +# $OpenBSD: ldpd.conf,v 1.3 2010/06/25 22:49:05 claudio Exp $
  290.  
  291. # macros
  292. -#fast="2"
  293. +fast="2"
  294.  
  295. # global configuration
  296. # router-id 10.0.0.1
  297. @@ -11,8 +11,8 @@
  298. retention liberal
  299. advertisement unsolicited
  300.  
  301. -interface bge0 {
  302. -}
  303. +interface bge0
  304. +
  305. interface vlan5 {
  306. hello-interval $fast
  307. }
  308. diff -ur etc47/etc/mail/aliases etc48/etc/mail/aliases
  309. --- etc47/etc/mail/aliases Thu Mar 18 03:31:42 2010
  310. +++ etc48/etc/mail/aliases Mon Aug 16 16:46:57 2010
  311. @@ -1,5 +1,5 @@
  312. #
  313. -# $OpenBSD: aliases,v 1.32 2010/02/22 15:16:45 claudio Exp $
  314. +# $OpenBSD: aliases,v 1.35 2010/06/03 20:32:36 reyk Exp $
  315. #
  316. # Aliases in this file will NOT be expanded in the header from
  317. # Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
  318. @@ -30,9 +30,11 @@
  319. _ftp: /dev/null
  320. _hostapd: /dev/null
  321. _identd: /dev/null
  322. +_iked: /dev/null
  323. _isakmpd: /dev/null
  324. _kadmin: /dev/null
  325. _kdc: /dev/null
  326. +_ldapd: /dev/null
  327. _ldpd: /dev/null
  328. _mopd: /dev/null
  329. _nsd: /dev/null
  330. @@ -50,6 +52,7 @@
  331. _rusersd: /dev/null
  332. _rwalld: /dev/null
  333. _smtpd: /dev/null
  334. +_sndio: /dev/null
  335. _snmpd: /dev/null
  336. _spamd: /dev/null
  337. _syslogd: /dev/null
  338. Binary files etc47/etc/mail/aliases.db and etc48/etc/mail/aliases.db differ
  339. diff -ur etc47/etc/mail/localhost.cf etc48/etc/mail/localhost.cf
  340. --- etc47/etc/mail/localhost.cf Thu Mar 18 03:31:39 2010
  341. +++ etc48/etc/mail/localhost.cf Mon Aug 16 16:46:53 2010
  342. @@ -16,7 +16,7 @@
  343. #####
  344. ##### SENDMAIL CONFIGURATION FILE
  345. #####
  346. -##### built by root@i386.openbsd.org on Wed Mar 17 20:26:02 MDT 2010
  347. +##### built by root@i386.openbsd.org on Wed Aug 11 09:49:09 MDT 2010
  348. ##### in /usr/src/gnu/usr.sbin/sendmail/cf/cf
  349. ##### using /usr/src/gnu/usr.sbin/sendmail/cf/cf/../ as configuration include directory
  350. #####
  351. diff -ur etc47/etc/mail/sendmail.cf etc48/etc/mail/sendmail.cf
  352. --- etc47/etc/mail/sendmail.cf Thu Mar 18 03:31:39 2010
  353. +++ etc48/etc/mail/sendmail.cf Mon Aug 16 16:46:53 2010
  354. @@ -16,7 +16,7 @@
  355. #####
  356. ##### SENDMAIL CONFIGURATION FILE
  357. #####
  358. -##### built by root@i386.openbsd.org on Wed Mar 17 20:26:02 MDT 2010
  359. +##### built by root@i386.openbsd.org on Wed Aug 11 09:49:09 MDT 2010
  360. ##### in /usr/src/gnu/usr.sbin/sendmail/cf/cf
  361. ##### using /usr/src/gnu/usr.sbin/sendmail/cf/cf/../ as configuration include directory
  362. #####
  363. diff -ur etc47/etc/mail/submit.cf etc48/etc/mail/submit.cf
  364. --- etc47/etc/mail/submit.cf Thu Mar 18 03:31:39 2010
  365. +++ etc48/etc/mail/submit.cf Mon Aug 16 16:46:53 2010
  366. @@ -16,7 +16,7 @@
  367. #####
  368. ##### SENDMAIL CONFIGURATION FILE
  369. #####
  370. -##### built by root@i386.openbsd.org on Wed Mar 17 20:26:01 MDT 2010
  371. +##### built by root@i386.openbsd.org on Wed Aug 11 09:49:08 MDT 2010
  372. ##### in /usr/src/gnu/usr.sbin/sendmail/cf/cf
  373. ##### using /usr/src/gnu/usr.sbin/sendmail/cf/cf/../ as configuration include directory
  374. #####
  375. diff -ur etc47/etc/man.conf etc48/etc/man.conf
  376. --- etc47/etc/man.conf Thu Mar 18 03:31:37 2010
  377. +++ etc48/etc/man.conf Mon Aug 16 16:46:48 2010
  378. @@ -1,4 +1,4 @@
  379. -# $OpenBSD: man.conf,v 1.14 2008/04/27 15:10:58 deanna Exp $
  380. +# $OpenBSD: man.conf,v 1.15 2010/04/09 19:07:30 naddy Exp $
  381.  
  382. # Sheer, raging paranoia...
  383. _version BSD.2
  384. @@ -16,17 +16,17 @@
  385. _suffix .0
  386. _build .0.Z /usr/bin/zcat %s
  387. _build .0.gz /usr/bin/gzcat %s
  388. -_build .[1-9n] /usr/bin/nroff -man %s
  389. -_build .[1-9n].Z /usr/bin/zcat %s | /usr/bin/nroff -man
  390. -_build .[1-9n].gz /usr/bin/gzcat %s | /usr/bin/nroff -man
  391. -_build .[1-9][a-z] /usr/bin/nroff -man %s
  392. -_build .[1-9][a-z].Z /usr/bin/zcat %s | /usr/bin/nroff -man
  393. -_build .[1-9][a-z].gz /usr/bin/gzcat %s | /usr/bin/nroff -man
  394. -_build .tbl /usr/bin/tbl %s | /usr/bin/nroff -man
  395. -_build .tbl.Z /usr/bin/zcat %s | /usr/bin/tbl | /usr/bin/nroff -man
  396. -_build .tbl.gz /usr/bin/gzcat %s | /usr/bin/tbl | /usr/bin/nroff -man
  397. -_build .me /usr/bin/nroff -me %s 2>/dev/null | cat -s
  398. -_build .ms /usr/bin/nroff -ms %s 2>/dev/null | cat -s
  399. +_build .[1-9n] /usr/bin/nroff -Tascii -man %s
  400. +_build .[1-9n].Z /usr/bin/zcat %s | /usr/bin/nroff -Tascii -man
  401. +_build .[1-9n].gz /usr/bin/gzcat %s | /usr/bin/nroff -Tascii -man
  402. +_build .[1-9][a-z] /usr/bin/nroff -Tascii -man %s
  403. +_build .[1-9][a-z].Z /usr/bin/zcat %s | /usr/bin/nroff -Tascii -man
  404. +_build .[1-9][a-z].gz /usr/bin/gzcat %s | /usr/bin/nroff -Tascii -man
  405. +_build .tbl /usr/bin/tbl %s | /usr/bin/nroff -Tascii -man
  406. +_build .tbl.Z /usr/bin/zcat %s | /usr/bin/tbl | /usr/bin/nroff -Tascii -man
  407. +_build .tbl.gz /usr/bin/gzcat %s | /usr/bin/tbl | /usr/bin/nroff -Tascii -man
  408. +_build .me /usr/bin/nroff -Tascii -me %s 2>/dev/null | cat -s
  409. +_build .ms /usr/bin/nroff -Tascii -ms %s 2>/dev/null | cat -s
  410.  
  411. # Sections and their directories.
  412. # All paths ending in '/' are the equivalent of entries specifying that
  413. diff -ur etc47/etc/master.passwd etc48/etc/master.passwd
  414. --- etc47/etc/master.passwd Thu Mar 18 03:31:37 2010
  415. +++ etc48/etc/master.passwd Mon Aug 16 16:46:49 2010
  416. @@ -1,7 +1,7 @@
  417. root::0:0:daemon:0:0:Charlie &:/root:/bin/ksh
  418. daemon:*:1:1::0:0:The devil himself:/root:/sbin/nologin
  419. operator:*:2:5::0:0:System &:/operator:/sbin/nologin
  420. -bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/sbin/nologin
  421. +bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin
  422. smmsp:*:25:25::0:0:Sendmail Message Submission Program:/nonexistent:/sbin/nologin
  423. popa3d:*:26:26::0:0:POP3 Server:/var/empty:/sbin/nologin
  424. sshd:*:27:27::0:0:sshd privsep:/var/empty:/sbin/nologin
  425. @@ -45,4 +45,7 @@
  426. _rwalld:*:96:96::0:0:rpc.rwalld:/var/empty:/sbin/nologin
  427. _nsd:*:97:97::0:0:NSD Daemon:/var/empty:/sbin/nologin
  428. _ldpd:*:98:98::0:0:LDP Daemon:/var/empty:/sbin/nologin
  429. +_sndio:*:99:99::0:0:sndio privsep:/var/empty:/sbin/nologin
  430. +_ldapd:*:100:100::0:0:LDAP Daemon:/var/empty:/sbin/nologin
  431. +_iked:*:101:101::0:0:IKEv2 Daemon:/var/empty:/sbin/nologin
  432. nobody:*:32767:32767::0:0:Unprivileged user for NFS:/nonexistent:/sbin/nologin
  433. Only in etc47/etc: mtree
  434. diff -ur etc47/etc/netstart etc48/etc/netstart
  435. --- etc47/etc/netstart Thu Mar 18 03:31:37 2010
  436. +++ etc48/etc/netstart Mon Aug 16 16:46:48 2010
  437. @@ -1,6 +1,6 @@
  438. #!/bin/sh -
  439. #
  440. -# $OpenBSD: netstart,v 1.129 2010/01/12 07:43:41 henning Exp $
  441. +# $OpenBSD: netstart,v 1.130 2010/06/16 23:45:57 todd Exp $
  442.  
  443. # Strip comments (and leading/trailing whitespace if IFS is set)
  444. # from a file and spew to stdout
  445. @@ -111,7 +111,7 @@
  446. dest)
  447. cmd="$cmd $dtaddr"
  448. ;;
  449. - [a-z!]*)
  450. + *)
  451. cmd2="$dt $dtaddr"
  452. ;;
  453. esac
  454. diff -ur etc47/etc/newsyslog.conf etc48/etc/newsyslog.conf
  455. --- etc47/etc/newsyslog.conf Thu Mar 18 03:31:37 2010
  456. +++ etc48/etc/newsyslog.conf Mon Aug 16 16:46:48 2010
  457. @@ -1,4 +1,4 @@
  458. -# $OpenBSD: newsyslog.conf,v 1.27 2009/11/03 20:47:40 deraadt Exp $
  459. +# $OpenBSD: newsyslog.conf,v 1.28 2010/06/29 10:25:13 stephan Exp $
  460. #
  461. # configuration file for newsyslog
  462. #
  463. @@ -15,4 +15,3 @@
  464. /var/log/xferlog 640 7 250 * Z
  465. /var/log/ppp.log 640 7 250 * Z
  466. /var/log/pflog 600 3 250 * ZB "pkill -HUP -u root -U root -t - -x pflogd"
  467. -
  468. diff -ur etc47/etc/passwd etc48/etc/passwd
  469. --- etc47/etc/passwd Thu Mar 18 03:31:38 2010
  470. +++ etc48/etc/passwd Mon Aug 16 16:46:49 2010
  471. @@ -1,7 +1,7 @@
  472. root:*:0:0:Charlie &:/root:/bin/ksh
  473. daemon:*:1:1:The devil himself:/root:/sbin/nologin
  474. operator:*:2:5:System &:/operator:/sbin/nologin
  475. -bin:*:3:7:Binaries Commands and Source,,,:/:/sbin/nologin
  476. +bin:*:3:7:Binaries Commands and Source:/:/sbin/nologin
  477. smmsp:*:25:25:Sendmail Message Submission Program:/nonexistent:/sbin/nologin
  478. popa3d:*:26:26:POP3 Server:/var/empty:/sbin/nologin
  479. sshd:*:27:27:sshd privsep:/var/empty:/sbin/nologin
  480. @@ -45,4 +45,7 @@
  481. _rwalld:*:96:96:rpc.rwalld:/var/empty:/sbin/nologin
  482. _nsd:*:97:97:NSD Daemon:/var/empty:/sbin/nologin
  483. _ldpd:*:98:98:LDP Daemon:/var/empty:/sbin/nologin
  484. +_sndio:*:99:99:sndio privsep:/var/empty:/sbin/nologin
  485. +_ldapd:*:100:100:LDAP Daemon:/var/empty:/sbin/nologin
  486. +_iked:*:101:101:IKEv2 Daemon:/var/empty:/sbin/nologin
  487. nobody:*:32767:32767:Unprivileged user for NFS:/nonexistent:/sbin/nologin
  488. Only in etc47/etc: phones
  489. Binary files etc47/etc/pwd.db and etc48/etc/pwd.db differ
  490. diff -ur etc47/etc/rc etc48/etc/rc
  491. --- etc47/etc/rc Thu Mar 18 03:31:37 2010
  492. +++ etc48/etc/rc Mon Aug 16 16:46:48 2010
  493. @@ -1,4 +1,4 @@
  494. -# $OpenBSD: rc,v 1.335 2010/01/04 18:03:30 deraadt Exp $
  495. +# $OpenBSD: rc,v 1.340 2010/07/27 08:37:33 martinh Exp $
  496.  
  497. # System startup script run by init on autoboot
  498. # or after single-user.
  499. @@ -372,7 +372,7 @@
  500. fi
  501.  
  502. if [ ! -f /etc/isakmpd/private/local.key ]; then
  503. - echo -n "openssl: generating new isakmpd RSA key... "
  504. + echo -n "openssl: generating new isakmpd/iked RSA key... "
  505. if /usr/sbin/openssl genrsa -out /etc/isakmpd/private/local.key 2048 \
  506. > /dev/null 2>&1; then
  507. chmod 600 /etc/isakmpd/private/local.key
  508. @@ -384,6 +384,13 @@
  509. fi
  510. fi
  511.  
  512. +if [ ! -f /etc/iked/private/local.key ]; then
  513. + # Just copy the generated isakmpd key
  514. + cp /etc/isakmpd/private/local.key /etc/iked/private/local.key
  515. + chmod 600 /etc/iked/private/local.key
  516. + cp /etc/isakmpd/local.pub /etc/iked/local.pub
  517. +fi
  518. +
  519. if [ X"${isakmpd_flags}" != X"NO" ]; then
  520. if [ X"${sasyncd_flags}" != X"NO" ]; then
  521. isakmpd_flags="-S ${isakmpd_flags}"
  522. @@ -391,6 +398,13 @@
  523. echo 'starting isakmpd'; isakmpd ${isakmpd_flags}
  524. fi
  525.  
  526. +if [ X"${iked_flags}" != X"NO" ]; then
  527. + if [ X"${sasyncd_flags}" != X"NO" ]; then
  528. + iked_flags="-S ${iked_flags}"
  529. + fi
  530. + echo 'starting iked'; iked ${iked_flags}
  531. +fi
  532. +
  533. if [ X"${sasyncd_flags}" != X"NO" ]; then
  534. echo 'starting sasyncd'; sasyncd ${sasyncd_flags}
  535. fi
  536. @@ -520,7 +534,8 @@
  537.  
  538. # prune quickly with one rm, then use find to clean up /tmp/[lq]*
  539. # (not needed with mfs /tmp, but doesn't hurt there...)
  540. -(cd /tmp && rm -rf [a-km-pr-zA-Z]* &&
  541. +(cd /tmp && rm -rf [a-km-pr-zA-Z]*)
  542. +(cd /tmp &&
  543. find . ! -name . ! -name lost+found ! -name quota.user \
  544. ! -name quota.group -execdir rm -rf -- {} \; -type d -prune)
  545.  
  546. @@ -619,6 +634,10 @@
  547. echo -n ' snmpd'; /usr/sbin/snmpd $snmpd_flags
  548. fi
  549.  
  550. +if [ X"${ldpd_flags}" != X"NO" ]; then
  551. + echo -n ' ldpd'; /usr/sbin/ldpd $ldpd_flags
  552. +fi
  553. +
  554. if [ X"${ripd_flags}" != X"NO" ]; then
  555. echo -n ' ripd'; /usr/sbin/ripd $ripd_flags
  556. fi
  557. @@ -699,6 +718,10 @@
  558. echo -n ' lpd'; lpd ${lpd_flags}
  559. fi
  560.  
  561. +if [ X"${ldapd_flags}" != X"NO" ]; then
  562. + echo -n ' ldapd'; /usr/sbin/ldapd ${ldapd_flags};
  563. +fi
  564. +
  565. # We call sendmail with a full path so that SIGHUP works.
  566. # Note that /usr/sbin/sendmail may actually call a
  567. # mailer other than sendmail, depending on /etc/mailer.conf.
  568. @@ -763,6 +786,10 @@
  569. echo '.'
  570.  
  571. mixerctl_conf
  572. +
  573. +if [ X"${aucat_flags}" != X"NO" ]; then
  574. + aucat -l ${aucat_flags}
  575. +fi
  576.  
  577. # KerberosV master KDC
  578. if [ X"${krb5_master_kdc}" = X"YES" ]; then
  579. diff -ur etc47/etc/rc.conf etc48/etc/rc.conf
  580. --- etc47/etc/rc.conf Thu Mar 18 03:31:37 2010
  581. +++ etc48/etc/rc.conf Mon Aug 16 16:46:49 2010
  582. @@ -1,8 +1,9 @@
  583. #!/bin/sh -
  584. #
  585. -# $OpenBSD: rc.conf,v 1.134 2009/10/17 20:40:17 nicm Exp $
  586. +# $OpenBSD: rc.conf,v 1.139 2010/07/29 13:55:48 jmc Exp $
  587.  
  588. # set these to "NO" to turn them off. otherwise, they're used as flags
  589. +ldpd_flags=NO # for normal use: ""
  590. ripd_flags=NO # for normal use: ""
  591. mrouted_flags=NO # for normal use: "", if activated
  592. # be sure to enable multicast_router below.
  593. @@ -20,6 +21,7 @@
  594. ldattach_flags=NO # for normal use: "[options] linedisc cua-device"
  595. ntpd_flags=NO # for normal use: ""
  596. isakmpd_flags=NO # for normal use: ""
  597. +iked_flags=NO # for normal use: ""
  598. sasyncd_flags=NO # for normal use: ""
  599. mopd_flags=NO # for normal use: "-a"
  600. apmd_flags=NO # for normal use: ""
  601. @@ -42,6 +44,8 @@
  602. relayd_flags=NO # for normal use: ""
  603. snmpd_flags=NO # for normal use: ""
  604. smtpd_flags=NO # for normal use: ""
  605. +aucat_flags=NO # for normal use: ""
  606. +ldapd_flags=NO # for normal use: ""
  607.  
  608. # use -u to disable chroot, see httpd(8)
  609. httpd_flags=NO # for normal use: "" (or "-DSSL" after reading ssl(8))
  610. @@ -93,11 +97,11 @@
  611. yppasswdd_flags=NO # "-d /etc/yp" if passwd files are in /etc/yp
  612. nfsd_flags="-tun 4" # Crank the 4 for a busy NFS fileserver
  613. amd_master=/etc/amd/master # AMD 'master' map
  614. -syslogd_flags= # add more flags, ie. "-u -a /chroot/dev/log"
  615. +syslogd_flags= # add more flags, e.g. "-u -a /chroot/dev/log"
  616. pf_rules=/etc/pf.conf # Packet filter rules file
  617. ipsec_rules=/etc/ipsec.conf # IPsec rules file
  618. bt_rules=/etc/bt.conf # Bluetooth rules file
  619. -pflogd_flags= # add more flags, ie. "-s 256"
  620. +pflogd_flags= # add more flags, e.g. "-s 256"
  621. afsd_flags= # Flags passed to afsd
  622. shlib_dirs= # extra directories for ldconfig, separated
  623. # by space
  624. diff -ur etc47/etc/remote etc48/etc/remote
  625. --- etc47/etc/remote Thu Mar 18 03:31:37 2010
  626. +++ etc48/etc/remote Mon Aug 16 16:46:49 2010
  627. @@ -1,21 +1,18 @@
  628. -# $OpenBSD: remote,v 1.11 2005/02/07 06:08:10 david Exp $
  629. +# $OpenBSD: remote,v 1.12 2010/06/29 17:17:53 nicm Exp $
  630. # from: @(#)remote 8.1 (Berkeley) 6/10/93
  631. #
  632. # remote -- remote host description database
  633. -# see tip(1), cgetcap(3), phones(5), remote(5)
  634. +# see tip(1), cgetcap(3), remote(5)
  635. #
  636. # Capabilities used in examples:
  637. #
  638. -# at ACU type
  639. # br baud rate (defaults to 300)
  640. # dc direct connect
  641. -# du make a call flag (dial up)
  642. # dv device to use for the tty
  643. # el EOL marks (default is NULL)
  644. # ie input EOF marks (default is NULL)
  645. # oe output EOF string (default is NULL)
  646. # pa parity
  647. -# pn phone #, '\@' means use the phones(5) file
  648. # tc include the named system description
  649. #
  650. # Most OpenBSD architectures use /dev/tty00, /dev/cua00, etc.
  651. @@ -50,27 +47,14 @@
  652. direct:\
  653. :dc:
  654.  
  655. -dialup:\
  656. - :du:at=hayes:pn=\@:
  657. -
  658. doshost:\
  659. :oe=^Z:tc=unixhost:
  660.  
  661. unixhost:\
  662. :pa=none:br#9600:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:
  663.  
  664. -# Sample directly connected lines. Directly connected lines are
  665. -# most commonly used for serial consoles.
  666. -#
  667. tty00|For hp300,i386,mac68k,macppc,mvmeppc,vax:\
  668. :dv=/dev/tty00:tc=direct:tc=unixhost:
  669.  
  670. ttya|For sparc,mvme68k:\
  671. :dv=/dev/ttya:tc=direct:tc=unixhost:
  672. -
  673. -# Sample dial out lines.
  674. -#
  675. -cua00|For hp300,i386,mac68k,macppc,mvmeppc,vax:\
  676. - :dv=/dev/cua00:tc=dialup:tc=unixhost:
  677. -cuaa|For sparc,mvme68k:\
  678. - :dv=/dev/cuaa:tc=dialup:tc=unixhost:
  679. diff -ur etc47/etc/services etc48/etc/services
  680. --- etc47/etc/services Thu Mar 18 03:31:37 2010
  681. +++ etc48/etc/services Mon Aug 16 16:46:49 2010
  682. @@ -1,4 +1,4 @@
  683. -# $OpenBSD: services,v 1.73 2010/01/17 05:50:06 dlg Exp $
  684. +# $OpenBSD: services,v 1.74 2010/05/25 13:00:00 claudio Exp $
  685. #
  686. # Network services, Internet style
  687. #
  688. @@ -151,6 +151,8 @@
  689. ipp 631/udp # Internet Printing Protocol
  690. ldaps 636/tcp # LDAP over SSL
  691. ldaps 636/udp
  692. +ldp 646/tcp
  693. +ldp 646/udp
  694. rsync 873/tcp # rsync server
  695. cddb 888/tcp cddbp # Audio CD Database
  696. imaps 993/tcp # imap4 protocol over TLS/SSL
  697. Binary files etc47/etc/spwd.db and etc48/etc/spwd.db differ
  698. diff -ur etc47/etc/ssl/x509v3.cnf etc48/etc/ssl/x509v3.cnf
  699. --- etc47/etc/ssl/x509v3.cnf Thu Mar 18 03:31:42 2010
  700. +++ etc48/etc/ssl/x509v3.cnf Mon Aug 16 16:46:57 2010
  701. @@ -1,6 +1,7 @@
  702. # default settings
  703. CERTPATHLEN = 1
  704. CERTUSAGE = digitalSignature,keyCertSign,cRLSign
  705. +EXTCERTUSAGE = serverAuth,clientAuth
  706. CERTIP = 0.0.0.0
  707. CERTFQDN = nohost.nodomain
  708.  
  709. @@ -18,9 +19,11 @@
  710. # The address must be provided in the CERTIP environment variable
  711. [x509v3_IPAddr]
  712. subjectAltName=IP:$ENV::CERTIP
  713. +extendedKeyUsage=$ENV::EXTCERTUSAGE
  714.  
  715. # This section should be referenced to add a FQDN hostname
  716. # as an alternate subject name, needed by isakmpd
  717. # The address must be provided in the CERTFQDN environment variable
  718. [x509v3_FQDN]
  719. subjectAltName=DNS:$ENV::CERTFQDN
  720. +extendedKeyUsage=$ENV::EXTCERTUSAGE
  721. diff -ur etc47/etc/sysctl.conf etc48/etc/sysctl.conf
  722. --- etc47/etc/sysctl.conf Thu Mar 18 03:31:37 2010
  723. +++ etc48/etc/sysctl.conf Mon Aug 16 16:46:49 2010
  724. @@ -37,11 +37,10 @@
  725. #machdep.allowaperture=2 # See xf86(4)
  726. #machdep.apmhalt=1 # 1=powerdown hack, try if halt -p doesn't work
  727. #machdep.kbdreset=1 # permit console CTRL-ALT-DEL to do a nice halt
  728. +#machdep.lidsuspend=1 # laptop lid closes cause a suspend
  729. #machdep.userldt=1 # allow userland programs to play with ldt,
  730. # required by some ports
  731. #kern.emul.aout=1 # enable running dynamic OpenBSD a.out bins
  732. -#kern.emul.bsdos=1 # enable running BSD/OS binaries
  733. #kern.emul.freebsd=1 # enable running FreeBSD binaries
  734. -#kern.emul.ibcs2=1 # enable running iBCS2 binaries
  735. #kern.emul.linux=1 # enable running Linux binaries
  736. #kern.emul.svr4=1 # enable running SVR4 binaries
  737. diff -ur etc47/etc/systrace/usr_sbin_named etc48/etc/systrace/usr_sbin_named
  738. --- etc47/etc/systrace/usr_sbin_named Thu Mar 18 03:31:38 2010
  739. +++ etc48/etc/systrace/usr_sbin_named Mon Aug 16 16:46:51 2010
  740. @@ -1,4 +1,4 @@
  741. -# $OpenBSD: usr_sbin_named,v 1.5 2004/05/13 04:50:04 sturm Exp $
  742. +# $OpenBSD: usr_sbin_named,v 1.6 2010/07/23 03:13:51 ray Exp $
  743. #
  744. # Policy for named that uses named user and chroots to /var/named
  745. # This policy works for the default configuration of named.
  746. @@ -28,6 +28,7 @@
  747. native-fsread: filename eq "/etc/named.keys" then permit
  748. native-fsread: filename eq "/etc/pwd.db" then permit
  749. native-fsread: filename eq "/etc/rndc.key" then permit
  750. + native-fsread: filename eq "/etc/root.hint" then permit
  751. native-fsread: filename eq "/etc/spwd.db" then deny[eperm]
  752. native-fsread: filename match "/master" then permit
  753. native-fsread: filename match "/slave" then permit
  754. @@ -63,6 +64,7 @@
  755. native-mquery: permit
  756. native-munmap: permit
  757. native-nanosleep: permit
  758. + native-pipe: permit
  759. native-pread: permit
  760. native-read: permit
  761. native-recvmsg: permit
  762. @@ -74,6 +76,8 @@
  763. native-seteuid: uid eq "70" and uname eq "named" then permit
  764. native-setgid: gid eq "70" then permit
  765. native-setgroups: permit
  766. + native-setresgid: permit
  767. + native-setresuid: permit
  768. native-setrlimit: permit
  769. native-setsid: permit
  770. native-setsockopt: permit
  771. diff -ur etc47/var/db/sysmerge/etcsum etc48/var/db/sysmerge/etcsum
  772. --- etc47/var/db/sysmerge/etcsum Thu Mar 18 03:37:34 2010
  773. +++ etc48/var/db/sysmerge/etcsum Mon Aug 16 16:55:30 2010
  774. @@ -8,33 +8,42 @@
  775. 4294967295 0 ./etc/authpf
  776. 2217676753 1955 ./etc/bgpd.conf
  777. 3876916992 185 ./etc/ccd.conf
  778. -722243072 3099 ./etc/changelist
  779. +793243876 3127 ./etc/changelist
  780. 252594545 410 ./etc/chio.conf
  781. 1472356903 102 ./etc/csh.cshrc
  782. 2703696912 102 ./etc/csh.login
  783. 3431436583 104 ./etc/csh.logout
  784. -1553404009 5219 ./etc/daily
  785. +3370947786 5332 ./etc/daily
  786. 2378293123 591 ./etc/dhclient.conf
  787. 4136716515 733 ./etc/dhcpd.conf
  788. -3211624926 4376 ./etc/disktab
  789. +4153755677 787 ./etc/disktab
  790. 4294967295 0 ./etc/dumpdates
  791. 3022890455 215 ./etc/dvmrpd.conf
  792. 2099336431 235 ./etc/exports
  793. 145091714 371 ./etc/fbtab
  794. 1547079671 151 ./etc/ftpchroot
  795. -4156436819 453 ./etc/ftpusers
  796. +2760177956 470 ./etc/ftpusers
  797. 1239607785 3177 ./etc/gettytab
  798. -720510183 895 ./etc/group
  799. +2621652739 935 ./etc/group
  800. 3332781422 2320 ./etc/hostapd.conf
  801. 3453560924 267 ./etc/hosts
  802. 2823201104 75 ./etc/hosts.equiv
  803. 2631094474 178 ./etc/hosts.lpd
  804. 4294967295 0 ./etc/hotplug
  805. 2974218072 1913 ./etc/ifstated.conf
  806. +347500611 805 ./etc/iked.conf
  807. +4294967295 0 ./etc/iked/pubkeys/fqdn
  808. +4294967295 0 ./etc/iked/pubkeys/ipv4
  809. +4294967295 0 ./etc/iked/pubkeys/ipv6
  810. +4294967295 0 ./etc/iked/pubkeys/ufqdn
  811. 1419656858 2381 ./etc/inetd.conf
  812. 4243353537 1122 ./etc/ipsec.conf
  813. -3129846223 3869 ./etc/ksh.kshrc
  814. -878306044 305 ./etc/ldpd.conf
  815. +1378435518 4005 ./etc/ksh.kshrc
  816. +3481018561 19682 ./etc/ldap/core.schema
  817. +4128381391 2737 ./etc/ldap/inetorgperson.schema
  818. +2139975806 7443 ./etc/ldap/nis.schema
  819. +1003664992 360 ./etc/ldapd.conf
  820. +1669450874 301 ./etc/ldpd.conf
  821. 1315038147 874 ./etc/localtime
  822. 1272061458 555 ./etc/locate.rc
  823. 118646532 2245 ./etc/login.conf
  824. @@ -44,45 +53,40 @@
  825. 2236616533 3388 ./etc/mail/README
  826. 761663012 275 ./etc/mail/access
  827. 2937419450 65536 ./etc/mail/access.db
  828. -335771194 1779 ./etc/mail/aliases
  829. -694528397 65536 ./etc/mail/aliases.db
  830. +2239958834 1829 ./etc/mail/aliases
  831. +2308671928 65536 ./etc/mail/aliases.db
  832. 2079996431 982 ./etc/mail/genericstable
  833. 2937419450 65536 ./etc/mail/genericstable.db
  834. 2054762348 5663 ./etc/mail/helpfile
  835. 987201812 466 ./etc/mail/local-host-names
  836. -3841834506 40743 ./etc/mail/localhost.cf
  837. +1768776918 40743 ./etc/mail/localhost.cf
  838. 3116949394 562 ./etc/mail/mailertable
  839. 2937419450 65536 ./etc/mail/mailertable.db
  840. 1149556019 490 ./etc/mail/relay-domains
  841. -4164053631 64506 ./etc/mail/sendmail.cf
  842. +2132050429 64506 ./etc/mail/sendmail.cf
  843. 667510436 300 ./etc/mail/smtpd.conf
  844. 3479831541 1876 ./etc/mail/spamd.conf
  845. -1813081356 41795 ./etc/mail/submit.cf
  846. +1289056739 41795 ./etc/mail/submit.cf
  847. 942407207 561 ./etc/mail/trusted-users
  848. 780872591 621 ./etc/mail/virtusertable
  849. 2937419450 65536 ./etc/mail/virtusertable.db
  850. 233395827 424 ./etc/mailer.conf
  851. -3915481 2201 ./etc/man.conf
  852. -4061065668 2856 ./etc/master.passwd
  853. +2074991023 2288 ./etc/man.conf
  854. +3970800728 3030 ./etc/master.passwd
  855. 3948491597 159160 ./etc/moduli
  856. 686634897 938 ./etc/monthly
  857. 1116441835 406 ./etc/motd
  858. 3992554006 1531 ./etc/mrouted.conf
  859. -1733797779 28817 ./etc/mtree/4.4BSD.dist
  860. -1338026445 3111 ./etc/mtree/BSD.local.dist
  861. -1400764987 9787 ./etc/mtree/BSD.x11.dist
  862. -1004957892 9306 ./etc/mtree/special
  863. 1841534430 17 ./etc/myname
  864. -1531665828 9797 ./etc/netstart
  865. +1550044728 9788 ./etc/netstart
  866. 2935274938 203 ./etc/networks
  867. -1847076434 755 ./etc/newsyslog.conf
  868. +968301387 754 ./etc/newsyslog.conf
  869. 3066868024 493 ./etc/ntpd.conf
  870. 2444571113 467 ./etc/ospf6d.conf
  871. 4056398302 590 ./etc/ospfd.conf
  872. -1908169058 2611 ./etc/passwd
  873. +1160083724 2770 ./etc/passwd
  874. 1588100705 1004 ./etc/pf.conf
  875. 2300413469 28312 ./etc/pf.os
  876. -1879995149 188 ./etc/phones
  877. 1486162102 322 ./etc/portal.conf
  878. 2639296339 141 ./etc/ppp/chap-secrets
  879. 2633022360 22 ./etc/ppp/options
  880. @@ -90,22 +94,22 @@
  881. 3620712914 139 ./etc/ppp/pap-secrets
  882. 2848487335 236 ./etc/printcap
  883. 1129771337 5680 ./etc/protocols
  884. -1239842684 40960 ./etc/pwd.db
  885. +3597021780 40960 ./etc/pwd.db
  886. 1686087193 344 ./etc/rbootd.conf
  887. -2680774216 19725 ./etc/rc
  888. -2958411488 4288 ./etc/rc.conf
  889. +3936635197 20397 ./etc/rc
  890. +56307155 4435 ./etc/rc.conf
  891. 1402807809 380 ./etc/rc.local
  892. 639998969 635 ./etc/rc.securelevel
  893. 3684809617 335 ./etc/rc.shutdown
  894. 3253051455 2530 ./etc/relayd.conf
  895. -2670951584 2317 ./etc/remote
  896. +75412510 1887 ./etc/remote
  897. 3052949533 272 ./etc/ripd.conf
  898. -2206954044 10004 ./etc/rmt
  899. +3131719434 10132 ./etc/rmt
  900. 1935202087 852 ./etc/rpc
  901. 4271262874 403 ./etc/sasyncd.conf
  902. 2272953289 18717 ./etc/security
  903. 1223872336 1136 ./etc/sensorsd.conf
  904. -2820777051 9943 ./etc/services
  905. +2849697141 9973 ./etc/services
  906. 4011733011 258 ./etc/shells
  907. 3838912274 22 ./etc/skel/.Xdefaults
  908. 1301968229 773 ./etc/skel/.cshrc
  909. @@ -117,17 +121,17 @@
  910. 1777800463 349 ./etc/sliphome/slip.hosts
  911. 2924136859 500 ./etc/sliphome/slip.login
  912. 3515895754 608 ./etc/snmpd.conf
  913. -390898665 40960 ./etc/spwd.db
  914. +3850897738 40960 ./etc/spwd.db
  915. 4294967295 0 ./etc/ssh
  916. 2120219775 1555 ./etc/ssh/ssh_config
  917. 231289807 2524 ./etc/ssh/sshd_config
  918. 471002687 1598 ./etc/ssl/openssl.cnf
  919. -1208605894 895 ./etc/ssl/x509v3.cnf
  920. +993424129 1005 ./etc/ssl/x509v3.cnf
  921. 2341528463 1354 ./etc/sudoers
  922. -3811567190 2767 ./etc/sysctl.conf
  923. +3071348488 2721 ./etc/sysctl.conf
  924. 1055529673 1530 ./etc/syslog.conf
  925. 1892516430 3246 ./etc/systrace/usr_sbin_lpd
  926. -1518529974 3403 ./etc/systrace/usr_sbin_named
  927. +1470207625 3531 ./etc/systrace/usr_sbin_named
  928. 2328247655 22998 ./etc/ttys
  929. 2776652567 1680 ./etc/weekly
  930. 4174102115 474 ./etc/wsconsctl.conf
  931. @@ -156,12 +160,12 @@
  932. 4294967295 0 ./var/log/sendmail.st
  933. 4294967295 0 ./var/log/wtmp
  934. 4294967295 0 ./var/log/xferlog
  935. -2838438414 4546 ./var/mail/root
  936. +2532119393 4546 ./var/mail/root
  937. 4294967295 0 ./var/msgs/bounds
  938. 2245793152 1563 ./var/named/etc/named-dual.conf
  939. 1504362979 1351 ./var/named/etc/named-simple.conf
  940. 1504362979 1351 ./var/named/etc/named.conf
  941. -4097226550 3002 ./var/named/etc/root.hint
  942. +1453147431 3056 ./var/named/etc/root.hint
  943. 4294967295 0 ./var/named/master
  944. 4294967295 0 ./var/named/slave
  945. 4294967295 0 ./var/named/standard
  946. diff -ur etc47/var/mail/root etc48/var/mail/root
  947. --- etc47/var/mail/root Thu Mar 18 03:31:43 2010
  948. +++ etc48/var/mail/root Mon Aug 16 16:46:57 2010
  949. @@ -1,9 +1,9 @@
  950. -From deraadt@do-not-reply.openbsd.org Wed Mar 1 07:47:47 MDT 2010
  951. +From deraadt@do-not-reply.openbsd.org Wed Sep 1 07:47:47 MDT 2010
  952. Return-Path: root
  953. -Date: Mar 1 07:47:47 MDT 2010
  954. +Date: Sep 1 07:47:47 MDT 2010
  955. From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
  956. To: root
  957. -Subject: Welcome to OpenBSD 4.7!
  958. +Subject: Welcome to OpenBSD 4.8!
  959.  
  960. This message attempts to describe the most basic initial questions that a
  961. system administrator of an OpenBSD box might have. You are urged to save
  962. @@ -27,13 +27,13 @@
  963.  
  964. Several popular binary packages (pre-compiled applications) are available
  965. for most architectures. If you installed from a CD-ROM the packages
  966. -are on the same CD-ROM you installed from in the directory 4.7/packages.
  967. +are on the same CD-ROM you installed from in the directory 4.8/packages.
  968.  
  969. CD-ROM space permitted us to include a subset of the full FTP packages
  970. for the most common architectures. Please see the FTP sites to see a
  971. full list of packages for each architecture:
  972.  
  973. - ftp://ftp.openbsd.org/pub/OpenBSD/4.7/packages/
  974. + ftp://ftp.openbsd.org/pub/OpenBSD/4.8/packages/
  975.  
  976. If you do not find a package you want on the CD, please go look at your
  977. nearest FTP mirror site.
  978. @@ -41,9 +41,9 @@
  979. Select your architecture and download the tarballs of your choice. For example
  980. to install the emacs package for i386, execute:
  981. # mount /dev/cd0a /cdrom
  982. - # pkg_add -v /cdrom/4.7/packages/i386/emacs-22.3p2.tgz
  983. + # pkg_add -v /cdrom/4.8/packages/i386/emacs-22.3p6.tgz
  984. or alternatively install them via FTP this way:
  985. - # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.7/packages/i386/emacs-22.3p2.tgz
  986. + # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.8/packages/i386/emacs-22.3p6.tgz
  987.  
  988. Significant efforts were made to centralize all system configuration in the
  989. /etc directory. You should be able to find each of the configuration files
  990. diff -ur etc47/var/named/etc/root.hint etc48/var/named/etc/root.hint
  991. --- etc47/var/named/etc/root.hint Thu Mar 18 03:31:38 2010
  992. +++ etc48/var/named/etc/root.hint Mon Aug 16 16:46:52 2010
  993. @@ -1,4 +1,4 @@
  994. -; $OpenBSD: root.hint,v 1.7 2008/12/29 08:14:00 jakob Exp $
  995. +; $OpenBSD: root.hint,v 1.8 2010/06/27 22:04:33 jakob Exp $
  996. ;
  997. ; This file holds the information on root name servers needed to
  998. ; initialize cache of Internet domain name servers
  999. @@ -7,12 +7,12 @@
  1000. ;
  1001. ; This file is made available by InterNIC
  1002. ; under anonymous FTP as
  1003. -; file /domain/named.root
  1004. +; file /domain/named.cache
  1005. ; on server FTP.INTERNIC.NET
  1006. ; -OR- RS.INTERNIC.NET
  1007. ;
  1008. -; last update: Dec 12, 2008
  1009. -; related version of root zone: 2008121200
  1010. +; last update: Jun 17, 2010
  1011. +; related version of root zone: 2010061700
  1012. ;
  1013. ; formerly NS.INTERNIC.NET
  1014. ;
  1015. @@ -20,69 +20,70 @@
  1016. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4
  1017. A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30
  1018. ;
  1019. -; formerly NS1.ISI.EDU
  1020. +; FORMERLY NS1.ISI.EDU
  1021. ;
  1022. . 3600000 NS B.ROOT-SERVERS.NET.
  1023. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
  1024. ;
  1025. -; formerly C.PSI.NET
  1026. +; FORMERLY C.PSI.NET
  1027. ;
  1028. . 3600000 NS C.ROOT-SERVERS.NET.
  1029. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12
  1030. ;
  1031. -; formerly TERP.UMD.EDU
  1032. +; FORMERLY TERP.UMD.EDU
  1033. ;
  1034. . 3600000 NS D.ROOT-SERVERS.NET.
  1035. D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90
  1036. ;
  1037. -; formerly NS.NASA.GOV
  1038. +; FORMERLY NS.NASA.GOV
  1039. ;
  1040. . 3600000 NS E.ROOT-SERVERS.NET.
  1041. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10
  1042. ;
  1043. -; formerly NS.ISC.ORG
  1044. +; FORMERLY NS.ISC.ORG
  1045. ;
  1046. . 3600000 NS F.ROOT-SERVERS.NET.
  1047. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241
  1048. -F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f
  1049. +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F
  1050. ;
  1051. -; formerly NS.NIC.DDN.MIL
  1052. +; FORMERLY NS.NIC.DDN.MIL
  1053. ;
  1054. . 3600000 NS G.ROOT-SERVERS.NET.
  1055. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4
  1056. ;
  1057. -; formerly AOS.ARL.ARMY.MIL
  1058. +; FORMERLY AOS.ARL.ARMY.MIL
  1059. ;
  1060. . 3600000 NS H.ROOT-SERVERS.NET.
  1061. H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53
  1062. -H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803f:235
  1063. +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235
  1064. ;
  1065. -; formerly NIC.NORDU.NET
  1066. +; FORMERLY NIC.NORDU.NET
  1067. ;
  1068. . 3600000 NS I.ROOT-SERVERS.NET.
  1069. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
  1070. +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53
  1071. ;
  1072. -; operated by VeriSign, Inc.
  1073. +; OPERATED BY VERISIGN, INC.
  1074. ;
  1075. . 3600000 NS J.ROOT-SERVERS.NET.
  1076. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30
  1077. J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30
  1078. ;
  1079. -; operated by RIPE NCC
  1080. +; OPERATED BY RIPE NCC
  1081. ;
  1082. . 3600000 NS K.ROOT-SERVERS.NET.
  1083. -K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
  1084. -K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1
  1085. +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
  1086. +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1
  1087. ;
  1088. -; operated by ICANN
  1089. +; OPERATED BY ICANN
  1090. ;
  1091. . 3600000 NS L.ROOT-SERVERS.NET.
  1092. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42
  1093. -L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42
  1094. +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42
  1095. ;
  1096. -; operated by WIDE
  1097. +; OPERATED BY WIDE
  1098. ;
  1099. . 3600000 NS M.ROOT-SERVERS.NET.
  1100. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33
  1101. -M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35
  1102. +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35
  1103. ; End of File
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!