Some final bug fixes.

diff --git a/Cydia.app/package.js b/Cydia.app/package.js
index 3ec5318a58ebc87f054e98aee6cd3526859b3541..5aec9ff37d490841cfa788884c4b7e9f9b16e59f 100644 (file)
--- a/Cydia.app/package.js
+++ b/Cydia.app/package.js
@@ -291,6 +291,7 @@ var special = function () {
     $("#thumb")[0].className = 'flip-180';
 
     /* XXX: this could be better */
     $("#thumb")[0].className = 'flip-180';
 
     /* XXX: this could be better */

+    $("#rating-href").href(null);

     $("#rating-none").css("display", "none");
     $("#rating-done").css("display", "none");
 
     $("#rating-none").css("display", "none");
     $("#rating-done").css("display", "none");
 

diff --git a/Cydia.mm b/Cydia.mm
index 7ccdaf3bf3d04b5fe99ab7d971cd2ec7ac6c638f..24eaf538a80e529fcb55bb453ee06d1fd220d4a1 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -2111,7 +2111,7 @@ struct PackageNameOrdering :
                 do {
                     const char *name(tag.Name());
                     [tags_ addObject:(NSString *)CFCString(name)];
                 do {
                     const char *name(tag.Name());
                     [tags_ addObject:(NSString *)CFCString(name)];

-                    if (role_ == nil && strncmp(name, "role::", 6) == 0 && strcmp(name, "role::leaper") != 0)
+                    if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/)

                         role_ = (NSString *) CFCString(name + 6);
                     if (visible_ && strncmp(name, "require::", 9) == 0 && (
                         true
                         role_ = (NSString *) CFCString(name + 6);
                     if (visible_ && strncmp(name, "require::", 9) == 0 && (
                         true


@@ -4030,30 +4030,42 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [delegate_ progressViewIsComplete:self];
 
     if (Finish_ < 4) {
     [delegate_ progressViewIsComplete:self];
 
     if (Finish_ < 4) {

-        FileFd file(SandboxTemplate_, FileFd::ReadOnly);
-        MMap mmap(file, MMap::ReadOnly);
-        SHA1Summation sha1;
-        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
-        if (!(sandplate_ == sha1.Result()))
-            Finish_ = 4;
+        FileFd file;
+        if (!file.Open(SandboxTemplate_, FileFd::ReadOnly))
+            _error->Discard();
+        else {
+            MMap mmap(file, MMap::ReadOnly);
+            SHA1Summation sha1;
+            sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+            if (!(sandplate_ == sha1.Result()))
+                Finish_ = 4;
+        }

     }
 
     if (Finish_ < 4) {
     }
 
     if (Finish_ < 4) {

-        FileFd file(NotifyConfig_, FileFd::ReadOnly);
-        MMap mmap(file, MMap::ReadOnly);
-        SHA1Summation sha1;
-        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
-        if (!(notifyconf_ == sha1.Result()))
-            Finish_ = 4;
+        FileFd file;
+        if (!file.Open(NotifyConfig_, FileFd::ReadOnly))
+            _error->Discard();
+        else {
+            MMap mmap(file, MMap::ReadOnly);
+            SHA1Summation sha1;
+            sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+            if (!(notifyconf_ == sha1.Result()))
+                Finish_ = 4;
+        }

     }
 
     if (Finish_ < 3) {
     }
 
     if (Finish_ < 3) {

-        FileFd file(SpringBoard_, FileFd::ReadOnly);
-        MMap mmap(file, MMap::ReadOnly);
-        SHA1Summation sha1;
-        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
-        if (!(springlist_ == sha1.Result()))
-            Finish_ = 3;
+        FileFd file;
+        if (!file.Open(SpringBoard_, FileFd::ReadOnly))
+            _error->Discard();
+        else {
+            MMap mmap(file, MMap::ReadOnly);
+            SHA1Summation sha1;
+            sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+            if (!(springlist_ == sha1.Result()))
+                Finish_ = 3;
+        }

     }
 
     switch (Finish_) {
     }
 
     switch (Finish_) {


@@ -4202,27 +4214,39 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     running_ = YES;
 
     {
     running_ = YES;
 
     {

-        FileFd file(SandboxTemplate_, FileFd::ReadOnly);
-        MMap mmap(file, MMap::ReadOnly);
-        SHA1Summation sha1;
-        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
-        sandplate_ = sha1.Result();
+        FileFd file;
+        if (!file.Open(SandboxTemplate_, FileFd::ReadOnly))
+            _error->Discard();
+        else {
+            MMap mmap(file, MMap::ReadOnly);
+            SHA1Summation sha1;
+            sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+            sandplate_ = sha1.Result();
+        }

     }
 
     {
     }
 
     {

-        FileFd file(NotifyConfig_, FileFd::ReadOnly);
-        MMap mmap(file, MMap::ReadOnly);
-        SHA1Summation sha1;
-        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
-        notifyconf_ = sha1.Result();
+        FileFd file;
+        if (!file.Open(NotifyConfig_, FileFd::ReadOnly))
+            _error->Discard();
+        else {
+            MMap mmap(file, MMap::ReadOnly);
+            SHA1Summation sha1;
+            sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+            notifyconf_ = sha1.Result();
+        }

     }
 
     {
     }
 
     {

-        FileFd file(SpringBoard_, FileFd::ReadOnly);
-        MMap mmap(file, MMap::ReadOnly);
-        SHA1Summation sha1;
-        sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
-        springlist_ = sha1.Result();
+        FileFd file;
+        if (!file.Open(SpringBoard_, FileFd::ReadOnly))
+            _error->Discard();
+        else {
+            MMap mmap(file, MMap::ReadOnly);
+            SHA1Summation sha1;
+            sha1.Add(reinterpret_cast<uint8_t *>(mmap.Data()), mmap.Size());
+            springlist_ = sha1.Result();
+        }

     }
 
     [transition_ transition:6 toView:overlay_];
     }
 
     [transition_ transition:6 toView:overlay_];


@@ -4643,7 +4667,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         section_ = [section localized];
         if (section_ != nil)
             section_ = [section_ retain];
         section_ = [section localized];
         if (section_ != nil)
             section_ = [section_ retain];

-        name_  = [(section_ == nil ? CYLocalize("NO_SECTION") : section_) retain];
+        name_  = [(section_ == nil || [section_ length] == 0 ? CYLocalize("NO_SECTION") : section_) retain];

         count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
 
         if (editing_)
         count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
 
         if (editing_)


@@ -7927,12 +7951,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
         Changed_ = true;
 
 
         Changed_ = true;
 

+        [sheet dismiss];
+

         if (reset)
             [self updateData];
         else
             [self finish];
         if (reset)
             [self updateData];
         else
             [self finish];

-
-        [sheet dismiss];

     } else if ([context isEqualToString:@"upgrade"]) {
         switch (button) {
             case 1:
     } else if ([context isEqualToString:@"upgrade"]) {
         switch (button) {
             case 1:


@@ -8120,8 +8144,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (
         readlink("/Applications", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/Library/Ringtones", NULL, 0) == -1 && errno == EINVAL ||
     if (
         readlink("/Applications", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/Library/Ringtones", NULL, 0) == -1 && errno == EINVAL ||

-        readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL /*||
+        readlink("/usr/bin", NULL, 0) == -1 && errno == EINVAL*/ ||

         readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL ||

+        readlink("/usr/lib/pam", NULL, 0) == -1 && errno == EINVAL ||

         readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL /*||
         readlink("/var/lib", NULL, 0) == -1 && errno == EINVAL*/
         readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL ||
         readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL /*||
         readlink("/var/lib", NULL, 0) == -1 && errno == EINVAL*/

diff --git a/Library/free.sh b/Library/free.sh
index c38b269764afae8914aec26959d3b28c6fde8272..2e90608e0d1d3eee7de8fe067e462c82496c0e67 100755 (executable)
--- a/Library/free.sh
+++ b/Library/free.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
 #!/bin/bash
 

+# /usr/bin \
+

 for dir in \
     /Applications \
     /Library/Wallpaper \
 for dir in \
     /Applications \
     /Library/Wallpaper \

diff --git a/control b/control
index a7ad6e2e8282c329ef447ff2555ca6af6b837609..ddb06257a2d59814ee1299db1e0e565f5762ec5a 100644 (file)
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Priority: required
 Section: Packaging
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
 Architecture: iphoneos-arm
 Section: Packaging
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
 Architecture: iphoneos-arm

-Version: 1.0.2881-1
+Version: 1.0.2911-1

 Replaces: com.sosiphone.addcydia
 Depends: apr-lib, apt7-lib, darwintools, pcre, shell-cmds, system-cmds
 Pre-Depends: dpkg (>= 1.14.25-8)
 Replaces: com.sosiphone.addcydia
 Depends: apr-lib, apt7-lib, darwintools, pcre, shell-cmds, system-cmds
 Pre-Depends: dpkg (>= 1.14.25-8)

diff --git a/makefile b/makefile
index 68e0b62430685d1d2afdf2fb75ccafb087307088..d67e03dd1dec160ab2e80b545b72cab81d7d0e6c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -21,6 +21,7 @@ package: sign
        
        mkdir -p _/usr/libexec
        svn export Library _/usr/libexec/cydia
        
        mkdir -p _/usr/libexec
        svn export Library _/usr/libexec/cydia

+       cp -a /apl/tel/dest/iphoneos-arm/coreutils/usr/bin/du _/usr/libexec/cydia

        
        mkdir -p _/System/Library
        svn export LaunchDaemons _/System/Library/LaunchDaemons
        
        mkdir -p _/System/Library
        svn export LaunchDaemons _/System/Library/LaunchDaemons