Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.20 grimoire by Eric Sandall (7f2fb142960ca254d027ddcecccd8be3db48394c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.20 grimoire by Eric Sandall (7f2fb142960ca254d027ddcecccd8be3db48394c)
  • Date: Tue, 13 May 2008 17:55:56 -0500

GIT changes to stable-0.20 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

VERSION | 2
graphics-libs/libpng/DEPENDS | 5
graphics-libs/libpng/DETAILS | 4
graphics-libs/libpng/HISTORY | 6
graphics-libs/libpng/PRE_BUILD | 3
kernels/linux/DETAILS | 1
kernels/linux/HISTORY | 9
kernels/linux/info/kernels/2.6.25 | 3
kernels/linux/info/patches/maintenance_patches/patch-2.6.25 | 5
kernels/linux/info/patches/maintenance_patches/patch-2.6.25.3 | 6
kernels/linux/latest.defaults | 4
mail/thunderbird/DETAILS | 4
mail/thunderbird/HISTORY | 5
mail/thunderbird/PRE_BUILD | 2
mail/thunderbird/gcc43.patch | 1618
----------
php-pear/php/DETAILS | 15
php-pear/php/HISTORY | 14
php-pear/php/PRE_BUILD | 5
shell-term-fm/rdesktop/DETAILS | 5
shell-term-fm/rdesktop/HISTORY | 3
video/vlc/DETAILS | 6
video/vlc/HISTORY | 3
22 files changed, 85 insertions(+), 1643 deletions(-)

New commits:
commit 7f2fb142960ca254d027ddcecccd8be3db48394c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

VERSION: 0.20-2

commit 6ac0580ae70b365643f9e32d1c78627220fefd04
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

linux 2.6.25.3

commit bf92289bfbb452d2b0b145907fed85ff281e86c3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

linux: => 2.6.25

commit 791887ecbc6fbc13a3364564351eab507b8aab71
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

vlc 0.8.6g, SECURITY_PATCH=6

commit fcdb628c7d0718a6edcd3dd8f6ddcbd6b79d13d9
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

rdesktop 1.6.0
(cherry picked from commit 4c7228294761fe473c9fdb5b1ccc85e8a15269ff)

commit 8907ac2cbe2c98ad3dfa4f4de577a993c2dc496a
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird: Updated to version 2.0.0.14. SECURITY_PATCH++
Removed incorporated gcc43 patch.
(cherry picked from commit 95478334ca557645e328fccc6e5f3a03fc6f1ffe)

commit 2cffb777cb307bb0b6e22de37ace55dea8df3f33
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

php-pear/php: changed SOURCE_URL for suhosin patch; made PRE_BUILD apply
it properly
(cherry picked from commit e1c34e68f57051a5be2802dfb235ce284413ff99)

commit 9f3cdc7e81773738ea9f100fc6da5c02277bfae1
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

php 5.2.6, SECURITY_PATCH=7 [Bug 14506]

commit 39c8e89c3a833195f732a10cbd97fd67924e9c40
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libpng: Added a depends for autogen.sh
(cherry picked from commit 0e28552565251056456364b76943ad9c53a8fa35)

commit d68e38f6f5c3d6c51942fe1b21e49a9d6172463b
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libpng: Downgraded to latest stable version 1.28. Patch
for ani png's applies and builds. Added fix from gentoo
for borken Makefile.am. Fixes Bug #14486.

diff --git a/VERSION b/VERSION
index b85c139..f0407d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.20-1
+0.20-2
diff --git a/graphics-libs/libpng/DEPENDS b/graphics-libs/libpng/DEPENDS
index c83dcf6..d7c6ba8 100755
--- a/graphics-libs/libpng/DEPENDS
+++ b/graphics-libs/libpng/DEPENDS
@@ -1,2 +1,5 @@
-depends pkgconfig &&
+depends pkgconfig &&
+depends autoconf &&
+depends automake &&
+depends libtool &&
depends zlib
diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index acad0b4..7d1e072 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,6 +1,6 @@
SPELL=libpng
- VERSION=1.2.27beta01
-
SOURCE_HASH=sha512:ab785c5c31533525e66093fa2a70fbfa4a7aa23fee5aea6af592da41dbdd845f6084e5ce3f7cfffd3554043721335bbdc7a7f191f4cef13de4208cd744129787
+ VERSION=1.2.28
+
SOURCE_HASH=sha512:ccb161e67c8afb73d816a26ea067ea14521e057f3c8816ee5152772edec4f549b15d22938ac7c0b0ca24f9b7a56e757ab5b2156ee4c00ac9e3a66eb2e0ae2a3a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index a6c22fb..34a5491 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,9 @@
+2008-05-03 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Downgraded to 1.2.28.
+ * DEPENDS: Added autoconf, automake, libtool for autogen.sh.
+ * PRE_BUILD: Added fix from gentoo for broken Makefile.am.
+ Patch for ani png applies. Fixes Bug #14486.
+
2008-04-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: updated to 1.2.27beta01 to fix
http://libpng.sourceforge.net/Advisory-1.2.26.txt
diff --git a/graphics-libs/libpng/PRE_BUILD b/graphics-libs/libpng/PRE_BUILD
index 00ad845..c8bd829 100755
--- a/graphics-libs/libpng/PRE_BUILD
+++ b/graphics-libs/libpng/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&

+sed -i 's:$(ECHO):echo:' Makefile.am &&
+NOCONFIGURE=yes ./autogen.sh &&
+
if [[ $ANI_PNG == y ]]; then
cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/libpng-1.2.24-apng.patch
diff --git a/kernels/linux/DETAILS b/kernels/linux/DETAILS
index 97fe568..f906463 100755
--- a/kernels/linux/DETAILS
+++ b/kernels/linux/DETAILS
@@ -1,4 +1,3 @@
-
SPELL=linux
TMPFS=0
# variables we set
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 2b5c522..3d0394d 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,12 @@
+2008-05-10 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: updated latest to patch-2.6.25.3
+ * info/patches/maintenance_patches/patch-2.6.25.3: added
+
+2008-04-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * latest.defaults: updated latest to 2.6.25
+ * info/patches/maintenance_patches/patch-2.6.25: added
+ * info/patches/PRE_2_6/patch-2.6.25: added
+
2008-03-19 Eric Sandall <sandalle AT sourcemage.org>
* latest.defaults: Latest maintenance to patch-2.6.24.4
Latest realtime is 2.6.24.4-rt4
diff --git a/kernels/linux/info/kernels/2.6.25
b/kernels/linux/info/kernels/2.6.25
new file mode 100755
index 0000000..979dd1a
--- /dev/null
+++ b/kernels/linux/info/kernels/2.6.25
@@ -0,0 +1,3 @@
+version="2.6.25"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.25
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.25
new file mode 100755
index 0000000..a691e50
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.25
@@ -0,0 +1,5 @@
+patchversion="2.6.25"
+source=""
+source_url=""
+appliedkernels="2.6.25"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.25.3
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.25.3
new file mode 100755
index 0000000..df6d953
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.25.3
@@ -0,0 +1,6 @@
+appliedkernels="2.6.25"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 0f7915f..7276c3e 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
-LATEST_2_6=2.6.24
+LATEST_2_6=2.6.25
LATEST_PRE_2_6=patch-2.6.25-rc6
-LATEST_maintenance_patches=patch-2.6.24.4
+LATEST_maintenance_patches=patch-2.6.25.3
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.32
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 3e27916..fef1d00 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=2.0.0.12
+ VERSION=2.0.0.14
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
@@ -18,7 +18,7 @@ ENIGMAIL_VERSION=0.95.6
LICENSE[1]=MPL
LICENSE[2]=MPL
fi
- SECURITY_PATCH=11
+ SECURITY_PATCH=12
PATCHLEVEL=0
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 3ed3d78..8581c84 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,8 @@
+2008-05-03 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.0.14. SECURITY_PATCH=12
+ * PRE_BUILD: Removed gcc43.patch
+ * gcc43.patch: Removed. Incorporated Upstream.
+
2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply gcc43.patch
* gcc43.patch: Patch to enable compilation with gcc 4.3.0
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index c9eda68..9e3013f 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -3,8 +3,6 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla &&

-patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch &&
-
cp mail/config/mozconfig .mozconfig &&

if [ "$BUILD_ENIGMAIL" = "y" ]; then
diff --git a/mail/thunderbird/gcc43.patch b/mail/thunderbird/gcc43.patch
deleted file mode 100644
index 6bda134..0000000
--- a/mail/thunderbird/gcc43.patch
+++ /dev/null
@@ -1,1618 +0,0 @@
-#
-# From https://bugzilla.mozilla.org/show_bug.cgi?id=416463
-#
-Index: xpcom/obsolete/component/nsFileSpecImpl.cpp
-===================================================================
-RCS file: xpcom/obsolete/component/nsFileSpecImpl.cpp
-diff -N xpcom/obsolete/component/nsFileSpecImpl.cpp
---- xpcom/obsolete/component/nsFileSpecImpl.cpp 18 Apr 2004 14:18:15
-0000 1.2
-+++ /dev/null 1 Jan 1970 00:00:00 -0000
-@@ -1,857 +0,0 @@
--/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License
Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS"
basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- * Pierre Phaneuf <pp AT ludusdesign.com>
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable
instead
-- * of those above. If you wish to allow use of your version of this file
only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the
notice
-- * and other provisions required by the GPL or the LGPL. If you do not
delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#include "nsFileSpecImpl.h"// Always first, to ensure that it compiles
alone.
--
--#include "nsIFileStream.h"
--#include "nsFileStream.h"
--
--#include "nsILocalFile.h"
--
--#include "prmem.h"
--
--NS_IMPL_THREADSAFE_ISUPPORTS1(nsFileSpecImpl, nsIFileSpec)
--
--#ifdef NS_DEBUG
--#define TEST_OUT_PTR(p) \
-- if (!(p)) \
-- return NS_ERROR_NULL_POINTER;
--#else
--#define TEST_OUT_PTR(p)
--#endif
--
--//----------------------------------------------------------------------------------------
--nsFileSpecImpl::nsFileSpecImpl()
--//----------------------------------------------------------------------------------------
-- : mInputStream(nsnull)
-- , mOutputStream(nsnull)
--{
--// NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
--
--}
--
--//----------------------------------------------------------------------------------------
--nsFileSpecImpl::nsFileSpecImpl(const nsFileSpec& inSpec)
--//----------------------------------------------------------------------------------------
-- : mFileSpec(inSpec)
-- , mInputStream(nsnull)
-- , mOutputStream(nsnull)
--{
--// NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
--
--}
--
--//----------------------------------------------------------------------------------------
--nsFileSpecImpl::~nsFileSpecImpl()
--//----------------------------------------------------------------------------------------
--{
-- CloseStream();
--}
--
--//----------------------------------------------------------------------------------------
--/* static */
--nsresult nsFileSpecImpl::MakeInterface(const nsFileSpec& inSpec,
nsIFileSpec** result)
--//----------------------------------------------------------------------------------------
--{
-- nsFileSpecImpl* it = new nsFileSpecImpl(inSpec);
-- if (!it)
-- return NS_ERROR_OUT_OF_MEMORY;
-- return it->QueryInterface(NS_GET_IID(nsIFileSpec), (void **) result);
--} // nsFileSpecImpl::MakeInterface
--
--#define FILESPEC(ifilespec) ((nsFileSpecImpl*)ifilespec)->mFileSpec
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::FromFileSpec(const nsIFileSpec *original)
--//----------------------------------------------------------------------------------------
--{
-- if (original) {
-- nsresult rv = ((nsIFileSpec *)original)->GetFileSpec( &mFileSpec);
-- if (NS_SUCCEEDED( rv))
-- return mFileSpec.Error();
-- else
-- return( rv);
-- }
-- else
-- return( NS_ERROR_FAILURE);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsChildOf(nsIFileSpec *possibleParent,
-- PRBool *_retval)
--{
-- *_retval = mFileSpec.IsChildOf(FILESPEC(possibleParent));
-- return mFileSpec.Error();
--}
--//----------------------------------------------------------------------------------------
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetURLString(char * *aURLString)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aURLString)
-- if (mFileSpec.Failed())
-- return mFileSpec.Error();
-- nsFileURL url(mFileSpec);
-- *aURLString = nsCRT::strdup(url.GetURLString());
-- if (!*aURLString)
-- return NS_ERROR_OUT_OF_MEMORY;
-- return NS_OK;
--} // nsFileSpecImpl::GetURLString
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetURLString(const char * aURLString)
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec = nsFileURL(aURLString);
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetUnixStyleFilePath(char *
*aUnixStyleFilePath)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aUnixStyleFilePath)
-- if (mFileSpec.Failed())
-- return mFileSpec.Error();
-- nsFilePath path(mFileSpec);
-- *aUnixStyleFilePath = nsCRT::strdup((const char*) path);
-- if (!*aUnixStyleFilePath)
-- return NS_ERROR_OUT_OF_MEMORY;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetUnixStyleFilePath(const char *
aUnixStyleFilePath)
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec = nsFilePath(aUnixStyleFilePath);
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetPersistentDescriptorString(char *
*aPersistentDescriptorString)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aPersistentDescriptorString)
-- if (mFileSpec.Failed())
-- return mFileSpec.Error();
-- nsPersistentFileDescriptor desc(mFileSpec);
-- nsCAutoString data;
-- desc.GetData(data);
-- *aPersistentDescriptorString = ToNewCString(data);
-- if (!*aPersistentDescriptorString)
-- return NS_ERROR_OUT_OF_MEMORY;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetPersistentDescriptorString(const char *
aPersistentDescriptorString)
--//----------------------------------------------------------------------------------------
--{
-- nsPersistentFileDescriptor desc(mFileSpec);
-- desc.SetData(nsDependentCString(aPersistentDescriptorString));
-- mFileSpec = desc;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetNativePath(char * *aNativePath)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aNativePath)
-- if (mFileSpec.Failed())
-- return mFileSpec.Error();
-- *aNativePath = nsCRT::strdup(mFileSpec.GetNativePathCString());
-- if (!*aNativePath)
-- return NS_ERROR_OUT_OF_MEMORY;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetNativePath(const char * aNativePath)
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec = aNativePath;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetNSPRPath(char * *aNSPRPath)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aNSPRPath)
-- if (mFileSpec.Failed())
-- return mFileSpec.Error();
-- nsNSPRPath path(mFileSpec);
-- *aNSPRPath = nsCRT::strdup((const char*) path);
-- if (!*aNSPRPath)
-- return NS_ERROR_OUT_OF_MEMORY;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Error()
--//----------------------------------------------------------------------------------------
--{
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsValid(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- *_retval = mFileSpec.Valid();
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Failed(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- *_retval = mFileSpec.Failed();
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetLeafName(char * *aLeafName)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aLeafName)
-- *aLeafName = mFileSpec.GetLeafName();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetLeafName(const char * aLeafName)
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec.SetLeafName(aLeafName);
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetParent(nsIFileSpec * *aParent)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aParent)
-- nsFileSpec parent;
-- mFileSpec.GetParent(parent);
-- return MakeInterface(parent, aParent);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::MakeUnique()
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec.MakeUnique();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::MakeUniqueWithSuggestedName(const char
*suggestedName)
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec.MakeUnique(suggestedName);
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetModDate(PRUint32 *aModDate)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aModDate)
-- nsFileSpec::TimeStamp stamp;
-- mFileSpec.GetModDate(stamp);
-- *aModDate = stamp;
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::ModDateChanged(PRUint32 oldStamp, PRBool
*_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- *_retval = mFileSpec.ModDateChanged(oldStamp);
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsDirectory(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- *_retval = mFileSpec.IsDirectory();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsFile(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- *_retval = mFileSpec.IsFile();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Exists(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- *_retval = mFileSpec.Exists();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsHidden(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- *_retval = mFileSpec.IsHidden();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsSymlink(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- *_retval = mFileSpec.IsSymlink();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::ResolveSymlink()
--//----------------------------------------------------------------------------------------
--{
-- PRBool ignore;
-- return mFileSpec.ResolveSymlink(ignore);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetFileSize(PRUint32 *aFileSize)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aFileSize)
-- *aFileSize = mFileSpec.GetFileSize();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetDiskSpaceAvailable(PRInt64
*aDiskSpaceAvailable)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aDiskSpaceAvailable)
-- *aDiskSpaceAvailable = mFileSpec.GetDiskSpaceAvailable();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::AppendRelativeUnixPath(const char
*relativePath)
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec += relativePath;
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Touch()
--//----------------------------------------------------------------------------------------
--{
-- // create an empty file, like the UNIX touch command.
-- nsresult rv;
-- rv = OpenStreamForWriting();
-- if (NS_FAILED(rv)) return rv;
-- rv = CloseStream();
-- return rv;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::CreateDir()
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec.CreateDir();
-- return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Delete(PRBool aRecursive)
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec.Delete(aRecursive);
-- return mFileSpec.Error();
--}
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Truncate(PRInt32 aNewLength)
--//----------------------------------------------------------------------------------------
--{
-- return mFileSpec.Truncate(aNewLength);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Rename(const char *newLeafName)
--//----------------------------------------------------------------------------------------
--{
-- return mFileSpec.Rename(newLeafName);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::CopyToDir(const nsIFileSpec *newParentDir)
--//----------------------------------------------------------------------------------------
--{
-- return mFileSpec.CopyToDir(FILESPEC(newParentDir));
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::MoveToDir(const nsIFileSpec *newParentDir)
--//----------------------------------------------------------------------------------------
--{
-- return mFileSpec.MoveToDir(FILESPEC(newParentDir));
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Execute(const char *args)
--//----------------------------------------------------------------------------------------
--{
-- return mFileSpec.Execute(args);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReading()
--//----------------------------------------------------------------------------------------
--{
-- if (mInputStream || mOutputStream)
-- return NS_ERROR_FAILURE;
-- return NS_NewTypicalInputFileStream((nsISupports**)&mInputStream,
mFileSpec);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::OpenStreamForWriting()
--//----------------------------------------------------------------------------------------
--{
-- if (mInputStream || mOutputStream)
-- return NS_ERROR_FAILURE;
-- return NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream,
mFileSpec);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReadingAndWriting()
--//----------------------------------------------------------------------------------------
--{
-- if (mInputStream || mOutputStream)
-- return NS_ERROR_FAILURE;
-- nsresult result =
NS_NewTypicalInputFileStream((nsISupports**)&mInputStream, mFileSpec);
-- if (NS_SUCCEEDED(result))
-- result =
NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream, mFileSpec);
-- return result;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::CloseStream()
--//----------------------------------------------------------------------------------------
--{
-- NS_IF_RELEASE(mInputStream);
-- NS_IF_RELEASE(mOutputStream);
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsStreamOpen(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- *_retval = (mInputStream || mOutputStream);
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetInputStream(nsIInputStream** _retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- if (!mInputStream) {
-- nsresult rv = OpenStreamForReading();
-- if (NS_FAILED(rv)) return rv;
-- }
-- *_retval = mInputStream;
-- NS_IF_ADDREF(mInputStream);
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetOutputStream(nsIOutputStream** _retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- if (!mOutputStream) {
-- nsresult rv = OpenStreamForWriting();
-- if (NS_FAILED(rv)) return rv;
-- }
-- *_retval = mOutputStream;
-- NS_IF_ADDREF(mOutputStream);
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetFileContents(const char* inString)
--//----------------------------------------------------------------------------------------
--{
-- nsresult rv = OpenStreamForWriting();
-- if (NS_FAILED(rv)) return rv;
-- PRInt32 count;
-- rv = Write(inString, PL_strlen(inString), &count);
-- nsresult rv2 = CloseStream();
-- return NS_FAILED(rv) ? rv : rv2;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetFileContents(char** _retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- *_retval = nsnull;
-- nsresult rv = OpenStreamForReading();
-- if (NS_FAILED(rv)) return rv;
-- PRInt32 theSize;
-- rv = GetFileSize((PRUint32*)&theSize);
-- if (NS_SUCCEEDED(rv))
-- rv = Read(_retval, theSize, &theSize);
-- if (NS_SUCCEEDED(rv))
-- (*_retval)[theSize] = 0;
-- nsresult rv2 = CloseStream();
-- return NS_FAILED(rv) ? rv : rv2;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetFileSpec(nsFileSpec *aFileSpec)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(aFileSpec)
-- *aFileSpec = mFileSpec;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Equals(nsIFileSpec *spec, PRBool *result)
--//----------------------------------------------------------------------------------------
--{
-- nsresult rv;
--
-- if (!result || !spec) return NS_ERROR_NULL_POINTER;
--
-- nsFileSpec otherSpec;
--
-- rv = spec->GetFileSpec(&otherSpec);
-- if (NS_FAILED(rv)) return rv;
--
-- if (mFileSpec == otherSpec) {
-- *result = PR_TRUE;
-- }
-- else {
-- *result = PR_FALSE;
-- }
--
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetFromFileSpec(const nsFileSpec& aFileSpec)
--//----------------------------------------------------------------------------------------
--{
-- mFileSpec = aFileSpec;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Eof(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- if (!mInputStream)
-- return NS_ERROR_NULL_POINTER;
-- nsInputFileStream s(mInputStream);
-- *_retval = s.eof();
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Read(char** buffer, PRInt32 requestedCount,
PRInt32 *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- TEST_OUT_PTR(buffer)
-- if (!mInputStream) {
-- nsresult rv = OpenStreamForReading();
-- if (NS_FAILED(rv)) return rv;
-- }
-- if (!*buffer)
-- *buffer = (char*)PR_Malloc(requestedCount + 1);
-- if (!mInputStream)
-- return NS_ERROR_NULL_POINTER;
-- nsInputFileStream s(mInputStream);
-- *_retval = s.read(*buffer, requestedCount);
-- return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::ReadLine(char** line, PRInt32 bufferSize,
PRBool *wasTruncated)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(wasTruncated)
-- TEST_OUT_PTR(line)
-- if (!mInputStream) {
-- nsresult rv = OpenStreamForReading();
-- if (NS_FAILED(rv)) return rv;
-- }
-- if (!*line)
-- *line = (char*)PR_Malloc(bufferSize + 1);
-- if (!mInputStream)
-- return NS_ERROR_NULL_POINTER;
-- nsInputFileStream s(mInputStream);
-- *wasTruncated = !s.readline(*line, bufferSize);
-- return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Write(const char * data, PRInt32
requestedCount, PRInt32 *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- //if (!mOutputStream)
-- // return NS_ERROR_NULL_POINTER;
-- if (!mOutputStream) {
-- nsresult rv = OpenStreamForWriting();
-- if (NS_FAILED(rv))
-- return rv;
-- }
-- nsOutputFileStream s(mOutputStream);
-- *_retval = s.write(data, requestedCount);
-- return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Flush()
--//----------------------------------------------------------------------------------------
--{
-- if (!mOutputStream)
-- return NS_ERROR_NULL_POINTER;
-- nsOutputFileStream s(mOutputStream);
-- s.flush();
-- return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Seek(PRInt32 offset)
--//----------------------------------------------------------------------------------------
--{
-- nsresult result = NS_OK;
-- if (mOutputStream)
-- {
-- nsOutputFileStream os(mOutputStream);
-- os.seek(offset);
-- result = os.error();
-- }
-- if (NS_SUCCEEDED(result) && mInputStream)
-- {
-- nsInputFileStream is(mInputStream);
-- is.seek(offset);
-- result = is.error();
-- }
-- return result;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Tell(PRInt32 *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- if (!mInputStream)
-- return NS_ERROR_NULL_POINTER;
-- nsInputFileStream s(mInputStream);
-- *_retval = s.tell();
-- return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::EndLine()
--//----------------------------------------------------------------------------------------
--{
-- nsOutputFileStream s(mOutputStream);
-- s << nsEndl;
-- return s.error();
--}
--
--NS_IMPL_ISUPPORTS1(nsDirectoryIteratorImpl, nsIDirectoryIterator)
--
--//----------------------------------------------------------------------------------------
--nsDirectoryIteratorImpl::nsDirectoryIteratorImpl()
--//----------------------------------------------------------------------------------------
-- : mDirectoryIterator(nsnull)
--{
--}
--
--//----------------------------------------------------------------------------------------
--nsDirectoryIteratorImpl::~nsDirectoryIteratorImpl()
--//----------------------------------------------------------------------------------------
--{
-- delete mDirectoryIterator;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::Init(nsIFileSpec *parent, PRBool
resolveSymlink)
--//----------------------------------------------------------------------------------------
--{
-- delete mDirectoryIterator;
-- mDirectoryIterator = new nsDirectoryIterator(FILESPEC(parent),
resolveSymlink);
-- if (!mDirectoryIterator)
-- return NS_ERROR_OUT_OF_MEMORY;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::Exists(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
-- TEST_OUT_PTR(_retval)
-- if (!mDirectoryIterator)
-- return NS_ERROR_NULL_POINTER;
-- *_retval = mDirectoryIterator->Exists();
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::Next()
--//----------------------------------------------------------------------------------------
--{
-- if (!mDirectoryIterator)
-- return NS_ERROR_NULL_POINTER;
-- (*mDirectoryIterator)++;
-- return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::GetCurrentSpec(nsIFileSpec *
*aCurrentSpec)
--//----------------------------------------------------------------------------------------
--{
-- if (!mDirectoryIterator)
-- return NS_ERROR_NULL_POINTER;
-- return nsFileSpecImpl::MakeInterface(mDirectoryIterator->Spec(),
aCurrentSpec);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::Create(nsISupports* outer, const
nsIID& aIID, void* *aIFileSpec)
--//----------------------------------------------------------------------------------------
--{
-- if (aIFileSpec == NULL)
-- return NS_ERROR_NULL_POINTER;
--
-- nsDirectoryIteratorImpl* it = new nsDirectoryIteratorImpl;
-- if (!it)
-- return NS_ERROR_OUT_OF_MEMORY;
--
-- nsresult rv = it->QueryInterface(aIID, aIFileSpec);
-- if (NS_FAILED(rv))
-- {
-- delete it;
-- return rv;
-- }
-- return rv;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Create(nsISupports* outer, const nsIID& aIID,
void* *aIFileSpec)
--//----------------------------------------------------------------------------------------
--{
-- if (aIFileSpec == NULL)
-- return NS_ERROR_NULL_POINTER;
--
-- nsFileSpecImpl* it = new nsFileSpecImpl;
-- if (!it)
-- return NS_ERROR_OUT_OF_MEMORY;
--
-- nsresult rv = it->QueryInterface(aIID, aIFileSpec);
-- if (NS_FAILED(rv))
-- {
-- delete it;
-- return rv;
-- }
-- return rv;
--}
--
--//----------------------------------------------------------------------------------------
--nsresult NS_NewFileSpecWithSpec(const nsFileSpec& aSrcFileSpec, nsIFileSpec
**result)
--//----------------------------------------------------------------------------------------
--{
-- if (!result)
-- return NS_ERROR_NULL_POINTER;
--
-- return nsFileSpecImpl::MakeInterface(aSrcFileSpec, result);
--}
--
--//----------------------------------------------------------------------------------------
--nsresult NS_NewFileSpec(nsIFileSpec** result)
--//----------------------------------------------------------------------------------------
--{
-- return nsFileSpecImpl::Create(nsnull, NS_GET_IID(nsIFileSpec),
(void**)result);
--}
--
--//----------------------------------------------------------------------------------------
--nsresult NS_NewFileSpecFromIFile(nsIFile *aFile, nsIFileSpec **result)
--//----------------------------------------------------------------------------------------
--{
-- nsresult rv = nsFileSpecImpl::Create(nsnull,
NS_GET_IID(nsIFileSpec), (void**)result);
-- if (NS_FAILED(rv)) return rv;
--
-- nsCAutoString path;
-- rv = aFile->GetNativePath(path);
-- if (NS_FAILED(rv)) return rv;
--
-- rv = (*result)->SetNativePath(path.get());
-- if (NS_FAILED(rv))
-- NS_RELEASE(*result);
-- return rv;
--}
--
--//----------------------------------------------------------------------------------------
--nsresult NS_NewDirectoryIterator(nsIDirectoryIterator** result)
--//----------------------------------------------------------------------------------------
--{
-- return nsDirectoryIteratorImpl::Create(nsnull,
NS_GET_IID(nsIDirectoryIterator), (void**)result);
--}
-Index: xpcom/obsolete/component/nsFileSpecImpl.h
-===================================================================
-RCS file: xpcom/obsolete/component/nsFileSpecImpl.h
-diff -N xpcom/obsolete/component/nsFileSpecImpl.h
---- xpcom/obsolete/component/nsFileSpecImpl.h 18 Apr 2004 14:18:15 -0000
1.3
-+++ /dev/null 1 Jan 1970 00:00:00 -0000
-@@ -1,116 +0,0 @@
--/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License
Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS"
basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable
instead
-- * of those above. If you wish to allow use of your version of this file
only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the
notice
-- * and other provisions required by the GPL or the LGPL. If you do not
delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#ifndef _FILESPECIMPL_H_
--#define _FILESPECIMPL_H_
--
--#include "nscore.h"
--#include "nsIFileSpec.h"
--#include "nsFileSpec.h"
--
--//========================================================================================
--class nsFileSpecImpl
--//========================================================================================
-- : public nsIFileSpec
--{
--
-- public:
--
-- NS_DECL_ISUPPORTS
--
-- NS_DECL_NSIFILESPEC
--
-- //----------------------
-- // COM Cruft
-- //----------------------
--
-- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void*
*aIFileSpec);
--
-- //----------------------
-- // Implementation
-- //----------------------
--
-- nsFileSpecImpl();
-- nsFileSpecImpl(const nsFileSpec& inSpec);
-- static nsresult MakeInterface(const nsFileSpec& inSpec, nsIFileSpec**
outSpec);
--
-- //----------------------
-- // Data
-- //----------------------
--
-- nsFileSpec
mFileSpec;
-- nsIInputStream* mInputStream;
-- nsIOutputStream* mOutputStream;
--
--private:
-- ~nsFileSpecImpl();
--}; // class nsFileSpecImpl
--
--//========================================================================================
--class nsDirectoryIteratorImpl
--//========================================================================================
-- : public nsIDirectoryIterator
--{
--
--public:
--
-- nsDirectoryIteratorImpl();
--
-- NS_DECL_ISUPPORTS
--
-- NS_IMETHOD Init(nsIFileSpec *parent, PRBool resolveSymlink);
--
-- NS_IMETHOD Exists(PRBool *_retval);
--
-- NS_IMETHOD Next();
--
-- NS_IMETHOD GetCurrentSpec(nsIFileSpec * *aCurrentSpec);
--
-- //----------------------
-- // COM Cruft
-- //----------------------
--
-- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void*
*aIFileSpec);
--
--private:
-- ~nsDirectoryIteratorImpl();
--
--protected:
-- nsDirectoryIterator*
mDirectoryIterator;
--}; // class nsDirectoryIteratorImpl
--
--#endif // _FILESPECIMPL_H_
-Index: xpcom/obsolete/component/nsIRegistry.idl
-===================================================================
-RCS file: xpcom/obsolete/component/nsIRegistry.idl
-diff -N xpcom/obsolete/component/nsIRegistry.idl
---- xpcom/obsolete/component/nsIRegistry.idl 18 Apr 2004 14:18:15 -0000
1.2
-+++ /dev/null 1 Jan 1970 00:00:00 -0000
-@@ -1,186 +0,0 @@
--/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
-*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License
Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS"
basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org Code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1999
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable
instead
-- * of those above. If you wish to allow use of your version of this file
only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the
notice
-- * and other provisions required by the GPL or the LGPL. If you do not
delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--#include "nsISupports.idl"
--#include "nsIEnumerator.idl"
--
--interface nsIFile;
--
--typedef PRUint32 nsRegistryKey;
--typedef long nsWellKnownRegistry;
--
--[scriptable,uuid(5D41A440-8E37-11d2-8059-00600811A9C3)]
--interface nsIRegistry : nsISupports
--{
-- const long None = 0;
-- const long Users = 1;
-- const long Common = 2;
-- const long CurrentUser = 3;
--
-- const long ApplicationComponentRegistry = 1;
-- const long ApplicationRegistry = 2;
--
-- // Dont use this one. This for internal use only.
-- const long ApplicationCustomRegistry = -1;
--
-- void open(in nsIFile regFile);
-- void openWellKnownRegistry(in nsWellKnownRegistry regid);
--
-- void flush();
-- boolean isOpen();
--
-- nsRegistryKey addKey(in nsRegistryKey baseKey, in wstring keyname);
-- nsRegistryKey getKey(in nsRegistryKey baseKey, in wstring keyname);
-- void removeKey(in nsRegistryKey baseKey, in wstring keyname);
--
-- wstring getString(in nsRegistryKey baseKey, in wstring valname);
-- void setString(in nsRegistryKey baseKey, in wstring valname, in wstring
value);
--
-- string getStringUTF8(in nsRegistryKey baseKey, in string path);
-- void setStringUTF8(in nsRegistryKey baseKey, in string path, in string
value);
--
-- void getBytesUTF8(in nsRegistryKey baseKey, in string path, out
PRUint32 length, [retval, array, size_is(length)] out PRUint8 valueArray);
-- void setBytesUTF8(in nsRegistryKey baseKey, in string path, in PRUint32
length, [array, size_is(length)] in PRUint8 valueArray);
-- PRInt32 getInt(in nsRegistryKey baseKey, in string path);
-- void setInt(in nsRegistryKey baseKey, in string path, in PRInt32 value);
-- PRInt64 getLongLong(in nsRegistryKey baseKey, in string path);
-- void setLongLong(in nsRegistryKey baseKey, in string path, inout
PRInt64 value);
--
-- /**
-- * addSubtree() and friends need to be renamed to addKeyUTF8().
-- * If you are using these forms make sure you pass UTF8 data
-- */
-- nsRegistryKey addSubtree(in nsRegistryKey baseKey, in string path);
-- void removeSubtree(in nsRegistryKey baseKey, in string path);
-- nsRegistryKey getSubtree(in nsRegistryKey baseKey, in string path);
--
-- nsRegistryKey addSubtreeRaw(in nsRegistryKey baseKey, in string path);
-- void removeSubtreeRaw(in nsRegistryKey baseKey, in string path);
-- nsRegistryKey getSubtreeRaw(in nsRegistryKey baseKey, in string path);
--
-- nsIEnumerator enumerateSubtrees(in nsRegistryKey baseKey);
-- nsIEnumerator enumerateAllSubtrees(in nsRegistryKey baseKey);
-- nsIEnumerator enumerateValues(in nsRegistryKey baseKey);
--
-- const unsigned long String = 1;
-- const unsigned long Int32 = 2;
-- const unsigned long Bytes = 3;
-- const unsigned long File = 4;
--
-- unsigned long getValueType(in nsRegistryKey baseKey, in string path);
-- PRUint32 getValueLength(in nsRegistryKey baseKey, in string path);
-- void deleteValue(in nsRegistryKey baseKey, in string path);
--
-- /**
-- * escapeKey() takes arbitrary binary data and converts it into
-- * valid ASCII which can be used as registry key or value names
-- */
-- void escapeKey([array, size_is(length)] in PRUint8 key, in PRUint32
terminator, inout PRUint32 length, [retval, array, size_is(length)] out
PRUint8 escaped);
-- void unescapeKey([array, size_is(length)] in PRUint8 escaped, in
PRUint32 terminator, inout PRUint32 length, [retval, array, size_is(length)]
out PRUint8 key);
--
-- attribute string currentUserName;
--
-- void pack();
--};
--
--[scriptable, uuid(8cecf236-1dd2-11b2-893c-f9848956eaec)]
--interface nsIRegistryEnumerator : nsIEnumerator
--{
-- void currentItemInPlaceUTF8(out nsRegistryKey key,
-- [shared, retval] out string item);
--};
--
--[scriptable, uuid(D1B54831-AC07-11d2-805E-00600811A9C3)]
--interface nsIRegistryNode : nsISupports
--{
-- readonly attribute string nameUTF8;
-- readonly attribute wstring name;
-- readonly attribute nsRegistryKey key;
--};
--
--[scriptable,uuid(5316C380-B2F8-11d2-A374-0080C6F80E4B)]
--interface nsIRegistryValue : nsISupports
--{
-- readonly attribute wstring name;
-- readonly attribute string nameUTF8;
-- readonly attribute unsigned long type;
-- readonly attribute PRUint32 length;
--};
--
--[uuid(3A15FC88-7A61-4Ab4-8E58-31E95fAB3DA8)]
--/**
-- * It sucks that nsIRegistry has to always allocate and return
-- * strings. nsIRegistryGetter adds in interfaces for non allocating getters
-- * to registry values.
-- */
--interface nsIRegistryGetter : nsISupports
--{
-- /**
-- * Get a string value of attribute valname in widestring or utf8 format
-- *
-- * @return
-- * NS_OK on success.
-- * buf has the string value copied into it. length is NOT changed.
-- * NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
-- * length is updated to actual length in chars including
-- * terminating NULL and buf will be unchanged.
-- * NS_ERROR_FAILURE if an unknown error happened. state of buf and
-- * length undefined.
-- * various failure codes otherwise. buf and length wont be updated.
-- */
-- void getStringUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
-- inout char buf, inout PRUint32 length);
--
-- /**
-- * Get a a byte array value of attribute valname
-- *
-- * @return
-- * NS_OK on success. buf has the string value copied into it.
-- * length is updated to actual number of bytes copied into buf.
-- * NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
-- * length is updated to actual length in PRUint8s including
-- * terminating NULL and buf will be unchanged.
-- * NS_ERROR_FAILURE if an unknown error happened. state of buf and
-- * length undefined.
-- * various other failure codes otherwise. buf and length wont be
updated.
-- */
-- void getBytesUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
-- inout PRUint8 buf, inout PRUint32 length);
--};
--
--%{ C++
--#include "nsIRegistryUtils.h"
--%}
-Index: xpcom/obsolete/component/nsIRegistryUtils.h
-===================================================================
-RCS file: xpcom/obsolete/component/nsIRegistryUtils.h
-diff -N xpcom/obsolete/component/nsIRegistryUtils.h
---- xpcom/obsolete/component/nsIRegistryUtils.h 18 Apr 2004 14:18:15
-0000 1.2
-+++ /dev/null 1 Jan 1970 00:00:00 -0000
-@@ -1,63 +0,0 @@
--/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License
Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS"
basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable
instead
-- * of those above. If you wish to allow use of your version of this file
only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the
notice
-- * and other provisions required by the GPL or the LGPL. If you do not
delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--#ifndef __nsIRegistryUtils_h
--#define __nsIRegistryUtils_h
--
--#define NS_REGISTRY_CONTRACTID "@mozilla.org/registry;1"
--#define NS_REGISTRY_CLASSNAME "Mozilla Registry"
--/* be761f00-a3b0-11d2-996c-0080c7cb1081 */
--#define NS_REGISTRY_CID \
--{ \
-- 0xbe761f00, \
-- 0xa3b0, \
-- 0x11d2, \
-- {0x99, 0x6c, 0x00, 0x80, 0xc7, 0xcb, 0x10, 0x81} \
--}
--
--/*------------------------------- Error Codes
----------------------------------
--------------------------------------------------------------------------------*/
--#define NS_ERROR_REG_BADTYPE NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 1 )
--#define NS_ERROR_REG_NO_MORE NS_ERROR_GENERATE_SUCCESS(
NS_ERROR_MODULE_REG, 2 )
--#define NS_ERROR_REG_NOT_FOUND NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 3 )
--#define NS_ERROR_REG_NOFILE NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 4 )
--#define NS_ERROR_REG_BUFFER_TOO_SMALL NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 5 )
--#define NS_ERROR_REG_NAME_TOO_LONG NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 6 )
--#define NS_ERROR_REG_NO_PATH NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 7 )
--#define NS_ERROR_REG_READ_ONLY NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 8 )
--#define NS_ERROR_REG_BAD_UTF8 NS_ERROR_GENERATE_FAILURE(
NS_ERROR_MODULE_REG, 9 )
--
--#endif
-Index: xpcom/obsolete/component/regExport.cpp
-===================================================================
-RCS file: xpcom/obsolete/component/regExport.cpp
-diff -N xpcom/obsolete/component/regExport.cpp
---- xpcom/obsolete/component/regExport.cpp 18 Apr 2004 14:18:15 -0000
1.2
-+++ /dev/null 1 Jan 1970 00:00:00 -0000
-@@ -1,357 +0,0 @@
--/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2
-*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License
Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS"
basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable
instead
-- * of those above. If you wish to allow use of your version of this file
only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the
notice
-- * and other provisions required by the GPL or the LGPL. If you do not
delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#include <stdio.h>
--
--#include "nsIServiceManager.h"
--#include "nsIComponentManager.h"
--#include "nsCOMPtr.h"
--#include "nsIRegistry.h"
--#include "nsIEnumerator.h"
--#include "nsILocalFile.h"
--#include "nsDependentString.h"
--#include "prmem.h"
--#include "plstr.h"
--#include "nsMemory.h"
--
--static void display( nsIRegistry *reg, nsRegistryKey root, const char *name
);
--static void displayValues( nsIRegistry *reg, nsRegistryKey root );
--static void printString( const char *value, int indent );
--
--int main( int argc, char *argv[] ) {
--
--
--#ifdef __MWERKS__
-- // Hack in some arguments. A NULL registry name is supposed to tell
libreg
-- // to use the default registry (which does seem to work).
-- argc = 1;
-- const char* myArgs[] =
-- {
-- "regExport"
-- };
-- argv = const_cast<char**>(myArgs);
--#endif
--
-- nsresult rv;
--
-- // Initialize XPCOM
-- nsIServiceManager *servMgr = NULL;
-- rv = NS_InitXPCOM2(&servMgr, NULL, NULL);
-- if (NS_FAILED(rv))
-- {
-- // Cannot initialize XPCOM
-- printf("Cannot initialize XPCOM. Exit. [rv=0x%08X]\n", (int)rv);
-- exit(-1);
-- }
-- {
-- // Get the component manager
-- static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
-- nsCOMPtr<nsIComponentManager> compMgr =
do_GetService(kComponentManagerCID, &rv);
-- if (NS_FAILED(rv))
-- {
-- // Cant get component manager
-- printf("Cannot get component manager from service manager..
Exit. [rv=0x%08X]\n", (int)rv);
-- exit(-1);
-- }
--
-- nsIRegistry *reg;
--
-- if (argc>1) {
-- // Create the registry
-- rv =
compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
-- NS_GET_IID(nsIRegistry),
-- (void **) &reg);
-- // Check result.
-- if ( NS_FAILED(rv) )
-- {
-- printf( "Error opening registry file %s, rv=0x%08X\n",
argv[1] , (int)rv );
-- return rv;
-- }
-- // Open it against the input file name.
-- nsCOMPtr<nsILocalFile> regFile;
-- rv = NS_NewNativeLocalFile( nsDependentCString(argv[1]),
PR_FALSE, getter_AddRefs(regFile) );
-- if ( NS_FAILED(rv) ) {
-- printf( "Error instantiating local file for %s,
rv=0x%08X\n", argv[1], (int)rv );
-- return rv;
-- }
--
-- rv = reg->Open( regFile );
--
-- if ( rv == NS_OK )
-- {
-- printf( "Registry %s opened OK.\n", argv[1] );
--
-- // Recurse over all 3 branches.
-- display( reg, nsIRegistry::Common, "nsRegistry::Common" );
-- display( reg, nsIRegistry::Users, "nsRegistry::Users" );
-- }
-- NS_RELEASE(reg);
-- }
-- else
-- {
-- // Called with no arguments. Print both the default registry
and
-- // the components registry. We already printed the default
regsitry.
-- // So just do the component registry.
-- rv =
compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
-- NS_GET_IID(nsIRegistry),
-- (void **) &reg);
--
-- // Check result.
-- if ( NS_FAILED(rv) )
-- {
-- printf( "Error opening creating registry instance,
rv=0x%08X\n", (int)rv );
-- return rv;
-- }
-- rv =
reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
-- if ( rv == NS_ERROR_REG_BADTYPE ) {
-- printf( "\n\n\nThere is no <Application Component
Registry>\n" );
-- }
-- else if ( rv == NS_OK ) {
--
-- printf( "\n\n\nRegistry %s opened OK.\n", "<Application
Component Registry>\n" );
--
-- // Recurse over all 3 branches.
-- display( reg, nsIRegistry::Common, "nsRegistry::Common" );
-- display( reg, nsIRegistry::Users, "nsRegistry::Users" );
-- }
-- NS_RELEASE(reg);
-- }
-- }
-- NS_ShutdownXPCOM( servMgr );
--
-- return rv;
--}
--
--void display( nsIRegistry *reg, nsRegistryKey root, const char *rootName ) {
-- // Print out key name.
-- printf( "%s\n", rootName );
--
-- // Make sure it isn't a "root" key.
-- if ( root != nsIRegistry::Common
-- &&
-- root != nsIRegistry::Users
-- &&
-- root != nsIRegistry::CurrentUser ) {
-- // Print values stored under this key.
-- displayValues( reg, root );
-- }
--
-- // Enumerate all subkeys (immediately) under the given node.
-- nsIEnumerator *keys;
-- nsresult rv = reg->EnumerateSubtrees( root, &keys );
--
-- // Check result.
-- if ( rv == NS_OK ) {
-- // Set enumerator to beginning.
-- rv = keys->First();
-- // Enumerate subkeys till done.
-- while( NS_SUCCEEDED( rv ) && (NS_OK != keys->IsDone()) ) {
-- nsISupports *base;
-- rv = keys->CurrentItem( &base );
-- // Test result.
-- if ( rv == NS_OK ) {
-- // Get specific interface.
-- nsIRegistryNode *node;
-- nsIID nodeIID = NS_IREGISTRYNODE_IID;
-- rv = base->QueryInterface( nodeIID, (void**)&node );
-- // Test that result.
-- if ( rv == NS_OK ) {
-- // Get node name.
-- char *name;
-- rv = node->GetNameUTF8( &name );
-- // Test result.
-- if ( rv == NS_OK ) {
-- // Build complete name.
-- char *fullName = new char[ PL_strlen(rootName) +
PL_strlen(name) + 5 ];
-- PL_strcpy( fullName, rootName );
-- PL_strcat( fullName, " - " );
-- PL_strcat( fullName, name );
-- // Display contents under this subkey.
-- nsRegistryKey key;
-- rv = reg->GetSubtreeRaw( root, name, &key );
-- if ( rv == NS_OK ) {
-- display( reg, key, fullName );
-- printf( "\n" );
-- } else {
-- printf( "Error getting key, rv=0x%08X\n",
(int)rv );
-- }
-- delete [] fullName;
-- } else {
-- printf( "Error getting subtree name, rv=0x%08X\n",
(int)rv );
-- }
-- // Release node.
-- node->Release();
-- } else {
-- printf( "Error converting base node ptr to
nsIRegistryNode, rv=0x%08X\n", (int)rv );
-- }
-- // Release item.
-- base->Release();
--
-- // Advance to next key.
-- rv = keys->Next();
-- // Check result.
-- if ( NS_SUCCEEDED( rv ) ) {
-- } else {
-- printf( "Error advancing enumerator, rv=0x%08X\n",
(int)rv );
-- }
-- } else {
-- printf( "Error getting current item, rv=0x%08X\n", (int)rv
);
-- }
-- }
-- // Release key enumerator.
-- keys->Release();
-- } else {
-- printf( "Error creating enumerator for %s, root=0x%08X,
rv=0x%08X\n",
-- rootName, (int)root, (int)rv );
-- }
-- return;
--}
--
--static void displayValues( nsIRegistry *reg, nsRegistryKey root ) {
-- // Emumerate values at this registry location.
-- nsIEnumerator *values;
-- nsresult rv = reg->EnumerateValues( root, &values );
--
-- // Check result.
-- if ( rv == NS_OK ) {
-- // Go to beginning.
-- rv = values->First();
--
-- // Enumerate values till done.
-- while( rv == NS_OK && (NS_OK != values->IsDone()) ) {
-- nsISupports *base;
-- rv = values->CurrentItem( &base );
-- // Test result.
-- if ( rv == NS_OK ) {
-- // Get specific interface.
-- nsIRegistryValue *value;
-- nsIID valueIID = NS_IREGISTRYVALUE_IID;
-- rv = base->QueryInterface( valueIID, (void**)&value );
-- // Test that result.
-- if ( rv == NS_OK ) {
-- // Get node name.
-- char *name;
-- rv = value->GetNameUTF8( &name );
-- // Test result.
-- if ( rv == NS_OK ) {
-- // Print name:
-- printf( "\t\t%s", name );
-- // Get info about this value.
-- PRUint32 type;
-- rv = reg->GetValueType( root, name, &type );
-- if ( rv == NS_OK ) {
-- // Print value contents.
-- switch ( type ) {
-- case nsIRegistry::String: {
-- char *strValue;
-- rv = reg->GetStringUTF8( root,
name, &strValue );
-- if ( rv == NS_OK ) {
-- printString( strValue,
strlen(name) );
-- nsMemory::Free( strValue );
-- } else {
-- printf( "\t Error getting
string value, rv=0x%08X", (int)rv );
-- }
-- }
-- break;
--
-- case nsIRegistry::Int32:
-- {
-- PRInt32 val = 0;
-- rv = reg->GetInt( root, name, &val
);
-- if (NS_SUCCEEDED(rv)) {
-- printf( "\t= Int32 [%d, 0x%x]",
val, val);
-- }
-- else {
-- printf( "\t Error getting int32
value, rv=%08X", (int)rv);
-- }
-- }
-- break;
--
-- case nsIRegistry::Bytes:
-- printf( "\t= Bytes" );
-- break;
--
-- case nsIRegistry::File:
-- printf( "\t= File (?)" );
-- break;
--
-- default:
-- printf( "\t= ? (unknown type=0x%02X)",
(int)type );
-- break;
-- }
-- } else {
-- printf( "\t= ? (error getting value,
rv=0x%08X)", (int)rv );
-- }
-- printf("\n");
-- nsMemory::Free( name );
-- } else {
-- printf( "Error getting value name, rv=0x%08X\n",
(int)rv );
-- }
-- // Release node.
-- value->Release();
-- } else {
-- printf( "Error converting base node ptr to
nsIRegistryNode, rv=0x%08X\n", (int)rv );
-- }
-- // Release item.
-- base->Release();
--
-- // Advance to next key.
-- rv = values->Next();
-- // Check result.
-- if ( NS_SUCCEEDED( rv ) ) {
-- } else {
-- printf( "Error advancing enumerator, rv=0x%08X\n",
(int)rv );
-- break;
-- }
-- } else {
-- printf( "Error getting current item, rv=0x%08X\n", (int)rv
);
-- break;
-- }
-- }
--
-- values->Release();
-- } else {
-- printf( "\t\tError enumerating values, rv=0x%08X\n", (int)rv );
-- }
-- return;
--}
--
--static void printString( const char *value, int /*indent*/ ) {
-- // For now, just dump contents.
-- printf( "\t = %s", value );
-- return;
--}
-
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 69214f0..12220ef 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,24 +1,25 @@
SPELL=php
if [[ "$PHP_RC" == y ]]; then
- VERSION=5.2.6RC3
-
SOURCE_HASH=sha512:77b4f365fac93280387ed1c4edd846207317521669afa12c0a29b653c4048fa43f28d62aff49eade77ef00fea2512f7da810c999a5f8bde467fd503ac36a0d0e
+ VERSION=5.2.6RC5
+ SECURITY_PATCH=6
+
SOURCE_HASH=sha512:5e39b27828fb7ebb1f29fd7df9f01dc9748d32af52beb43096c2e0127be840903270ec37b9d98a7c1a62020d053d83bb0fd54221e25940cf3bcb2f691c3428c2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/ilia/$SOURCE
else
- VERSION=5.2.5
-
SOURCE_HASH=sha512:d362c195a018bad5013c2b8539fdf345944266b6336ecc2315a0809ddc2a543bb09bcdd31d6203c056b1d9f4f65ce0b4f4e32c83df529582b05925b3a5b727f6
+ VERSION=5.2.6
+ SECURITY_PATCH=7
+
SOURCE_HASH=sha512:d01686701b41c1f3cb6444714efd1558cb1b3c227827ac10201c05cc5daa677292e1aacbf62e57e0cf52bf9343aa5d95fe676e6033ed3ad9517358defb511771
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
fi
if [[ $PHP_SUHOSIN == y ]]; then
VERSION2=0.9.6.2
SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
- SOURCE2_URL="http://www.hardened-php.net/suhosin/_media/$SOURCE2";
+ SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
SOURCE3=$SOURCE2.sig
- SOURCE3_URL="http://www.hardened-php.net/suhosin/_media/$SOURCE3";
+ SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
fi
- SECURITY_PATCH=6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.php.net/
ENTERED=20011024
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 2edd78d..4279f27 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,17 @@
+2008-05-03 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: changed the SOURCE_URL for the suhosin patch
+ * PRE_BUILD: chmod 0755; changed SPOOL_DIRECTORY for SOURCE_CACHE
+
+2008-05-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.2.6, SECURITY_PATCH=7 [Bug 14506]
+
+2008-04-22 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated the RC to 5.2.6RC5
+
+2008-04-05 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated the RC to 5.2.6RC4
+ forgot the sha512 hash update
+
2008-03-29 Elisamuel Resto <ryuji AT sourcemage.org>
* DEPENDS: C-CLIENT is no more in z-rejected
* DETAILS: added new RC (5.2.6RC3)
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
old mode 100644
new mode 100755
index 8818c50..9dcac0b
--- a/php-pear/php/PRE_BUILD
+++ b/php-pear/php/PRE_BUILD
@@ -1,7 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
if [[ $PHP_SUHOSIN == y ]]; then
-verify_source $SOURCE2 &&
-zcat $SPOOL_DIRECTORY/$SOURCE2 | patch -p1
+ verify_source $SOURCE2 &&
+ zcat $SOURCE_CACHE/$SOURCE2 | patch -p1
fi

diff --git a/shell-term-fm/rdesktop/DETAILS b/shell-term-fm/rdesktop/DETAILS
index 7faa864..59a10f8 100755
--- a/shell-term-fm/rdesktop/DETAILS
+++ b/shell-term-fm/rdesktop/DETAILS
@@ -1,9 +1,10 @@
SPELL=rdesktop
- VERSION=1.5.0
+ VERSION=1.6.0
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:b83ecd08f5ee7606e5f045cf7e746383a7b6a514855a77056bcb0705753bab064beba1462e779ca252a50802640cdc1a16e4cc222188d7708876266a3e77fca3
+
SOURCE_HASH=sha512:ba7dcdeabdb85ce93b66e1a71d6c3aea7df244d9ed288aee79ea63680de2384ea313772eed2c6b861c53dd1564c8f8c6d6c5baf798fe9c405f3a17cf4f1b0756
WEB_SITE=http://www.rdesktop.org
ENTERED=20010922
LICENSE[0]=GPL2
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index 69d0db9..eef4d80 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,6 @@
+2008-05-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.0, SECURITY_PATCH=1
+
2006-10-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.0, removed UPDATED

diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index 8792318..f08d1f7 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,15 +1,15 @@
SPELL=vlc
- VERSION=0.8.6f
+ VERSION=0.8.6g
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
WEB_SITE=http://www.videolan.org
-
SOURCE_HASH=sha512:90c689df15344b9a8bac61fab80ac387341324467d1caf4d5a4e9a884bd96b812438cea6b4dc0da5c1d7ad95d8adf44988182a1e906904d23d318ba32a8a7654
+
SOURCE_HASH=sha512:4458e89e38606d59a3f55b305092d112d2bb6985713b9b2df621961e24a18952109beeae77dee0e78d5e4117f3257e398a451fc9666ef25d2ac1fdadead47108
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
ENTERED=20011113
KEYWORDS="player video"
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
SHORT="multimedia player"
cat << EOF
VLC (initially VideoLAN Client) is a highly portable multimedia player for
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 1c4a71f..61f2761 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2008-05-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.6g, SECURITY_PATCH=6
+
2008-04-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.8.6f, SECURITY_PATCH=5




  • [SM-Commit] GIT changes to stable-0.20 grimoire by Eric Sandall (7f2fb142960ca254d027ddcecccd8be3db48394c), Eric Sandall, 05/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page