Implemented a complicated and only partially operational mechanism to protect against...

diff --git a/Cydia.app/package.html b/Cydia.app/package.html
index 75b86f0eeba7f1da8e0f24d50bef18f6ab7c253f..3a2d7ca9adcf61ce38c6a0982158caeff9d5b738 100644 (file)
--- a/Cydia.app/package.html
+++ b/Cydia.app/package.html
@@ -253,10 +253,10 @@
         <label id="author"></label>
     </div></a>
 
         <label id="author"></label>
     </div></a>
 

-    <div class="commercial">
+    <!--div class="commercial">

         <img class="icon" src="commercial.png"/><div>
         <label>This is a commercial package!</label>
         <img class="icon" src="commercial.png"/><div>
         <label>This is a commercial package!</label>

-    </div></div>
+    </div></div-->

 
     <a class="console" href="http://cydia.saurik.com/purpose/console/">
         <img class="icon" src="console.png"/><div>
 
     <a class="console" href="http://cydia.saurik.com/purpose/console/">
         <img class="icon" src="console.png"/><div>

diff --git a/Cydia.mm b/Cydia.mm
index 2860ce042d311a6221c8136c69a8652e3d801130..d898ef3a775fe902a18b1f438b464603ad53e597 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1033,6 +1033,8 @@ class Progress :
 
 /* Database Interface {{{ */
 @interface Database : NSObject {
 
 /* Database Interface {{{ */
 @interface Database : NSObject {

+    unsigned era_;
+

     pkgCacheFile cache_;
     pkgDepCache::Policy *policy_;
     pkgRecords *records_;
     pkgCacheFile cache_;
     pkgDepCache::Policy *policy_;
     pkgRecords *records_;


@@ -1055,6 +1057,7 @@ class Progress :
 }
 
 + (Database *) sharedInstance;
 }
 
 + (Database *) sharedInstance;

+- (unsigned) era;

 
 - (void) _readCydia:(NSNumber *)fd;
 - (void) _readStatus:(NSNumber *)fd;
 
 - (void) _readCydia:(NSNumber *)fd;
 - (void) _readStatus:(NSNumber *)fd;


@@ -1325,6 +1328,8 @@ class Progress :
 /* }}} */
 /* Package Class {{{ */
 @interface Package : NSObject {
 /* }}} */
 /* Package Class {{{ */
 @interface Package : NSObject {

+    unsigned era_;
+

     pkgCache::PkgIterator iterator_;
     _transient Database *database_;
     pkgCache::VerIterator version_;
     pkgCache::PkgIterator iterator_;
     _transient Database *database_;
     pkgCache::VerIterator version_;


@@ -1334,6 +1339,7 @@ class Progress :
     bool cached_;
 
     NSString *section_;
     bool cached_;
 
     NSString *section_;

+    bool essential_;

 
     NSString *latest_;
     NSString *installed_;
 
     NSString *latest_;
     NSString *installed_;


@@ -1431,7 +1437,6 @@ class Progress :
 - (void) dealloc {
     if (source_ != nil)
         [source_ release];
 - (void) dealloc {
     if (source_ != nil)
         [source_ release];

-

     if (section_ != nil)
         [section_ release];
 
     if (section_ != nil)
         [section_ release];
 


@@ -1477,7 +1482,11 @@ class Progress :
 }
 
 - (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
 }
 
 - (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {

-    if ((self = [super init]) != nil) { _profile(Package$initWithIterator)
+    if ((self = [super init]) != nil) {
+    _profile(Package$initWithIterator)
+    @synchronized (database) {
+        era_ = [database era];
+

         iterator_ = iterator;
         database_ = database;
 
         iterator_ = iterator;
         database_ = database;
 


@@ -1664,7 +1673,25 @@ class Progress :
                 Changed_ = true;
             }
         _end
                 Changed_ = true;
             }
         _end

-    _end } return self;
+
+        const char *section(iterator_.Section());
+        if (section == NULL)
+            section_ = nil;
+        else {
+            NSString *name([[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_']);
+
+          lookup:
+            if (NSDictionary *value = [SectionMap_ objectForKey:name])
+                if (NSString *rename = [value objectForKey:@"Rename"]) {
+                    name = rename;
+                    goto lookup;
+                }
+
+            section_ = [[name stringByReplacingCharacter:'_' withCharacter:' '] retain];
+        }
+
+        essential_ = (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+    } _end } return self;

 }
 
 + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
 }
 
 + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {


@@ -1679,23 +1706,6 @@ class Progress :
 }
 
 - (NSString *) section {
 }
 
 - (NSString *) section {

-    if (section_ != nil)
-        return section_;
-
-    const char *section = iterator_.Section();
-    if (section == NULL)
-        return nil;
-
-    NSString *name = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_'];
-
-  lookup:
-    if (NSDictionary *value = [SectionMap_ objectForKey:name])
-        if (NSString *rename = [value objectForKey:@"Rename"]) {
-            name = rename;
-            goto lookup;
-        }
-
-    section_ = [[name stringByReplacingCharacter:'_' withCharacter:' '] retain];

     return section_;
 }
 
     return section_;
 }
 


@@ -1815,7 +1825,7 @@ class Progress :
 }
 
 - (BOOL) essential {
 }
 
 - (BOOL) essential {

-    return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+    return essential_;

 }
 
 - (BOOL) broken {
 }
 
 - (BOOL) broken {


@@ -2029,8 +2039,17 @@ class Progress :
 
 - (Source *) source {
     if (!cached_) {
 
 - (Source *) source {
     if (!cached_) {

-        source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain];
-        cached_ = true;
+        @synchronized (database_) {
+            if ([database_ era] != era_ || file_.end())
+                source_ = nil;
+            else {
+                source_ = [database_ getSource:file_.File()];
+                if (source_ != nil)
+                    [source_ retain];
+            }
+
+            cached_ = true;
+        }

     }
 
     return source_;
     }
 
     return source_;


@@ -2315,6 +2334,10 @@ static NSArray *Finishes_;
     return instance;
 }
 
     return instance;
 }
 

+- (unsigned) era {
+    return era_;
+}
+

 - (void) dealloc {
     _assert(false);
     [super dealloc];
 - (void) dealloc {
     _assert(false);
     [super dealloc];


@@ -2559,6 +2582,10 @@ static NSArray *Finishes_;
 }
 
 - (void) reloadData { _pooled
 }
 
 - (void) reloadData { _pooled

+    @synchronized (self) {
+        ++era_;
+    }
+

     _error->Discard();
 
     delete list_;
     _error->Discard();
 
     delete list_;

diff --git a/control b/control
index 7eae62b2d7f0488512297f28581bcf1be2d5ce51..adafcef03e21028a071df60238b6964660f15978 100644 (file)
--- a/control
+++ b/control
@@ -4,7 +4,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.2716-42
+Version: 1.0.2769-43

 Replaces: com.sosiphone.addcydia
 Depends: apt, darwintools, pcre, shell-cmds
 Conflicts: com.sosiphone.addcydia
 Replaces: com.sosiphone.addcydia
 Depends: apt, darwintools, pcre, shell-cmds
 Conflicts: com.sosiphone.addcydia