Merge branch '2.2' into 2.3

This commit is contained in:
Juergen Daubert 2007-03-15 17:03:10 +01:00
commit d2c767cc69
15 changed files with 35 additions and 37 deletions

View File

@ -1,3 +1,3 @@
01b6a755c5b0fb7df2d2c94571f67e1d cups 01b6a755c5b0fb7df2d2c94571f67e1d cups
d2cc0604113d5300b7b3e823b660d04a cups-1.2.8-source.tar.bz2 73433d7e8c04b66702732928aaf087b8 cups-1.2.9-source.tar.bz2
2220f411940c4f7504ed4457c6304d4a cups-config.patch 2220f411940c4f7504ed4457c6304d4a cups-config.patch

View File

@ -4,7 +4,7 @@
# Depends on: libpng, libtiff, openssl # Depends on: libpng, libtiff, openssl
name=cups name=cups
version=1.2.8 version=1.2.9
release=1 release=1
source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 \ source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 \
cups-config.patch cups) cups-config.patch cups)

View File

@ -1,3 +1,3 @@
1c37d911bc42fb40f0ef5a3f5822b170 dovecot 1c37d911bc42fb40f0ef5a3f5822b170 dovecot
2f6fb150c60a8f9c0bad12c5fb2b1d15 dovecot-1.0.rc26.tar.gz 2bc18491c869e0b298ef114d07cdbb46 dovecot-1.0.rc27.tar.gz
66ba2a6d25ed70dbfe251a79d15758e0 dovecot-config.patch 944edb11743df46699980ab369fdf7e8 dovecot-config.patch

View File

@ -4,7 +4,7 @@
# Depends on: openssl # Depends on: openssl
name=dovecot name=dovecot
version=1.0.rc26 version=1.0.rc27
release=1 release=1
source=(http://dovecot.org/releases/$name-$version.tar.gz \ source=(http://dovecot.org/releases/$name-$version.tar.gz \
dovecot-config.patch dovecot) dovecot-config.patch dovecot)

View File

@ -1,6 +1,6 @@
diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-example.conf diff -Nru dovecot-1.0.rc27.orig/dovecot-example.conf dovecot-1.0.rc27/dovecot-example.conf
--- dovecot-1.0.rc26.orig/dovecot-example.conf 2007-03-07 07:10:26.000000000 +0100 --- dovecot-1.0.rc27.orig/dovecot-example.conf 2007-03-13 21:58:31.000000000 +0100
+++ dovecot-1.0.rc26/dovecot-example.conf 2007-03-07 07:10:39.000000000 +0100 +++ dovecot-1.0.rc27/dovecot-example.conf 2007-03-13 21:59:01.000000000 +0100
@@ -13,11 +13,11 @@ @@ -13,11 +13,11 @@
# --with-ssldir=/etc/ssl # --with-ssldir=/etc/ssl
@ -26,7 +26,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# If key file is password protected, give the password here. Alternatively # If key file is password protected, give the password here. Alternatively
# give it when starting dovecot with -p parameter. # give it when starting dovecot with -p parameter.
@@ -122,7 +122,7 @@ @@ -125,7 +125,7 @@
# which login needs to be able to connect to. The sockets are created when # which login needs to be able to connect to. The sockets are created when
# running as root, so you don't have to worry about permissions. Note that # running as root, so you don't have to worry about permissions. Note that
# everything in this directory is deleted when Dovecot is started. # everything in this directory is deleted when Dovecot is started.
@ -35,7 +35,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# chroot login process to the login_dir. Only reason not to do this is if you # chroot login process to the login_dir. Only reason not to do this is if you
# wish to run the whole Dovecot without roots. # wish to run the whole Dovecot without roots.
@@ -134,7 +134,7 @@ @@ -137,7 +137,7 @@
# only it has access, it's used to control access for authentication process. # only it has access, it's used to control access for authentication process.
# Note that this user is NOT used to access mails. # Note that this user is NOT used to access mails.
# http://wiki.dovecot.org/UserIds # http://wiki.dovecot.org/UserIds
@ -44,7 +44,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# Set max. process size in megabytes. If you don't use # Set max. process size in megabytes. If you don't use
# login_process_per_connection you might need to grow this. # login_process_per_connection you might need to grow this.
@@ -144,10 +144,10 @@ @@ -147,10 +147,10 @@
# login process be allowed to process multiple connections (no)? Yes is more # login process be allowed to process multiple connections (no)? Yes is more
# secure, espcially with SSL/TLS enabled. No is faster since there's no need # secure, espcially with SSL/TLS enabled. No is faster since there's no need
# to create processes all the time. # to create processes all the time.
@ -57,7 +57,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# Maximum number of login processes to create. The listening process count # Maximum number of login processes to create. The listening process count
# usually stays at login_processes_count, but when multiple users start logging # usually stays at login_processes_count, but when multiple users start logging
@@ -205,7 +205,7 @@ @@ -208,7 +208,7 @@
# #
# http://wiki.dovecot.org/MailLocation # http://wiki.dovecot.org/MailLocation
# #
@ -66,7 +66,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# If you need to set multiple mailbox locations or want to change default # If you need to set multiple mailbox locations or want to change default
# namespace settings, you can do it by defining namespace sections: # namespace settings, you can do it by defining namespace sections:
@@ -313,7 +313,7 @@ @@ -321,7 +321,7 @@
# non-valid GID as primary group ID aren't allowed to log in. If user # non-valid GID as primary group ID aren't allowed to log in. If user
# belongs to supplementary groups with non-valid GIDs, those groups are # belongs to supplementary groups with non-valid GIDs, those groups are
# not set. # not set.
@ -75,7 +75,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
#last_valid_gid = 0 #last_valid_gid = 0
# Maximum number of running mail processes. When this limit is reached, # Maximum number of running mail processes. When this limit is reached,
@@ -489,19 +489,19 @@ @@ -497,19 +497,19 @@
protocol imap { protocol imap {
# Login executable location. # Login executable location.
@ -99,7 +99,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# Maximum IMAP command line length in bytes. Some clients generate very long # Maximum IMAP command line length in bytes. Some clients generate very long
# command lines with huge mailboxes, so you may need to raise this if you get # command lines with huge mailboxes, so you may need to raise this if you get
@@ -554,11 +554,11 @@ @@ -562,11 +562,11 @@
protocol pop3 { protocol pop3 {
# Login executable location. # Login executable location.
@ -113,7 +113,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# Don't try to set mails non-recent or seen with POP3 sessions. This is # Don't try to set mails non-recent or seen with POP3 sessions. This is
# mostly intended to reduce disk I/O. With maildir it doesn't move files # mostly intended to reduce disk I/O. With maildir it doesn't move files
@@ -603,7 +603,7 @@ @@ -611,7 +611,7 @@
# installations. %08Xu%08Xv will be the new default, so use it for new # installations. %08Xu%08Xv will be the new default, so use it for new
# installations. # installations.
# #
@ -122,7 +122,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# POP3 logout format string: # POP3 logout format string:
# %t - number of TOP commands # %t - number of TOP commands
@@ -649,7 +649,7 @@ @@ -657,7 +657,7 @@
#mail_plugin_dir = /usr/lib/dovecot/lda #mail_plugin_dir = /usr/lib/dovecot/lda
# Binary to use for sending mails. # Binary to use for sending mails.
@ -131,7 +131,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# UNIX socket path to master authentication server to find users. # UNIX socket path to master authentication server to find users.
#auth_socket_path = /var/run/dovecot/auth-master #auth_socket_path = /var/run/dovecot/auth-master
@@ -660,7 +660,7 @@ @@ -668,7 +668,7 @@
## ##
# Executable location # Executable location
@ -140,7 +140,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# Set max. process size in megabytes. # Set max. process size in megabytes.
#auth_process_size = 256 #auth_process_size = 256
@@ -774,7 +774,7 @@ @@ -782,7 +782,7 @@
# REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
# authentication to actually work. # authentication to actually work.
# http://wiki.dovecot.org/PasswordDatabase/PAM # http://wiki.dovecot.org/PasswordDatabase/PAM
@ -149,7 +149,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# [blocking=yes] [session=yes] [setcred=yes] # [blocking=yes] [session=yes] [setcred=yes]
# [cache_key=<key>] [<service name>] # [cache_key=<key>] [<service name>]
# #
@@ -807,7 +807,7 @@ @@ -815,7 +815,7 @@
# args = session=yes * # args = session=yes *
# args = cache_key=%u dovecot # args = cache_key=%u dovecot
#args = dovecot #args = dovecot
@ -158,7 +158,7 @@ diff -Nru dovecot-1.0.rc26.orig/dovecot-example.conf dovecot-1.0.rc26/dovecot-ex
# /etc/passwd or similar, using getpwnam() # /etc/passwd or similar, using getpwnam()
# In many systems nowadays this uses Name Service Switch, which is # In many systems nowadays this uses Name Service Switch, which is
@@ -822,8 +822,8 @@ @@ -830,8 +830,8 @@
# /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays. # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
# http://wiki.dovecot.org/PasswordDatabase/Shadow # http://wiki.dovecot.org/PasswordDatabase/Shadow

View File

@ -1,2 +1,2 @@
4ec87a3da20c1b433ffbe0ffe3675fcd espgs-8.15.3-source.tar.bz2 e74e0463e0bfb1cea3db245d8e71828c espgs-8.15.4-source.tar.bz2
6865682b095f8c4500c54b285ff05ef6 ghostscript-fonts-std-8.11.tar.gz 6865682b095f8c4500c54b285ff05ef6 ghostscript-fonts-std-8.11.tar.gz

View File

@ -4,9 +4,9 @@
# Depends on: cups, fontconfig, xorg-libxt, xorg-libxext # Depends on: cups, fontconfig, xorg-libxt, xorg-libxext
name=ghostscript name=ghostscript
version=8.15.3 version=8.15.4
release=2 release=1
source=(ftp://ftp3.easysw.com/pub/$name/$version/espgs-$version-source.tar.bz2 \ source=(http://ftp.easysw.com/pub/$name/$version/espgs-$version-source.tar.bz2 \
http://dl.sourceforge.net/sourceforge/gs-fonts/$name-fonts-std-8.11.tar.gz) http://dl.sourceforge.net/sourceforge/gs-fonts/$name-fonts-std-8.11.tar.gz)
build () { build () {

View File

@ -1 +1 @@
23d2494aa94e7ae1ecbbb8c5e1507683 ruby-1.8.6.tar.gz e558a0e00ae318d43bf6ff9af452bad2 ruby-1.8.6.tar.bz2

View File

@ -6,7 +6,7 @@
name=ruby-doc name=ruby-doc
version=1.8.6 version=1.8.6
release=1 release=1
source=(ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-$version.tar.gz) source=(ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-$version.tar.bz2)
build () { build () {
cd ruby-$version cd ruby-$version

View File

@ -1,2 +1,2 @@
23d2494aa94e7ae1ecbbb8c5e1507683 ruby-1.8.6.tar.gz e558a0e00ae318d43bf6ff9af452bad2 ruby-1.8.6.tar.bz2
b1a97a51713c76db5a8eb211aee9ca99 ruby-arch.patch b1a97a51713c76db5a8eb211aee9ca99 ruby-arch.patch

View File

@ -6,7 +6,7 @@
name=ruby name=ruby
version=1.8.6 version=1.8.6
release=1 release=1
source=(ftp://ftp.ruby-lang.org/pub/$name/1.8/$name-$version.tar.gz \ source=(ftp://ftp.ruby-lang.org/pub/$name/1.8/$name-$version.tar.bz2 \
$name-arch.patch) $name-arch.patch)
build () { build () {

View File

@ -306,6 +306,8 @@ drwxr-xr-x root/root usr/lib/thunderbird/icons/
-rwxr-xr-x root/root usr/lib/thunderbird/icons/mozicon50.xpm -rwxr-xr-x root/root usr/lib/thunderbird/icons/mozicon50.xpm
drwxr-xr-x root/root usr/lib/thunderbird/init.d/ drwxr-xr-x root/root usr/lib/thunderbird/init.d/
-rw-r--r-- root/root usr/lib/thunderbird/init.d/README -rw-r--r-- root/root usr/lib/thunderbird/init.d/README
-rw-r--r-- root/root usr/lib/thunderbird/libfreebl3.chk
-rwxr-xr-x root/root usr/lib/thunderbird/libfreebl3.so
-rwxr-xr-x root/root usr/lib/thunderbird/libgfxpsshar.so -rwxr-xr-x root/root usr/lib/thunderbird/libgfxpsshar.so
-rwxr-xr-x root/root usr/lib/thunderbird/libgkgfx.so -rwxr-xr-x root/root usr/lib/thunderbird/libgkgfx.so
-rwxr-xr-x root/root usr/lib/thunderbird/libgtkembedmoz.so -rwxr-xr-x root/root usr/lib/thunderbird/libgtkembedmoz.so

View File

@ -1,2 +1,2 @@
f346e07ab1a6ecb55cc7f08fda1306ce mozconfig e8f478e4b74d5f57651fb145df6021ba mozconfig
bb74629a8d99a6653c5ab978cf9c6227 thunderbird-1.5.0.9-source.tar.bz2 65087f8a7adb0773ae7198ec21cc2975 thunderbird-1.5.0.10-source.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: libidl, gtk, libjpeg, libpng, zlib, expat # Depends on: libidl, gtk, libjpeg, libpng, zlib, expat
name=thunderbird name=thunderbird
version=1.5.0.9 version=1.5.0.10
release=1 release=1
source=(http://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version-source.tar.bz2 \ source=(http://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version-source.tar.bz2 \
mozconfig) mozconfig)

View File

@ -1,10 +1,6 @@
. $topsrcdir/mail/config/mozconfig . $topsrcdir/mail/config/mozconfig
export BUILD_OFFICIAL=1 ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
ac_add_options --disable-debug ac_add_options --disable-debug
ac_add_options --enable-optimize="#CFLAGS#" ac_add_options --enable-optimize="#CFLAGS#"