5662 2004-12-09 17:40:45 +0300 Дублирование куска спека в выводе rpm -bE 2008-06-14 21:40:27 +0400 1 1 4 Development Sisyphus librpmbuild unstable all Linux CLOSED FIXED P4 normal --- 1 kas placeholder arseny evseev glebfm imz ldv legion php-coder placeholder vt qa-sisyphus oldest_to_newest 20308 0 kas 2004-12-09 17:40:45 +0300 Если в спеке присутствует тэг BuildArch то в выводе rpm -bE дублируется кусок спека находящийся до этого тэга. Пример спека: Name: test Version: test Release: test Summary: test License: GPL Group: test BuildArch: noarch %description 20310 1 ldv 2004-12-09 17:54:49 +0300 It's a known story. 20313 2 ldv 2004-12-09 17:56:28 +0300 *** Bug 5573 has been marked as a duplicate of this bug. *** 20339 3 664 kas 2004-12-10 16:13:54 +0300 Created attachment 664 Патчик, который исправляет проблемму 20340 4 kas 2004-12-10 16:19:47 +0300 блин, орфографическая ошибка в патче - s/tempory/temporary/ 20341 5 664 kas 2004-12-10 16:21:54 +0300 Comment on attachment 664 Патчик, который исправляет проблемму >--- rpm-4_0-4.0.4-orig/build/parseSpec.c 2002-03-26 01:09:32 +0200 >+++ rpm-4_0-4.0.4/build/parseSpec.c 2004-12-10 15:13:44 +0200 >@@ -16,6 +16,8 @@ > > /*@access FD_t @*/ /* compared with NULL */ > >+static FILE* temp_file;/*temporary file to output preprocessing spec*/ >+ > /** > */ > /*@unchecked@*/ >@@ -362,7 +364,7 @@ > > if ( '\n' == chomped[len-1] ) > chomped[len-1] = '\0'; >- puts( chomped ); >+ fprintf(temp_file, "%s\n", chomped ); > chomped = _free( chomped ); > } > >@@ -396,6 +398,10 @@ > { > rpmParseState parsePart = PART_PREAMBLE; > int initialPackage = 1; >+ char temp_filename_pattern[25]="preprocessed-spec.XXXXXX"; >+ int temp_fd; >+ char line[255]; >+ > #ifdef DYING > const char *saveArch; > #endif >@@ -416,6 +422,23 @@ > spec->fileStack = newOpenFileInfo(); > spec->fileStack->fileName = xstrdup(spec->specFile); > spec->preprocess_mode = preprocess; >+ >+ if (spec->preprocess_mode){ >+ temp_fd = mkstemp(temp_filename_pattern); >+ if (temp_fd == -1) { >+ rpmError(RPMERR_CREATE, _("Cannot open temporary file")); >+ return RPMERR_CREATE; >+ } >+ if (!(temp_file = fdopen(temp_fd, "w+b"))) { >+ rpmError(RPMERR_CREATE, _("Cannot create temporary file descriptor")); >+ return RPMERR_CREATE; >+ } >+ if (unlink(temp_filename_pattern) == -1) { >+ rpmError(RPMERR_UNLINK, _("Cannot delete temporary file")); >+ return RPMERR_UNLINK; >+ } >+ } >+ > if (buildRootURL) { > const char * buildRoot; > (void) urlPath(buildRootURL, &buildRoot); >@@ -636,5 +659,15 @@ > closeSpec(spec); > *specp = spec; > >+ if (spec->preprocess_mode){ >+ if (!fseek(temp_file,0,SEEK_SET)) >+ while(fgets(line,255,temp_file)) >+ printf("%s",line); >+ else{ >+ rpmError(RPMERR_FSEEK, _("Cannot seek temporary file")); >+ return RPMERR_FSEEK; >+ } >+ } >+ > return 0; > } 20411 6 ldv 2004-12-14 13:17:36 +0300 Ввиду повышенной активности reporter'а. 20413 7 ldv 2004-12-14 13:20:22 +0300 1. в таких случаях необъодимо использовать ftruncate(2). 2. в rpmlib работа с временными файлами отличается от обычной. 20419 8 kas 2004-12-14 13:59:16 +0300 (In reply to comment #7) > 1. в таких случаях необъодимо использовать ftruncate(2). ok > 2. в rpmlib работа с временными файлами отличается от обычной. Вы имеете ввиду использование makeTempFile? 20469 9 671 kas 2004-12-15 15:13:50 +0300 Created attachment 671 Теперь используется ftruncate А по поводу использования временных файлов в rpmlib - прошу разъяснить по-подробней... 51037 10 php-coder 2007-06-04 14:16:01 +0400 Эта бага до сих пор актуальна? (сегодня вечером проверю дома) И, думаю, что это не major, а normal. 51045 11 kas 2007-06-04 14:37:25 +0400 Воспроизводиться, но для мня не актуальна. 72366 12 at 2008-06-14 21:40:27 +0400 Fixed in 4.0.4-alt77.M40.1-39-g63d7ecd 664 2004-12-10 16:13:54 +0300 2004-12-15 15:13:51 +0300 Патчик, который исправляет проблемму rpm.patch text/plain 1824 kas LS0tIHJwbS00XzAtNC4wLjQtb3JpZy9idWlsZC9wYXJzZVNwZWMuYwkyMDAyLTAzLTI2IDAxOjA5 OjMyICswMjAwCisrKyBycG0tNF8wLTQuMC40L2J1aWxkL3BhcnNlU3BlYy5jCTIwMDQtMTItMTAg MTU6MTM6NDQgKzAyMDAKQEAgLTE2LDYgKzE2LDggQEAKIAogLypAYWNjZXNzIEZEX3QgQCovCS8q IGNvbXBhcmVkIHdpdGggTlVMTCAqLwogCitzdGF0aWMgRklMRSogdGVtcF9maWxlOy8qdGVtcG9y eSBmaWxlIHRvIG91dHB1dCBwcmVwcm9jZXNzaW5nIHNwZWMqLworCiAvKioKICAqLwogLypAdW5j aGVja2VkQCovCkBAIC0zNjIsNyArMzY0LDcgQEAKIAogCWlmICggJ1xuJyA9PSBjaG9tcGVkW2xl bi0xXSApIAogCSAgICBjaG9tcGVkW2xlbi0xXSA9ICdcMCc7Ci0JcHV0cyggY2hvbXBlZCApOwor CWZwcmludGYodGVtcF9maWxlLCAiJXNcbiIsIGNob21wZWQgKTsKIAljaG9tcGVkID0gX2ZyZWUo IGNob21wZWQgKTsKICAgICB9CiAKQEAgLTM5Niw2ICszOTgsMTAgQEAKIHsKICAgICBycG1QYXJz ZVN0YXRlIHBhcnNlUGFydCA9IFBBUlRfUFJFQU1CTEU7CiAgICAgaW50IGluaXRpYWxQYWNrYWdl ID0gMTsKKyAgICBjaGFyIHRlbXBfZmlsZW5hbWVfcGF0dGVyblsyNV09InByZXByb2Nlc3NlZC1z cGVjLlhYWFhYWCI7CisgICAgaW50IHRlbXBfZmQ7CisgICAgY2hhciBsaW5lWzI1NV07CisKICNp ZmRlZglEWUlORwogICAgIGNvbnN0IGNoYXIgKnNhdmVBcmNoOwogI2VuZGlmCkBAIC00MTYsNiAr NDIyLDIzIEBACiAgICAgc3BlYy0+ZmlsZVN0YWNrID0gbmV3T3BlbkZpbGVJbmZvKCk7CiAgICAg c3BlYy0+ZmlsZVN0YWNrLT5maWxlTmFtZSA9IHhzdHJkdXAoc3BlYy0+c3BlY0ZpbGUpOwogICAg IHNwZWMtPnByZXByb2Nlc3NfbW9kZSA9IHByZXByb2Nlc3M7CisKKyAgICBpZiAoc3BlYy0+cHJl cHJvY2Vzc19tb2RlKXsKKyAgICAgIHRlbXBfZmQgPSBta3N0ZW1wKHRlbXBfZmlsZW5hbWVfcGF0 dGVybik7CisgICAgICBpZiAodGVtcF9mZCA9PSAtMSkgeworCXJwbUVycm9yKFJQTUVSUl9DUkVB VEUsIF8oIkNhbm5vdCBvcGVuIHRlbXBvcnkgZmlsZSIpKTsKKwlyZXR1cm4gUlBNRVJSX0NSRUFU RTsKKyAgICAgIH0KKyAgICAgIGlmICghKHRlbXBfZmlsZSA9IGZkb3Blbih0ZW1wX2ZkLCAidyti IikpKSB7CisJcnBtRXJyb3IoUlBNRVJSX0NSRUFURSwgXygiQ2Fubm90IGNyZWF0ZSB0ZW1wb3J5 IGZpbGUgZGVzY3JpcHRvciIpKTsKKwlyZXR1cm4gUlBNRVJSX0NSRUFURTsKKyAgICAgIH0KKyAg ICAgIGlmICh1bmxpbmsodGVtcF9maWxlbmFtZV9wYXR0ZXJuKSA9PSAtMSkgeworCXJwbUVycm9y KFJQTUVSUl9VTkxJTkssIF8oIkNhbm5vdCBkZWxldGUgdGVtcG9yeSBmaWxlIikpOworCXJldHVy biBSUE1FUlJfVU5MSU5LOworICAgICAgfQorICAgIH0KKwogICAgIGlmIChidWlsZFJvb3RVUkwp IHsKIAljb25zdCBjaGFyICogYnVpbGRSb290OwogCSh2b2lkKSB1cmxQYXRoKGJ1aWxkUm9vdFVS TCwgJmJ1aWxkUm9vdCk7CkBAIC02MzYsNSArNjU5LDE1IEBACiAgICAgY2xvc2VTcGVjKHNwZWMp OwogICAgICpzcGVjcCA9IHNwZWM7CiAKKyAgICBpZiAoc3BlYy0+cHJlcHJvY2Vzc19tb2RlKXsK KyAgICAgIGlmICghZnNlZWsodGVtcF9maWxlLDAsU0VFS19TRVQpKQorCXdoaWxlKGZnZXRzKGxp bmUsMjU1LHRlbXBfZmlsZSkpCisJICBwcmludGYoIiVzIixsaW5lKTsKKyAgICAgIGVsc2V7CisJ cnBtRXJyb3IoUlBNRVJSX0ZTRUVLLCBfKCJDYW5ub3Qgc2VlayB0ZW1wb3J5IGZpbGUiKSk7CisJ cmV0dXJuIFJQTUVSUl9GU0VFSzsKKyAgICAgIH0KKyAgICB9CisKICAgICByZXR1cm4gMDsKIH0K 671 2004-12-15 15:13:49 +0300 2004-12-15 15:13:49 +0300 Теперь используется ftruncate rpm.patch text/plain 2168 kas LS0tIHJwbS00XzAtNC4wLjQtb3JpZy9idWlsZC9wYXJzZVNwZWMuYwkyMDAyLTAzLTI2IDAxOjA5 OjMyICswMjAwCisrKyBycG0tNF8wLTQuMC40L2J1aWxkL3BhcnNlU3BlYy5jCTIwMDQtMTItMTUg MTM6NDE6NDQgKzAyMDAKQEAgLTE2LDYgKzE2LDggQEAKIAogLypAYWNjZXNzIEZEX3QgQCovCS8q IGNvbXBhcmVkIHdpdGggTlVMTCAqLwogCitzdGF0aWMgRklMRSogdGVtcF9maWxlOy8qdGVtcG9y YXJ5IGZpbGUgdG8gb3V0cHV0IHByZXByb2Nlc3Npbmcgc3BlYyovCisKIC8qKgogICovCiAvKkB1 bmNoZWNrZWRAKi8KQEAgLTM2Miw3ICszNjQsNyBAQAogCiAJaWYgKCAnXG4nID09IGNob21wZWRb bGVuLTFdICkgCiAJICAgIGNob21wZWRbbGVuLTFdID0gJ1wwJzsKLQlwdXRzKCBjaG9tcGVkICk7 CisJZnByaW50Zih0ZW1wX2ZpbGUsICIlc1xuIiwgY2hvbXBlZCApOwogCWNob21wZWQgPSBfZnJl ZSggY2hvbXBlZCApOwogICAgIH0KIApAQCAtMzk2LDYgKzM5OCwxMCBAQAogewogICAgIHJwbVBh cnNlU3RhdGUgcGFyc2VQYXJ0ID0gUEFSVF9QUkVBTUJMRTsKICAgICBpbnQgaW5pdGlhbFBhY2th Z2UgPSAxOworICAgIGNoYXIgdGVtcF9maWxlbmFtZV9wYXR0ZXJuWzI1XT0icHJlcHJvY2Vzc2Vk LXNwZWMuWFhYWFhYIjsKKyAgICBpbnQgdGVtcF9mZDsKKyAgICBjaGFyIGxpbmVbMjU1XTsKKwog I2lmZGVmCURZSU5HCiAgICAgY29uc3QgY2hhciAqc2F2ZUFyY2g7CiAjZW5kaWYKQEAgLTQxNiw2 ICs0MjIsMzUgQEAKICAgICBzcGVjLT5maWxlU3RhY2sgPSBuZXdPcGVuRmlsZUluZm8oKTsKICAg ICBzcGVjLT5maWxlU3RhY2stPmZpbGVOYW1lID0geHN0cmR1cChzcGVjLT5zcGVjRmlsZSk7CiAg ICAgc3BlYy0+cHJlcHJvY2Vzc19tb2RlID0gcHJlcHJvY2VzczsKKworICAgIGlmIChzcGVjLT5w cmVwcm9jZXNzX21vZGUpCisgICAgICBpZiAoIXJlY3Vyc2luZyl7CisJdGVtcF9mZCA9IG1rc3Rl bXAodGVtcF9maWxlbmFtZV9wYXR0ZXJuKTsKKwlpZiAodGVtcF9mZCA9PSAtMSkgeworCSAgcnBt RXJyb3IoUlBNRVJSX0NSRUFURSwgXygiQ2Fubm90IG9wZW4gdGVtcG9yYXJ5IGZpbGUiKSk7CisJ ICByZXR1cm4gUlBNRVJSX0NSRUFURTsKKwl9CisJaWYgKCEodGVtcF9maWxlID0gZmRvcGVuKHRl bXBfZmQsICJ3K2IiKSkpIHsKKwkgIHJwbUVycm9yKFJQTUVSUl9DUkVBVEUsIF8oIkNhbm5vdCBj cmVhdGUgdGVtcG9yYXJ5IGZpbGUgZGVzY3JpcHRvciIpKTsKKwkgIHJldHVybiBSUE1FUlJfQ1JF QVRFOworCX0KKwlpZiAodW5saW5rKHRlbXBfZmlsZW5hbWVfcGF0dGVybikgPT0gLTEpIHsKKwkg IHJwbUVycm9yKFJQTUVSUl9VTkxJTkssIF8oIkNhbm5vdCBkZWxldGUgdGVtcG9yYXJ5IGZpbGUi KSk7CisJICByZXR1cm4gUlBNRVJSX1VOTElOSzsKKwl9CisgICAgICB9ZWxzZXsJCisJaWYgKGZ0 cnVuY2F0ZShmaWxlbm8odGVtcF9maWxlKSwwKSl7CisJICAvKkZJWDogd2l0Y2ggZXJyb3IgY29k ZSBzaG91bGQgYmUgdXNlIGhlcmU/Ki8KKwkgIHJwbUVycm9yKFJQTUVSUl9DUkVBVEUsIF8oIkNh bm5vdCB0cnVuY2F0ZSB0ZW1wb3JhcnkgZmlsZSIpKTsKKwkgIHJldHVybiBSUE1FUlJfQ1JFQVRF OworCX0KKworCWlmIChmc2Vlayh0ZW1wX2ZpbGUsMCxTRUVLX1NFVCkpeworCSAgcnBtRXJyb3Io UlBNRVJSX0ZTRUVLLCBfKCJDYW5ub3Qgc2VlayB0ZW1wb3JhcnkgZmlsZSIpKTsKKwkgIHJldHVy biBSUE1FUlJfRlNFRUs7CisJfQorICAgICAgfQorICAgIAogICAgIGlmIChidWlsZFJvb3RVUkwp IHsKIAljb25zdCBjaGFyICogYnVpbGRSb290OwogCSh2b2lkKSB1cmxQYXRoKGJ1aWxkUm9vdFVS TCwgJmJ1aWxkUm9vdCk7CkBAIC02MzYsNSArNjcxLDE1IEBACiAgICAgY2xvc2VTcGVjKHNwZWMp OwogICAgICpzcGVjcCA9IHNwZWM7CiAKKyAgICBpZiAoc3BlYy0+cHJlcHJvY2Vzc19tb2RlKXsK KyAgICAgIGlmICghZnNlZWsodGVtcF9maWxlLDAsU0VFS19TRVQpKQorCXdoaWxlKGZnZXRzKGxp bmUsMjU1LHRlbXBfZmlsZSkpCisJICBwcmludGYoIiVzIixsaW5lKTsKKyAgICAgIGVsc2V7CisJ cnBtRXJyb3IoUlBNRVJSX0ZTRUVLLCBfKCJDYW5ub3Qgc2VlayB0ZW1wb3JhcnkgZmlsZSIpKTsK KwlyZXR1cm4gUlBNRVJSX0ZTRUVLOworICAgICAgfQorICAgIH0KKwogICAgIHJldHVybiAwOwog fQo=