Update Samba 4.4.4

2016-06-22 Thread Ian Mcwilliam
Here's an update for Samba 4.4.4. Seems to be a bug fix update no CVE's seen.

https://www.samba.org/samba/history/samba-4.4.4.html

Tests welcome.

Ian McWilliam

samba-4.4.4-update.diff
Description: samba-4.4.4-update.diff


Re: `configure` reference in Porting Guide

2016-06-22 Thread Stuart Henderson
On 2016/06/22 17:24, Taylor Stearns wrote:
> Hi ports@,
> 
> The Porting Guide has a blurb about a file called `scripts/configure`
> that was removed back in 2006, from what I can tell:
> http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/infrastructure/mk/bsd.port.mk.diff?r1=1.792&r2=1.793
> 
> All uses of that file in existing ports were cleaned up by espie@ on
> 2006-11-02. Is it Ok to remove the reference from the docs?

Thanks, applied.

> 
> Index: faq/ports/guide.html
> ===
> RCS file: /cvs/www/faq/ports/guide.html,v
> retrieving revision 1.56
> diff -u -p -r1.56 guide.html
> --- faq/ports/guide.html25 Apr 2016 19:07:38 -  1.56
> +++ faq/ports/guide.html22 Jun 2016 18:44:12 -
> @@ -344,12 +344,6 @@ Add configuration options to Makefil
>  script.
> 
>  
> -You can add a port configuration script named configure to a directory named
> -scripts/.
> -This will be run before any configuration specified by 
> CONFIGURE_STYLE
> -is run.
> -
> -
>  If GNU configure is used, you may want to run ./configure --help
>  to see what options are available.
> 



`configure` reference in Porting Guide

2016-06-22 Thread Taylor Stearns
Hi ports@,

The Porting Guide has a blurb about a file called `scripts/configure`
that was removed back in 2006, from what I can tell:
http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/infrastructure/mk/bsd.port.mk.diff?r1=1.792&r2=1.793

All uses of that file in existing ports were cleaned up by espie@ on
2006-11-02. Is it Ok to remove the reference from the docs?

Index: faq/ports/guide.html
===
RCS file: /cvs/www/faq/ports/guide.html,v
retrieving revision 1.56
diff -u -p -r1.56 guide.html
--- faq/ports/guide.html25 Apr 2016 19:07:38 -  1.56
+++ faq/ports/guide.html22 Jun 2016 18:44:12 -
@@ -344,12 +344,6 @@ Add configuration options to Makefil
 script.

 
-You can add a port configuration script named configure to a directory named
-scripts/.
-This will be run before any configuration specified by CONFIGURE_STYLE
-is run.
-
-
 If GNU configure is used, you may want to run ./configure --help
 to see what options are available.



Re: [NEW] net/libmaxminddb

2016-06-22 Thread Stuart Henderson
On 2016/06/22 20:30, Frederic Cambus wrote:
> On Tue, Jun 21, 2016 at 11:55:05PM +0200, Giovanni Bechis wrote:
> 
> > there is a missing TEST_DEPENDS on devel/p5-IPC-Run3,
> > other than that ok giovanni@
> 
> Issue fixed, thanks. New tarball attached if anyone wants to import.
> 
> > > Sure, I have a script to generate the tarballs, which also checksums DB
> > > files before packing them. I'll clean it up so it can be added after
> > > import.
> > > 
> > I think it should be a new target in our Makefile, but we could work on that
> > in-tree.
> 
> Yes that's the plan, in order to have something similar to what
> net/GeoIP is doing.
> 

OK sthen@.




Re: www/apache-httpd: problem with REVISION

2016-06-22 Thread Stuart Henderson
On 2016/06/22 20:05, Markus Lude wrote:
> Hello,
> 
> while building the package with Makefile 1.78 I got the following error
> message:
> 
> ===>  Building package for apache-httpd-2.4.20p0
> Create /usr/ports/packages/sparc64/all/apache-httpd-2.4.20p0.tgz
> Found newer package apache-httpd-2.4.20p1 in /usr/ports/plist/sparc64
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1895 
> '/usr/ports/packages/sparc64/all/apache-httpd-2.4.20p0.tgz')
> 
> 
> sabaki:/usr/ports/www/apache-httpd> ll 
> /usr/ports/plist/sparc64/apache-httpd-*20p1
> -rw-r--r--  1 markus  wsrc  58642 May 31 14:47 
> /usr/ports/plist/sparc64/apache-httpd-2.4.20p1
> -rw-r--r--  1 markus  wsrc   4783 Apr 30 17:15 
> /usr/ports/plist/sparc64/apache-httpd-common-2.4.20p1

Oops, sorry I missed this when reviewing.

> I think the problem is:
> REVISION=   1
> 
> is this used for both subpackages?

REVISION is for all subpackages unless overridden.

> There is also
> REVISION-main=  0
> which makes sense for the -main sub package only.
> 
> Maybe we should move to this?
> REVISION-main=  2
> REVISION-common=  2

-common can stay the same. Actually, now that apache-httpd-openbsd has gone
we can merge -common back in and just have the one package, but that can
wait until we're done with 6.0 as it will mean bumps to dependent ports.



Re: www/apache-httpd: problem with REVISION

2016-06-22 Thread Antoine Jacoutot
I am stupid. Fixing in a few... thanks.


Re: [NEW] net/libmaxminddb

2016-06-22 Thread Frederic Cambus
On Tue, Jun 21, 2016 at 11:55:05PM +0200, Giovanni Bechis wrote:

> there is a missing TEST_DEPENDS on devel/p5-IPC-Run3,
> other than that ok giovanni@

Issue fixed, thanks. New tarball attached if anyone wants to import.

> > Sure, I have a script to generate the tarballs, which also checksums DB
> > files before packing them. I'll clean it up so it can be added after
> > import.
> > 
> I think it should be a new target in our Makefile, but we could work on that
> in-tree.

Yes that's the plan, in order to have something similar to what
net/GeoIP is doing.



libmaxminddb.tar.gz
Description: application/tar-gz


Re: [NEW] emulators/hatari

2016-06-22 Thread Adam Wolk
On Wed, 22 Jun 2016 13:01:47 +0200
Frederic Cambus  wrote:

> On Wed, Jun 15, 2016 at 01:53:29AM +0200, Frederic Cambus wrote:
> 
> > > > Here is a new tarball with these modifications in. Thanks for
> > > > testing.  
> > > 
> > > ok bentley@  
> > 
> > Anyone willing to test the port and give a second OK?  
> 
> Updated tarball adding a patch to make detecting and using optional 
> dependencies (portaudio and capsimage) opt-in, and disabled by
> default. Issue was spotted by awolk@.
> 
> For the record, portaudio is only useful for microphone input
> emulation in Falcon mode, so it doesn't make sense to add a
> dependency for such an edge case.
> 

I think the CMakeLists in this port still need some work. It tries to
touch stuff outside the fake directory on `make fake` step.
Linker in this case.

$ ag execute_process 
CMakeLists.txt
151:execute_process(COMMAND getconf LFS_CFLAGS
162: execute_process(COMMAND pkg-config --cflags-only-other sdl2
166: execute_process(COMMAND pkg-config --cflags-only-other sdl

share/CMakeLists.txt
8:   install(CODE "execute_process(COMMAND ln -sf 
application-x-st-disk-image.png
19:  install(CODE "execute_process(COMMAND ln -sf 
application-x-st-disk-image.svg

cmake/Uninstall.cmake
17:execute_process(
30:execute_process(

cmake/Toolchain-mingw32-win64_64.cmake
24:EXECUTE_PROCESS(

cmake/Toolchain-mingw32-win64_32.cmake
24:EXECUTE_PROCESS(

CMakeLists.txt.orig
143:execute_process(COMMAND getconf LFS_CFLAGS
154: execute_process(COMMAND pkg-config --cflags-only-other sdl2
158: execute_process(COMMAND pkg-config --cflags-only-other sdl
$ pwd
/usr/ports/pobj/hatari-1.9.0/hatari-1.9.0


---


-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/man/man1/hatariui.1.gz
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/32x32/apps/hatari.png
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/32x32/mimetypes/application-x-st-disk-image.png
ln: 
/usr/local/share/icons/hicolor/32x32/mimetypes/application-vnd.msa-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/32x32/mimetypes/application-vnd.fastcopy-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/32x32/mimetypes/application-x-stx-disk-image.png:
 Permission denied
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/48x48/apps/hatari.png
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/48x48/mimetypes/application-x-st-disk-image.png
ln: 
/usr/local/share/icons/hicolor/48x48/mimetypes/application-vnd.msa-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/48x48/mimetypes/application-vnd.fastcopy-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/48x48/mimetypes/application-x-stx-disk-image.png:
 Permission denied
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/64x64/apps/hatari.png
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/64x64/mimetypes/application-x-st-disk-image.png
ln: 
/usr/local/share/icons/hicolor/64x64/mimetypes/application-vnd.msa-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/64x64/mimetypes/application-vnd.fastcopy-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/64x64/mimetypes/application-x-stx-disk-image.png:
 Permission denied
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/128x128/apps/hatari.png
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/128x128/mimetypes/application-x-st-disk-image.png
ln: 
/usr/local/share/icons/hicolor/128x128/mimetypes/application-vnd.msa-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/128x128/mimetypes/application-vnd.fastcopy-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/128x128/mimetypes/application-x-stx-disk-image.png:
 Permission denied
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/256x256/apps/hatari.png
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/256x256/mimetypes/application-x-st-disk-image.png
ln: 
/usr/local/share/icons/hicolor/256x256/mimetypes/application-vnd.msa-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/256x256/mimetypes/application-vnd.fastcopy-disk-image.png:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/256x256/mimetypes/application-x-stx-disk-image.png:
 Permission denied
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/scalable/apps/hatari.svg
-- Installing: 
/usr/ports/pobj/hatari-1.9.0/fake-amd64/usr/local/share/icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg
ln: 
/usr/local/share/icons/hicolor/scalable/mimetypes/application-vnd.msa-disk-image.svg:
 Permission denied
ln: 
/usr/local/share/icons/hicolor/sc

www/apache-httpd: problem with REVISION

2016-06-22 Thread Markus Lude
Hello,

while building the package with Makefile 1.78 I got the following error
message:

===>  Building package for apache-httpd-2.4.20p0
Create /usr/ports/packages/sparc64/all/apache-httpd-2.4.20p0.tgz
Found newer package apache-httpd-2.4.20p1 in /usr/ports/plist/sparc64
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1895 
'/usr/ports/packages/sparc64/all/apache-httpd-2.4.20p0.tgz')


sabaki:/usr/ports/www/apache-httpd> ll 
/usr/ports/plist/sparc64/apache-httpd-*20p1
-rw-r--r--  1 markus  wsrc  58642 May 31 14:47 
/usr/ports/plist/sparc64/apache-httpd-2.4.20p1
-rw-r--r--  1 markus  wsrc   4783 Apr 30 17:15 
/usr/ports/plist/sparc64/apache-httpd-common-2.4.20p1

I think the problem is:
REVISION=   1

is this used for both subpackages?

There is also
REVISION-main=  0
which makes sense for the -main sub package only.

Maybe we should move to this?
REVISION-main=  2
REVISION-common=  2

Regards,
Markus



Re: [NEW] emulators/hatari

2016-06-22 Thread Frederic Cambus
On Wed, Jun 15, 2016 at 01:53:29AM +0200, Frederic Cambus wrote:

> > > Here is a new tarball with these modifications in. Thanks for testing.
> > 
> > ok bentley@
> 
> Anyone willing to test the port and give a second OK?

Updated tarball adding a patch to make detecting and using optional 
dependencies (portaudio and capsimage) opt-in, and disabled by default.
Issue was spotted by awolk@.

For the record, portaudio is only useful for microphone input emulation
in Falcon mode, so it doesn't make sense to add a dependency for such
an edge case.



hatari.tar.gz
Description: application/tar-gz


maintainer update to libetpan-1.7.2

2016-06-22 Thread Daniel Jakots
Hi,

Here's an update to latest libetpan release. All patchs were
merged upstream. A major bump is required (and was done upstream too)
as some functions were removed.

Comments? OK?

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/mail/libetpan/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile1 May 2016 20:11:16 -   1.21
+++ Makefile22 Jun 2016 10:46:56 -
@@ -4,10 +4,10 @@ COMMENT=  mail purpose library
 
 GH_ACCOUNT=dinhviethoa
 GH_PROJECT=libetpan
-GH_TAGNAME=1.7
+GH_TAGNAME=1.7.2
 CATEGORIES=mail devel
 
-SHARED_LIBS=   etpan   16.0
+SHARED_LIBS=   etpan   17.0# 20.0
 
 HOMEPAGE=  http://www.etpan.org/libetpan.html
 
Index: distinfo
===
RCS file: /cvs/ports/mail/libetpan/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo1 May 2016 20:11:16 -   1.8
+++ distinfo22 Jun 2016 10:46:56 -
@@ -1,2 +1,2 @@
-SHA256 (libetpan-1.7.tar.gz) = R9DASditzc/QaY6fH8uFQWsLL0du7R9SqucsKIPPBbA=
-SIZE (libetpan-1.7.tar.gz) = 6184289
+SHA256 (libetpan-1.7.2.tar.gz) = MnlygqQg8xdPSmeVSOIPortKy0BLgn1iwvRNPeTrMSA=
+SIZE (libetpan-1.7.2.tar.gz) = 6186628
Index: patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
===
RCS file: patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
diff -N patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
--- patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
16 May 2016 16:06:28 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_driver_implementation_mh_mhdriver_cached_message_c,v 1.2 
2016/05/16 16:06:28 danj Exp $
-
-Committed upstream
-https://github.com/dinhviethoa/libetpan/commit/a8d2f243509939b6c5cb5360f1796f1eb7698fde
-
 src/driver/implementation/mh/mhdriver_cached_message.c.origFri Oct 
31 22:41:02 2014
-+++ src/driver/implementation/mh/mhdriver_cached_message.c Thu Sep 17 
20:27:20 2015
-@@ -187,8 +187,8 @@ static int mh_initialize(mailmessage * msg_info)
-   
-   mh_msg_info = data.data;
- 
--  snprintf(static_uid, PATH_MAX, "%u-%lu-%lu", msg_info->msg_index,
-- mh_msg_info->msg_mtime, (unsigned long) mh_msg_info->msg_size);
-+  snprintf(static_uid, PATH_MAX, "%u-%lld-%zu", msg_info->msg_index,
-+   (long long)mh_msg_info->msg_mtime, mh_msg_info->msg_size);
-   uid = strdup(static_uid);
-   if (uid == NULL)
- return MAIL_ERROR_MEMORY;
Index: patches/patch-src_low-level_feed_parser_c
===
RCS file: patches/patch-src_low-level_feed_parser_c
diff -N patches/patch-src_low-level_feed_parser_c
--- patches/patch-src_low-level_feed_parser_c   2 May 2016 06:23:19 -   
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_low-level_feed_parser_c,v 1.3 2016/05/02 06:23:19 danj Exp 
$
-
-Committed upstream:
-https://github.com/dinhviethoa/libetpan/commit/49c9f8c759d6ba2ec8596bf4d95f505a0ab23045
-
 src/low-level/feed/parser.c.orig   Mon May 31 12:57:17 2010
-+++ src/low-level/feed/parser.cMon May 31 12:57:37 2010
-@@ -230,7 +230,7 @@ static int iconv_utf32_char(iconv_t cd, const char * i
- return LEP_ICONV_OK;
-   }
- #else
--  return LEP_ICONV_FAIL;
-+  return LEP_ICONV_FAILED;
- #endif
- }
- 
Index: patches/patch-src_low-level_mime_mailmime_types_helper_c
===
RCS file: patches/patch-src_low-level_mime_mailmime_types_helper_c
diff -N patches/patch-src_low-level_mime_mailmime_types_helper_c
--- patches/patch-src_low-level_mime_mailmime_types_helper_c16 May 2016 
16:06:28 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_low-level_mime_mailmime_types_helper_c,v 1.2 2016/05/16 
16:06:28 danj Exp $
-
-Committed upstream
-https://github.com/dinhviethoa/libetpan/commit/a8d2f243509939b6c5cb5360f1796f1eb7698fde
-
 src/low-level/mime/mailmime_types_helper.c.origThu Sep 17 19:02:07 2015
-+++ src/low-level/mime/mailmime_types_helper.c Thu Sep 17 19:02:32 2015
-@@ -518,7 +518,7 @@ char * mailmime_generate_boundary(void)
-   value = random();
- 
-   gethostname(name, MAX_MESSAGE_ID);
--  snprintf(id, MAX_MESSAGE_ID, "%lx_%lx_%x", now, value, getpid());
-+  snprintf(id, MAX_MESSAGE_ID, "%llx_%lx_%x", (long long)now, value, 
getpid());
- 
-   return strdup(id);
- }
Index: patches/patch-tests_mime-create_c
===
RCS file: patches/patch-tests_mime-create_c
diff -N patches/patch-tests_mime-create_c
--- patches/patch-tests_mime-create_c   16 May 2016 16:06:28 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-tests_

Re: apache2 fails with rc.d (but actually starts)

2016-06-22 Thread Antoine Jacoutot
On Tue, Jun 21, 2016 at 05:57:40PM -0400, Johan Huldtgren wrote:
> hello,
> 
> when the old openbsd apache went away recently I swapped to apache2
> for the one site I have which still needs it, while it works, when it
> gets started at boot (or if I wish to restart it), using rc.d or rcctl
> will report a failure, but it will start nonetheless. If I use
> apachectl2 it starts without issue. Using -d to rcctl produces nothing
> obviously wrong (as far as I can tell). My httpd2.conf is barely
> changed from the default one shipped (diff below), the only
> substantial changes are that mod_rewrite and mod_perl are active and
> there is one virtual host (but removing all those does not change the
> behavior). Since apache seems happy with the config and it runs, turning up
> debugging or syntax checks haven't produced anything useful. I don't know
> if there is any additional debugging I can set for rcctl which would be
> helpful.
> 
> If anybody has any ideas I'd appreciate it, while it's not a huge
> issue it's a bit unnerving to see apache2 being reported as not running
> each morning in the daily mail.

Should be fixed in current.
Thanks for the report.


> 
> thanks,
> 
> .jh
> 
> 
> # rcctl -d start apache2
> doing _rc_parse_conf
> doing _rc_quirks
> apache2_flags empty, using default ><
> doing _rc_parse_conf /var/run/rc.d/apache2
> doing _rc_quirks
> doing rc_check
> apache2
> doing rc_start
> doing _rc_wait start
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing rc_check
> doing _rc_rm_runfile
> (failed)
> 
> # ps auxww | grep httpd
> root  4803  0.0  0.2 19940 31124 ??  Ss 2:30PM0:00.54 httpd2:
> /usr/local/sbin/httpd2
> www  96364  0.0  0.0 19816  3616 ??  I  2:30PM0:00.05 httpd2:
> /usr/local/sbin/httpd2
> www  92392  0.0  0.0 19816  3656 ??  I  2:30PM0:00.05 httpd2:
> /usr/local/sbin/httpd2
> www  60610  0.0  0.0 19816  3588 ??  I  2:30PM0:00.03 httpd2:
> /usr/local/sbin/httpd2
> www  45996  0.0  0.0 19816  3580 ??  I  2:30PM0:00.05 httpd2:
> /usr/local/sbin/httpd2
> www  90635  0.0  0.0 19816  3548 ??  I  2:30PM0:00.02 httpd2:
> /usr/local/sbin/httpd2
> root 42612  0.0  0.0   172   364 p2  R+ 2:30PM0:00.00 grep httpd
> 
> # apachectl2 -t
> 
> Syntax OK
> 
> # diff -u /usr/local/share/examples/apache2/conf/httpd2.conf
> /etc/apache2/httpd2.conf
> --- /usr/local/share/examples/apache2/conf/httpd2.conf  Mon Jun 13 08:19:54
> 2016
> +++ /etc/apache2/httpd2.confTue Jun 21 14:28:14 2016
> @@ -49,7 +49,7 @@
>  # prevent Apache from glomming onto all bound IP addresses.
>  #
>  #Listen 12.34.56.78:80
> -Listen 80
> +Listen 127.0.0.1:80
> 
>  #
>  # Dynamic Shared Object (DSO) Support
> @@ -172,7 +172,8 @@
>  #LoadModule speling_module /usr/local/lib/apache2/mod_speling.so
>  #LoadModule userdir_module /usr/local/lib/apache2/mod_userdir.so
>  LoadModule alias_module /usr/local/lib/apache2/mod_alias.so
> -#LoadModule rewrite_module /usr/local/lib/apache2/mod_rewrite.so
> +LoadModule rewrite_module /usr/local/lib/apache2/mod_rewrite.so
> +LoadModule perl_module /usr/local/lib/apache2/mod_perl.so
> 
>  
>  #
> @@ -205,7 +206,7 @@
>  # e-mailed.  This address appears on some server-generated pages, such
>  # as error documents.  e.g. ad...@your-domain.com
>  #
> -ServerAdmin y...@example.com
> +ServerAdmin hostmas...@mysite.com
> 
>  #
>  # ServerName gives the name and port that the server uses to identify
> itself.
> @@ -214,7 +215,7 @@
>  #
>  # If your host doesn't have a registered DNS name, enter its IP address
> here.
>  #
> -#ServerName www.example.com:80
> +ServerName www.mysite.com
> 
>  #
>  # Deny access to the entirety of your server's filesystem. You must
> @@ -238,8 +239,8 @@
>  # documents. By default, all requests are taken from this directory, but
>  # symbolic links and aliases may be used to point to other locations.
>  #
> -DocumentRoot "/var/www/htdocs"
> -
> +DocumentRoot "/var/www/htdocs_www"
> +
>  #
>  # Possible values for the Options directive are "None", "All",
>  # or any combination of:
> @@ -290,7 +291,7 @@
>  # logged here.  If you *do* define an error logfile for a 
>  # container, that host's errors will be logged there and not here.
>  #
> -ErrorLog "logs/error_log"
> +ErrorLog "logs/default/error_apache.log"
> 
>  #
>  # LogLevel: Control the number of messages logged to the error_log.
> @@ -319,7 +320,7 @@
>  # define per- access logfiles, transactions will be
>  # logged therein and *not* in this file.
>  #
> -Cust